Commit d172938

committed

reuse existing nullable option section.

and add CURLOPT_PASSWORD to the mix. CURLOPT_XOAUTH2_BEARER already handled.

1 parent 1c25577 commit d172938Copy full SHA for d172938

File tree

2 files changed

-19

lines changed

ext/curl
- interface.c
- tests
  - gh18458.phpt

2 files changed

-19

lines changed

`‎ext/curl/interface.c‎`

Lines changed: 6 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -1903,7 +1903,6 @@ static zend_result _php_curl_setopt(php_curl ch, zend_long option, zval zvalue`
`1903`	`1903`	`case CURLOPT_COOKIELIST:`
`1904`	`1904`	`case CURLOPT_FTP_ALTERNATIVE_TO_USER:`
`1905`	`1905`	`case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:`
`1906`		`- case CURLOPT_PASSWORD:`
`1907`	`1906`	`case CURLOPT_PROXYPASSWORD:`
`1908`	`1907`	`case CURLOPT_PROXYUSERNAME:`
`1909`	`1908`	`case CURLOPT_NOPROXY:`
`@@ -1996,24 +1995,6 @@ static zend_result _php_curl_setopt(php_curl ch, zend_long option, zval zvalue`
`1996`	`1995`	`return ret;`
`1997`	`1996`	`}`
`1998`	`1997`
`1999`		`- case CURLOPT_USERPWD:`
`2000`		`- case CURLOPT_USERNAME:`
`2001`		`- {`
`2002`		`- if (Z_ISNULL_P(zvalue)) {`
`2003`		`- // Authorization header would be implictly set`
`2004`		`- // with an empty string thus we explictly set the option`
`2005`		`- // to null to avoid this unwarranted side effect`
`2006`		`- error = curl_easy_setopt(ch->cp, option, NULL);`
`2007`		`- } else {`
`2008`		`- zend_string *tmp_str;`
`2009`		`- zend_string *str = zval_get_tmp_string(zvalue, &tmp_str);`
`2010`		`- zend_result ret = php_curl_option_str(ch, option, ZSTR_VAL(str), ZSTR_LEN(str));`
`2011`		`- zend_tmp_string_release(tmp_str);`
`2012`		`- return ret;`
`2013`		`- }`
`2014`		`- break;`
`2015`		`- }`
`2016`		`-`
`2017`	`1998`	`/* Curl nullable string options */`
`2018`	`1999`	`case CURLOPT_CUSTOMREQUEST:`
`2019`	`2000`	`case CURLOPT_FTPPORT:`
`@@ -2037,6 +2018,12 @@ static zend_result _php_curl_setopt(php_curl ch, zend_long option, zval zvalue`
`2037`	`2018`	`case CURLOPT_HSTS:`
`2038`	`2019`	`#endif`
`2039`	`2020`	`case CURLOPT_KRBLEVEL:`
	`2021`	`+ // Authorization header would be implictly set`
	`2022`	`+ // with an empty string thus we explictly set the option`
	`2023`	`+ // to null to avoid this unwarranted side effect`
	`2024`	`+ case CURLOPT_USERPWD:`
	`2025`	`+ case CURLOPT_USERNAME:`
	`2026`	`+ case CURLOPT_PASSWORD:`
`2040`	`2027`	`{`
`2041`	`2028`	`if (Z_ISNULL_P(zvalue)) {`
`2042`	`2029`	`error = curl_easy_setopt(ch->cp, option, NULL);`

`‎ext/curl/tests/gh18458.phpt‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ var_dump(str_contains($response, "authorization"));`
`19`	`19`
`20`	`20`	`$ch = curl_init("https://localhost/username");`
`21`	`21`	`curl_setopt($ch, CURLOPT_USERNAME, null);`
	`22`	`+curl_setopt($ch, CURLOPT_PASSWORD, null);`
`22`	`23`	`curl_setopt($ch, CURLOPT_VERBOSE, true);`
`23`	`24`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);`
`24`	`25`	`curl_setopt($ch, CURLOPT_STDERR, fopen("php://stdout", "w"));`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit d172938

File tree

2 files changed

2 files changed

`‎ext/curl/interface.c‎`

`‎ext/curl/tests/gh18458.phpt‎`

0 commit comments