com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/curl/interface.c ext/curl/streams.c
| From: | Pierrick Charron | Date: | Sat, 22 Dec 2012 00:24:28 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/curl/interface.c ext/curl/streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70793@lists.php.net to get a copy of this message | ||
Commit: 5499c7d201ad22f551dfc370ae09132acf4f75ec
Author: Pierrick Charron <pierrick@php.net> Fri, 21 Dec 2012 19:24:28 -0500
Parents: 59a4514dc0e8950ce210036332cc64c414fdcc22 1c553eba196b823439e69f003e63afd6d202d582
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5499c7d201ad22f551dfc370ae09132acf4f75ec
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Update NEWS file
Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
Conflicts:
ext/curl/interface.c
ext/curl/tests/bug63363.phpt
Bugs:
https://bugs.php.net/63352
https://bugs.php.net/63363
Changed paths:
MM NEWS
MM ext/curl/interface.c
MM ext/curl/streams.c
Diff:
diff --cc NEWS
index 81bc7a6,8dcd896..3d860b1
--- a/NEWS
+++ b/NEWS
@@@ -1,19 -1,16 +1,23 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2013, PHP 5.3.21
+?? ??? 2012, PHP 5.4.11
-- Zend Engine:
- . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).
- (Johannes)
+- Filter:
+ . Fixed bug #63757 (getenv() produces memory leak with CGI SAPI). (Dmitry)
+
+- JSON:
+ . Fixed bug #63737 (json_decode does not properly decode with options
+ parameter). (Adam)
+
+- CLI server
+ . Update list of common mime types. Added webm, ogv, ogg. (Lars,
+ pascalc at gmail dot com)
- cURL extension:
+ . Fixed bug #63795 (CURL >= 7.28.0 no longer support value 1 for
+ CURLOPT_SSL_VERIFYHOST). (Pierrick)
+ . Fixed bug #63352 (Can't enable hostname validation when using curl stream
+ wrappers). (Pierrick)
. Fixed bug #55438 (Curlwapper is not sending http header randomly).
(phpnet@lostreality.org, Pierrick)
diff --cc ext/curl/interface.c
index dbe4896,9ac89c5..1106037
--- a/ext/curl/interface.c
+++ b/ext/curl/interface..c
@@@ -1683,10 -1679,15 +1683,16 @@@ static int _php_curl_setopt(php_curl *c
CURLcode error=CURLE_OK;
switch (option) {
+ /* Long options */
case CURLOPT_SSL_VERIFYHOST:
- if(Z_TYPE_PP(zvalue)==IS_BOOL && Z_BVAL_PP(zvalue)) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "CURLOPT_SSL_VERIFYHOST set to true which
disables common name validation (setting CURLOPT_SSL_VERIFYHOST to 2 enables common name
validation)");
+ if(Z_BVAL_PP(zvalue) == 1) {
+ #if LIBCURL_VERSION_NUM <= 0x071c00 /* 7.28.0 */
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "CURLOPT_SSL_VERIFYHOST with value 1 is
deprecated and will be removed as of libcurl 7.28.1. It is recommended to use value 2
instead");
+ #else
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "CURLOPT_SSL_VERIFYHOST no longer accepts the
value 1, value 2 will be used instead");
+ error = curl_easy_setopt(ch->cp, option, 2);
+ break;
+ #endif
}
case CURLOPT_INFILESIZE:
case CURLOPT_VERBOSE: