- fix typo

[m6w6/ext-http] / http_info_api.c

diff --git a/http_info_api.c b/http_info_api.c
index 5140b6c953fe9cb70f49a6071960865c6ca33132..0f22902bb2e020fcc8744280dc16c7f9cee1a55d 100644 (file)
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -23,37 +23,57 @@ PHP_HTTP_API void _http_info_default_callback(void **nothing, HashTable **header
        
        INIT_ZARR(array, *headers);
        
-       switch (info->type)
-       {
+       switch (info->type) {
                case IS_HTTP_REQUEST:
                        add_assoc_string(&array, "Request Method", HTTP_INFO(info).request.method, 1);
                        add_assoc_string(&array, "Request Url", HTTP_INFO(info).request.url, 1);
-               break;
+                       break;
                
                case IS_HTTP_RESPONSE:
                        add_assoc_long(&array, "Response Code", (long) HTTP_INFO(info).response.code);
                        add_assoc_string(&array, "Response Status", HTTP_INFO(info).response.status, 1);
-               break;
+                       break;
        }
 }
 
 PHP_HTTP_API void _http_info_dtor(http_info *i)
 {
-       switch (i->type)
-       {
+       switch (i->type) {
                case IS_HTTP_REQUEST:
                        STR_SET(HTTP_INFO(i).request.method, NULL);
                        STR_SET(HTTP_INFO(i).request.url, NULL);
-               break;
+                       break;
                
                case IS_HTTP_RESPONSE:
                        STR_SET(HTTP_INFO(i).response.status, NULL);
-               break;
+                       break;
                
                default:
-               break;
+                       break;
+       }
+}
+
+#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)
 {
@@ -75,7 +95,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")])))) {