- bump version

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 1773ce7bc1f702ae7edffc4bf3415cad849b3abf..e54974f9cb9c10d8e45fe20081e1d55db2d00899 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -91,8 +91,8 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
                if (decode) { \
                        decode(str, len, &decoded, &decoded_len TSRMLS_CC); \
                } else { \
-                       decoded = estrdup(str); \
                        decoded_len = len; \
+                       decoded = estrndup(str, decoded_len); \
                } \
                add_assoc_stringl(array, k, decoded, decoded_len, 0); \
        }
@@ -120,7 +120,7 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
                        key = val + strlen(val);
                        HTTP_KEYLIST_FIXVAL();
                        HTTP_KEYLIST_VAL(&array, "value", val, vallen);
-                       goto list_done;
+                       return SUCCESS;
                }
                /* additional info appended */
                else {
@@ -152,7 +152,6 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
                efree(keydup);
        } while (!done);
 
-list_done:
        return SUCCESS;
 }
 
@@ -227,7 +226,7 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
 }
 /* }}} */
 
-/* {{{ zend_bool http_get_request_body(char **, size_t *) */
+/* {{{ STATUS http_get_request_body(char **, size_t *) */
 PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_bool dup TSRMLS_DC)
 {
        *length = 0;