cvs: php-src(PHP_5_3) /ext/curl interface.c

mkoppanen Thu Dec 4 13:13:22 2008 UTC Modified files: (Branch: PHP_5_3) /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.27.2.22&r2=1.62.2.14.2.27.2.23&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.22 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.23 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.22 Sun Nov 30 17:30:50 2008 +++ php-src/ext/curl/interface.c Thu Dec 4 13:13:22 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.22 2008/11/30 17:30:50 iliaa Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.23 2008/12/04 13:13:22 mkoppanen Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -1870,6 +1870,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) {