X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_info_api.c;h=ec238fb4f937a727796aeefd82cf07eff1a46253;hp=0136a423f040e61b67d9b8b423d04d1bec9d64d7;hb=687515f3fa8863f97fd281152a80171ad438532d;hpb=e6d36989f0650bf097b6909c41cdd20a1ffcd6af

diff --git a/http_info_api.c b/http_info_api.c
index 0136a42..ec238fb 100644
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -6,16 +6,12 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
 #include "php_http.h"
 
 #include "php_http_api.h"
@@ -41,19 +37,17 @@ PHP_HTTP_API void _http_info_default_callback(void **nothing, HashTable **header
 	}
 }
 
-PHP_HTTP_API void _http_info_dtor(http_info *info)
+PHP_HTTP_API void _http_info_dtor(http_info *i)
 {
-	http_info_t *i = (http_info_t *) info;
-	
-	switch (info->type)
+	switch (i->type)
 	{
 		case IS_HTTP_REQUEST:
-			STR_SET(i->request.method, NULL);
-			STR_SET(i->request.url, NULL);
+			STR_SET(HTTP_INFO(i).request.method, NULL);
+			STR_SET(HTTP_INFO(i).request.url, NULL);
 		break;
 		
 		case IS_HTTP_RESPONSE:
-			STR_SET(i->response.status, NULL);
+			STR_SET(HTTP_INFO(i).response.status, NULL);
 		break;
 		
 		default:
@@ -81,7 +75,7 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 	/* there must be HTTP/1.x in the line
 	 * and nothing than SPACE or NUL after HTTP/1.x 
 	 */
-	if (	(!(http = strstr(pre_header, "HTTP/1."))) || 
+	if (	(!(http = php_memnstr((char *) pre_header, "HTTP/1.", lenof("HTTP/1."), (char *)end))) || 
 			(!(http < end)) ||
 			(!isdigit(http[lenof("HTTP/1.")])) ||
 			(http[lenof("HTTP/1.1")] && (!isspace(http[lenof("HTTP/1.1")])))) {