X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_info_api.c;h=8e45de36cd8b1179866c59371c403ac40f73dc4a;hp=c544ccbe6bdac81b21c47b209527de7932554606;hb=1dbcba16c7ba9c580b12e9fdce49b6b2a190233b;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb

diff --git a/http_info_api.c b/http_info_api.c
index c544ccb..8e45de3 100644
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -6,23 +6,17 @@
     | 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"
 #include "php_http_info_api.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;
@@ -33,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:
@@ -51,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,10 +116,10 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 		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;