svn: /php/php-src/trunk/ NEWS ext/curl/interface.c ext/curl/php_curl.h

pierrick Tue, 22 Nov 2011 17:13:26 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=319692 Log: Fixed bug #55635 Bug: https://bugs.php.net/55635 (Assigned) CURLOPT_BINARYTRANSFER no longer used? Changed paths: U php/php-src/trunk/NEWS U php/php-src/trunk/ext/curl/interface.c U php/php-src/trunk/ext/curl/php_curl.h Modified: php/php-src/trunk/NEWS =================================================================== --- php/php-src/trunk/NEWS 2011-11-22 16:52:42 UTC (rev 319691) +++ php/php-src/trunk/NEWS 2011-11-22 17:13:26 UTC (rev 319692) @@ -5,4 +5,8 @@ - General improvements: . World domination +- Curl: + . Fixed bug #55635 (CURLOPT_BINARYTRANSFER no longer used. The constant + still exists for backward compatibility but is doing nothing). (Pierrick) + <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>> Modified: php/php-src/trunk/ext/curl/interface.c =================================================================== --- php/php-src/trunk/ext/curl/interface.c 2011-11-22 16:52:42 UTC (rev 319691) +++ php/php-src/trunk/ext/curl/interface.c 2011-11-22 17:13:26 UTC (rev 319692) @@ -261,7 +261,6 @@ ch->handlers->write->stream = NULL; ch->handlers->write->method = PHP_CURL_STDOUT; - ch->handlers->write->type = PHP_CURL_ASCII; curl_easy_setopt(ch->cp, CURLOPT_FILE, (void *) ch); } } @@ -1536,7 +1535,6 @@ ch->cp = cp; ch->handlers->write->method = PHP_CURL_STDOUT; - ch->handlers->write->type = PHP_CURL_ASCII; ch->handlers->read->method = PHP_CURL_DIRECT; ch->handlers->write_header->method = PHP_CURL_IGNORE; @@ -1610,7 +1608,6 @@ dupch->handlers->write->stream = ch->handlers->write->stream; } dupch->handlers->write->method = ch->handlers->write->method; - dupch->handlers->write->type = ch->handlers->write->type; if (ch->handlers->read->stream) { Z_ADDREF_P(ch->handlers->read->stream); } @@ -1953,13 +1950,7 @@ } break; case CURLOPT_BINARYTRANSFER: - convert_to_long_ex(zvalue); - - if (Z_LVAL_PP(zvalue)) { - ch->handlers->write->type = PHP_CURL_BINARY; - } else { - ch->handlers->write->type = PHP_CURL_ASCII; - } + /* Do nothing, just backward compatibility */ break; case CURLOPT_WRITEFUNCTION: if (ch->handlers->write->func_name) { Modified: php/php-src/trunk/ext/curl/php_curl.h =================================================================== --- php/php-src/trunk/ext/curl/php_curl.h 2011-11-22 16:52:42 UTC (rev 319691) +++ php/php-src/trunk/ext/curl/php_curl.h 2011-11-22 17:13:26 UTC (rev 319692) @@ -41,14 +41,12 @@ #define curl_module_ptr &curl_module_entry #define CURLOPT_RETURNTRANSFER 19913 -#define CURLOPT_BINARYTRANSFER 19914 +#define CURLOPT_BINARYTRANSFER 19914 /* For Backward compatibility */ #define PHP_CURL_STDOUT 0 #define PHP_CURL_FILE 1 #define PHP_CURL_USER 2 #define PHP_CURL_DIRECT 3 #define PHP_CURL_RETURN 4 -#define PHP_CURL_ASCII 5 -#define PHP_CURL_BINARY 6 #define PHP_CURL_IGNORE 7 extern int le_curl; @@ -85,7 +83,6 @@ FILE *fp; smart_str buf; int method; - int type; zval *stream; } php_curl_write;