X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_info_api.c;h=dec76648b09613262cf01a3202cdb537e7c559c0;hp=18fea6f1bddbb96272dbe9b5c7ab94f66f6ba035;hb=8d25696948ed61d50c417275222117f43069ddd1;hpb=0d925a2820b9d75b8e32c451fd400863e51e22fe

diff --git a/http_info_api.c b/http_info_api.c
index 18fea6f..dec7664 100644
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -32,7 +29,8 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 PHP_HTTP_API void _http_info_default_callback(void **nothing, HashTable **headers, http_info *info TSRMLS_DC)
 {
 	zval array;
-	Z_ARRVAL(array) = *headers;
+	
+	INIT_ZARR(array, *headers);
 	
 	switch (info->type)
 	{
@@ -81,7 +79,7 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 	}
 	
 	/* where's the end of the line */
-	if (!((end = strchr(pre_header, '\r')) || (end = strchr(pre_header, '\n')))) {
+	if (!(end = http_locate_eol(pre_header, NULL))) {
 		end = pre_header + strlen(pre_header);
 	}
 	
@@ -121,7 +119,7 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 	}
 	
 	/* is request */
-	else {
+	else if (!http[lenof("HTTP/1.x")] || http[lenof("HTTP/1.x")] == '\r' || http[lenof("HTTP/1.x")] == '\n') {
 		const char *url = strchr(pre_header, ' ');
 		
 		info->type = IS_HTTP_REQUEST;
@@ -135,6 +133,11 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 		
 		return SUCCESS;
 	}
+
+	/* some darn header containing HTTP/1.x */
+	else {
+		return FAILURE;
+	}
 }