- cleanup

[m6w6/ext-http] / http_info_api.c

diff --git a/http_info_api.c b/http_info_api.c
index b1ffcbc4c8ea9372ef76d4e7e7d8c9025e7c109f..793acd11be56a941d88cc4a669c88726ef502695 100644 (file)
--- 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"
@@ -31,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:
@@ -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.URI, 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:
@@ -61,6 +55,28 @@ PHP_HTTP_API void _http_info_dtor(http_info *info)
        }
 }
 
+#if !defined(ZEND_ENGINE_2)
+inline char *php_memnstr(char *h, char *n, size_t n_len, char *e)
+{
+       char *p;
+       
+       if (e > h && n_len > 0) {
+               while (h != e) {
+                       if (*h == *n) {
+                               for (p = n; *p == h[p-n]; ++p) {
+                                       if (p == n+n_len-1) {
+                                               return h;
+                                       }
+                               }
+                       }
+                       ++h;
+               }
+       }
+       
+       return NULL;
+}
+#endif
+
 PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info, zend_bool silent TSRMLS_DC)
 {
        const char *end, *http;
@@ -81,7 +97,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")])))) {
@@ -120,10 +136,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;