[PHP-CVS] cvs: php-src /ext/curl interface.c

[Mikko Koppanen]

mkoppanen               Thu Dec  4 13:12:49 2008 UTC

  Modified files:              
    /php-src/ext/curl   interface.c 
  Log:
  Fixes bug #46739
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.136&r2=1.137&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.136 php-src/ext/curl/interface.c:1.137
--- php-src/ext/curl/interface.c:1.136  Sun Nov 30 17:35:56 2008
+++ php-src/ext/curl/interface.c        Thu Dec  4 13:12:49 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.136 2008/11/30 17:35:56 iliaa Exp $ */
+/* $Id: interface.c,v 1.137 2008/12/04 13:12:49 mkoppanen Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1929,6 +1929,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) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php