cvs: php-src(PHP_5_2) /ext/curl interface.c
| From: | Mikko Koppanen | Date: | Thu, 04 Dec 2008 13:13:41 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/curl interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-54687@lists.php.net to get a copy of this message | ||
mkoppanen Thu Dec 4 13:13:41 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
Log:
Fixes bug #46739
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.37&r2=1.62.2.14.2.38&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.37 php-src/ext/curl/interface.c:1.62.2.14.2.38
--- php-src/ext/curl/interface.c:1.62.2.14.2.37 Thu Nov 27 17:01:29 2008
+++ php-src/ext/curl/interface.c Thu Dec 4 13:13:41 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.37 2008/11/27 17:01:29 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.38 2008/12/04 13:13:41 mkoppanen Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1770,6 +1770,11 @@
if (curl_easy_getinfo(ch->cp, CURLINFO_CONTENT_TYPE, &s_code) == CURLE_OK) {
if (s_code != NULL) {
CAAS("content_type", s_code);
+ } else {
+ zval *retnull;
+ MAKE_STD_ZVAL(retnull);
+ ZVAL_NULL(retnull);
+ CAAZ("content_type", retnull);
}
}
if (curl_easy_getinfo(ch->cp, CURLINFO_HTTP_CODE, &l_code) == CURLE_OK) {