- portable ctype (http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=34632)

[m6w6/ext-http] / http_info_api.c

diff --git a/http_info_api.c b/http_info_api.c
index 8e45de36cd8b1179866c59371c403ac40f73dc4a..7cf9cc6eb0a6844b14d3c7b0dddd439db6db8286 100644 (file)
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -23,40 +23,58 @@ 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 *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.url, NULL);
-               break;
+                       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);
-               break;
+                       STR_SET(HTTP_INFO(i).response.status, NULL);
+                       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)
 {
        const char *end, *http;
@@ -77,10 +95,10 @@ 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")])))) {
+                       (!HTTP_IS_CTYPE(digit, http[lenof("HTTP/1.")])) ||
+                       (http[lenof("HTTP/1.1")] && (!HTTP_IS_CTYPE(space, http[lenof("HTTP/1.1")])))) {
                if (!silent) {
                        http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid or missing HTTP/1.x protocol identification");
                }