X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_info_api.c;h=8e45de36cd8b1179866c59371c403ac40f73dc4a;hp=0e9b6487e941a69a25c5a95ac23f52665b5c1138;hb=d046681a7b929ef813849cfe38fbceb333f0b0eb;hpb=bb1f32fd5d06b9b9ace6517c177b0fe58c9ff57c

diff --git a/http_info_api.c b/http_info_api.c
index 0e9b648..8e45de3 100644
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -1,34 +1,22 @@
 /*
-   +----------------------------------------------------------------------+
-   | 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-2006, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-#include "php.h"
-
 #include "php_http.h"
+
 #include "php_http_api.h"
-#include "php_http_std_defs.h"
 #include "php_http_info_api.h"
 
-#include <ctype.h>
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 PHP_HTTP_API void _http_info_default_callback(void **nothing, HashTable **headers, http_info *info TSRMLS_DC)
 {
 	zval array;
@@ -39,7 +27,7 @@ PHP_HTTP_API void _http_info_default_callback(void **nothing, HashTable **header
 	{
 		case IS_HTTP_REQUEST:
 			add_assoc_string(&array, "Request Method", HTTP_INFO(info).request.method, 1);
-			add_assoc_string(&array, "Request Uri", HTTP_INFO(info).request.URI, 1);
+			add_assoc_string(&array, "Request Url", HTTP_INFO(info).request.url, 1);
 		break;
 		
 		case IS_HTTP_RESPONSE:
@@ -57,7 +45,7 @@ PHP_HTTP_API void _http_info_dtor(http_info *info)
 	{
 		case IS_HTTP_REQUEST:
 			STR_SET(i->request.method, NULL);
-			STR_SET(i->request.URI, NULL);
+			STR_SET(i->request.url, NULL);
 		break;
 		
 		case IS_HTTP_RESPONSE:
@@ -122,20 +110,25 @@ 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;
 		if (url && http > url) {
 			HTTP_INFO(info).request.method = estrndup(pre_header, url - pre_header);
-			HTTP_INFO(info).request.URI = estrndup(url + 1, http - url - 2);
+			HTTP_INFO(info).request.url = estrndup(url + 1, http - url - 2);
 		} else {
 			HTTP_INFO(info).request.method = ecalloc(1,1);
-			HTTP_INFO(info).request.URI = ecalloc(1,1);
+			HTTP_INFO(info).request.url = ecalloc(1,1);
 		}
 		
 		return SUCCESS;
 	}
+
+	/* some darn header containing HTTP/1.x */
+	else {
+		return FAILURE;
+	}
 }