Skip to content

Allow NULL as value for CURLOPT_CUSTOMREQUEST option. #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
datibbaw wants to merge 1 commit into from
Closed

Allow NULL as value for CURLOPT_CUSTOMREQUEST option. #531

datibbaw wants to merge 1 commit into from

Conversation

@datibbaw
Copy link
Contributor

@datibbaw datibbaw commented Nov 18, 2013

This fixes bug 66109 and addresses this so question.

It allows for a NULL value to be passed for CURLOPT_CUSTOMREQUEST, so that the internal behaviour can be reset.

The following string options are nullable as well:

CURLOPT_FTPPORT
CURLOPT_FTP_ACCOUNT
CURLOPT_RTSP_SESSION_ID
CURLOPT_RANGE
CURLOPT_KRBLEVEL

And for 7.33 onwards, these may be added as well:

CURLOPT_DNS_INTERFACE
CURLOPT_DNS_LOCAL_IP4
CURLOPT_DNS_LOCAL_IP6

smalyshev
smalyshev reviewed Nov 27, 2013
View reviewed changes
ext/curl/interface.c Outdated
Copy link
Contributor

@smalyshev smalyshev Nov 27, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what happened to indentation here?

Copy link
Contributor Author

@datibbaw datibbaw Nov 27, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yikes. Indentation fail.

Copy link

@mapthegod mapthegod Nov 27, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Die Zustellung an folgende Empfänger oder Gruppen verzögert sich:

p.bandow@justepic.infomailto:p.bandow@justepic.info

Betreff: Re: [php-src] Allow NULL as value for CURLOPT_CUSTOMREQUEST option. (#531)

Diese Nachricht wurde noch nicht zugestellt. Es wird weiterhin versucht, die Nachricht zuzustellen.

Der Server wird noch 2 Tage, 22 Stunden und 52 Minuten versuchen, die Nachricht zuzustellen. Sie erhalten eine Benachrichtigung, falls die Nachricht bis dahin nicht übermittelt werden konnte.

@datibbaw
Copy link
Contributor Author

datibbaw commented Nov 28, 2013

@smalyshev I've made the change to php_curl_option_str() like you proposed; it looks a lot nicer now :)

@datibbaw
Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
5ff07a6 
Added test case.

Refactored the code to isolate the string handling. Fixed return values to use SUCCESS and FAILURE.

Removed unused error variable.

Indentation fix.
Removed the ugly goto.
@php-pulls
Copy link

php-pulls commented Feb 28, 2014

Comment on behalf of datibbaw at php.net:

Merged into 5.5, 5.6 and master.

@php-pulls php-pulls closed this Feb 28, 2014
@Sigill Sigill mentioned this pull request Sep 12, 2015
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@datibbaw @php-pulls @smalyshev @mapthegod