- fix switch() CS

[m6w6/ext-http] / http_headers_api.c

diff --git a/http_headers_api.c b/http_headers_api.c
index a5448a995c1a79eb86c442795e9040db8d8a17e0..ce5f0518be22112252b5d91ae2da8ee92ceef8ac 100644 (file)
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -200,14 +200,13 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
        range += sizeof("bytes=") - 1;
 
        do {
-               switch (c = *(range++))
-               {
+               switch (c = *(range++)) {
                        case '0':
                                /* allow 000... - shall we? */
                                if (*ptr != -10) {
                                        *ptr *= 10;
                                }
-                       break;
+                               break;
 
                        case '1': case '2': case '3':
                        case '4': case '5': case '6':
@@ -229,23 +228,21 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                } else {
                                        *ptr = c - '0';
                                }
-                       break;
+                               break;
 
                        case '-':
                                ptr = &end;
-                       break;
+                               break;
 
                        case ' ':
-                               /* IE - ignore for now */
-                       break;
+                               break;
 
                        case 0:
                        case ',':
 
                                if (length) {
                                        /* validate ranges */
-                                       switch (begin)
-                                       {
+                                       switch (begin) {
                                                /* "0-12345" */
                                                case -10:
                                                        /* "0-" */
@@ -257,7 +254,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                                                return RANGE_ERR;
                                                        }
                                                        begin = 0;
-                                               break;
+                                                       break;
 
                                                /* "-12345" */
                                                case -1:
@@ -267,16 +264,14 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                                        }
                                                        begin = length - end;
                                                        end = length - 1;
-                                               break;
+                                                       break;
 
                                                /* "12345-(xxx)" */
                                                default:
-                                                       switch (end)
-                                                       {
+                                                       switch (end) {
                                                                /* "12345-0" */
                                                                case -10:
                                                                        return RANGE_ERR;
-                                                               break;
 
                                                                /* "12345-" */
                                                                case -1:
@@ -284,7 +279,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                                                                return RANGE_ERR;
                                                                        }
                                                                        end = length - 1;
-                                                               break;
+                                                                       break;
 
                                                                /* "12345-67890" */
                                                                default:
@@ -293,9 +288,9 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                                                                        (end    <  begin)) {
                                                                                return RANGE_ERR;
                                                                        }
-                                                               break;
+                                                                       break;
                                                        }
-                                               break;
+                                                       break;
                                        }
                                }
                                {
@@ -310,11 +305,10 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                        end = -1;
                                        ptr = &begin;
                                }
-                       break;
+                               break;
 
                        default:
                                return RANGE_NO;
-                       break;
                }
        } while (c != 0);
 
@@ -326,22 +320,25 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
 PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify, 
        http_info_callback callback_func, void **callback_data TSRMLS_DC)
 {
-       const char *colon = NULL, *line = header;
+       const char *colon = NULL, *line = NULL;
        zval array;
        
        INIT_ZARR(array, headers);
        
+       /* skip leading ws */
+       while (isspace(*header)) ++header;
+       line = header;
+       
 #define MORE_HEADERS (*(line-1) && !(*(line-1) == '\n' && (*line == '\n' || *line == '\r')))
        do {
                int value_len = 0;
                
-               switch (*line++)
-               {
+               switch (*line++) {
                        case ':':
                                if (!colon) {
                                        colon = line - 1;
                                }
-                       break;
+                               break;
                        
                        case 0:
                                --value_len; /* we don't have CR so value length is one char less */
@@ -349,58 +346,73 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
                                if ((!*(line - 1)) || ((*line != ' ') && (*line != '\t'))) {
                                        http_info i;
                                        
-                                       /* response/request line */
                                        if (SUCCESS == http_info_parse(header, &i)) {
+                                               /* response/request line */
                                                callback_func(callback_data, &headers, &i TSRMLS_CC);
                                                http_info_dtor(&i);
                                                Z_ARRVAL(array) = headers;
                                        } else if (colon) {
                                                /* "header: value" pair */
-                                               /* skip empty key */
                                                if (header != colon) {
-                                                       zval **previous = NULL;
-                                                       char *value;
                                                        int keylen = colon - header;
-                                                       char *key = estrndup(header, keylen);
-
-                                                       if (prettify) {
-                                                               key = pretty_key(key, keylen, 1, 1);
-                                                       }
-
-                                                       value_len += line - colon - 1;
-
+                                                       const char *key = header;
+                                                       
                                                        /* skip leading ws */
-                                                       while (isspace(*(++colon))) --value_len;
+                                                       while (keylen && isspace(*key)) --keylen && ++key;
                                                        /* skip trailing ws */
-                                                       while (isspace(colon[value_len - 1])) --value_len;
-
-                                                       if (value_len > 0) {
-                                                               value = estrndup(colon, value_len);
-                                                       } else {
-                                                               value = estrdup("");
-                                                               value_len = 0;
-                                                       }
-
-                                                       /* if we already have got such a header make an array of those */
-                                                       if (SUCCESS == zend_hash_find(headers, key, keylen + 1, (void *) &previous)) {
-                                                               /* convert to array */
-                                                               if (Z_TYPE_PP(previous) != IS_ARRAY) {
-                                                                       convert_to_array(*previous);
+                                                       while (keylen && isspace(key[keylen - 1])) --keylen;
+                                                       
+                                                       if (keylen > 0) {
+                                                               zval **previous = NULL;
+                                                               char *value;
+                                                               char *keydup = estrndup(key, keylen);
+                                                               
+                                                               if (prettify) {
+                                                                       keydup = pretty_key(keydup, keylen, 1, 1);
+                                                               }
+                                                               
+                                                               value_len += line - colon - 1;
+                                                               
+                                                               /* skip leading ws */
+                                                               while (isspace(*(++colon))) --value_len;
+                                                               /* skip trailing ws */
+                                                               while (isspace(colon[value_len - 1])) --value_len;
+                                                               
+                                                               if (value_len > 0) {
+                                                                       value = estrndup(colon, value_len);
+                                                               } else {
+                                                                       value = estrdup("");
+                                                                       value_len = 0;
+                                                               }
+                                                               
+                                                               /* if we already have got such a header make an array of those */
+                                                               if (SUCCESS == zend_hash_find(headers, keydup, keylen + 1, (void *) &previous)) {
+                                                                       /* convert to array */
+                                                                       if (Z_TYPE_PP(previous) != IS_ARRAY) {
+                                                                               convert_to_array(*previous);
+                                                                       }
+                                                                       add_next_index_stringl(*previous, value, value_len, 0);
+                                                               } else {
+                                                                       add_assoc_stringl(&array, keydup, value, value_len, 0);
                                                                }
-                                                               add_next_index_stringl(*previous, value, value_len, 0);
-                                                       } else {
-                                                               add_assoc_stringl(&array, key, value, value_len, 0);
+                                                               efree(keydup);
+                                                       } else   {
+                                                               /* empty key ("   : ...") */
+                                                               return FAILURE;
                                                        }
-                                                       efree(key);
+                                               } else {
+                                                       /* empty key (": ...") */
+                                                       return FAILURE;
                                                }
                                        } else if (MORE_HEADERS) {
+                                               /* a line without a colon */
                                                return FAILURE;
                                        }
                                        colon = NULL;
                                        value_len = 0;
                                        header += line - header;
                                }
-                       break;
+                               break;
                }
        } while (MORE_HEADERS);