branch off v1 as R_1_7

[m6w6/ext-http] / http_info_api.c

diff --git a/http_info_api.c b/http_info_api.c
index 5a9207481eb96f6c792fb56130fdb032a50ed06b..358b5bf6c894b7fc0edac8775e7e8424d06e668b 100644 (file)
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -31,7 +31,9 @@ PHP_HTTP_API void _http_info_default_callback(void **nothing, HashTable **header
                
                case IS_HTTP_RESPONSE:
                        add_assoc_long(&array, "Response Code", (long) HTTP_INFO(info).response.code);
-                       add_assoc_string(&array, "Response Status", HTTP_INFO(info).response.status, 1);
+                       if (HTTP_INFO(info).response.status) {
+                               add_assoc_string(&array, "Response Status", HTTP_INFO(info).response.status, 1);
+                       }
                        break;
        }
 }
@@ -89,7 +91,7 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
        }
 #endif
 
-       info->http.version = atof(http + lenof("HTTP/"));
+       info->http.version = zend_strtod(http + lenof("HTTP/"), NULL);
        
        /* is response */
        if (pre_header == http) {