X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=8e683a1f31e1a201c03a63cd2d6e921a60351b10;hp=3dcaff04253ee05591209d12c72c2d04a3ac54e7;hb=a8230e38566547ed14c101bbf026904acdf0d458;hpb=020d5b055921392c0dfb25043962a40867d8b033 diff --git a/http_api.c b/http_api.c index 3dcaff0..8e683a1 100644 --- a/http_api.c +++ b/http_api.c @@ -182,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); } @@ -226,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; @@ -273,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); }