- fix php4 build

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 1773ce7bc1f702ae7edffc4bf3415cad849b3abf..8e683a1f31e1a201c03a63cd2d6e921a60351b10 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;
 }
 
@@ -183,7 +182,7 @@ void _http_error_ex(long type, long code, const char *format, ...)
 STATUS _http_exit_ex(int status, char *header, zend_bool free_header TSRMLS_DC)
 {
        if (SUCCESS != http_send_status_header(status, header)) {
-               http_error_ex(E_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
+               http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
                if (free_header && header) {
                        efree(header);
                }
@@ -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;
@@ -274,10 +273,10 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
                        } else {
                                efree(*decoded);
                                if (no_crlf) {
-                                       http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1));
+                                       http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1));
                                } else {
                                        char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0"));
-                                       http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
+                                       http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
                                        efree(error);
                                }