X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_info_api.c;h=358b5bf6c894b7fc0edac8775e7e8424d06e668b;hp=369bf69c77c57d2a5b0d9430689f249b35b9e326;hb=refs%2Fheads%2Fv1.7.x;hpb=8c131f561b503d35e854996b1798d268276463e6

diff --git a/http_info_api.c b/http_info_api.c
index 369bf69..358b5bf 100644
--- 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) {
@@ -107,7 +109,7 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 			while (' ' == *status) ++status;
 			HTTP_INFO(info).response.status = estrndup(status, end - status);
 		} else {
-			HTTP_INFO(info).response.status = ecalloc(1, 1);
+			HTTP_INFO(info).response.status = NULL;
 		}
 		
 		return SUCCESS;
@@ -129,8 +131,8 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 				return FAILURE;
 			}
 		} else {
-			HTTP_INFO(info).request.method = ecalloc(1, 1);
-			HTTP_INFO(info).request.url = ecalloc(1, 1);
+			HTTP_INFO(info).request.method = NULL;
+			HTTP_INFO(info).request.url = NULL;
 		}
 		
 		return SUCCESS;
@@ -142,7 +144,6 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 	}
 }
 
-
 /*
  * Local variables:
  * tab-width: 4