X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=683da9db6959f518b2e5fb9aea440e7ccded71dd;hp=abc2c9beeb155a925b1b4e8dcf52568bc8ba0d86;hb=8b5eb376ae8f5e53cfb66752327043be2669498a;hpb=bb1f32fd5d06b9b9ace6517c177b0fe58c9ff57c diff --git a/http_api.c b/http_api.c index abc2c9b..683da9d 100644 --- a/http_api.c +++ b/http_api.c @@ -22,11 +22,13 @@ #include "SAPI.h" #include "ext/standard/url.h" +#include "ext/standard/head.h" #include "php_http.h" #include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_headers_api.h" +#include "php_http_request_api.h" #include "php_http_send_api.h" #ifdef ZEND_ENGINE_2 @@ -45,6 +47,48 @@ ZEND_EXTERN_MODULE_GLOBALS(http); +static zend_bool http_support_ssl; + +STATUS _http_support_global_init(INIT_FUNC_ARGS) +{ + http_support_ssl = http_request_supports_ssl(); + + HTTP_LONG_CONSTANT("HTTP_SUPPORT", HTTP_SUPPORT); + HTTP_LONG_CONSTANT("HTTP_SUPPORT_REQUESTS", HTTP_SUPPORT_REQUESTS); + HTTP_LONG_CONSTANT("HTTP_SUPPORT_MAGICMIME", HTTP_SUPPORT_MAGICMIME); + HTTP_LONG_CONSTANT("HTTP_SUPPORT_ENCODINGS", HTTP_SUPPORT_ENCODINGS); + HTTP_LONG_CONSTANT("HTTP_SUPPORT_MHASHETAGS", HTTP_SUPPORT_MHASHETAGS); + HTTP_LONG_CONSTANT("HTTP_SUPPORT_SSLREQUESTS", HTTP_SUPPORT_SSLREQUESTS); + + return SUCCESS; +} + +PHP_HTTP_API long _http_support(long feature) +{ + long support = HTTP_SUPPORT; + +#ifdef HTTP_HAVE_CURL + support |= HTTP_SUPPORT_REQUESTS; + if (http_support_ssl) { + support |= HTTP_SUPPORT_SSLREQUESTS; + } +#endif +#ifdef HTTP_HAVE_MHASH + support |= HTTP_SUPPORT_MHASHETAGS; +#endif +#ifdef HTTP_HAVE_MAGIC + support |= HTTP_SUPPORT_MAGICMIME; +#endif +#ifdef HTTP_HAVE_ZLIB + support |= HTTP_SUPPORT_ENCODINGS; +#endif + + if (feature) { + return (feature == (support & feature)); + } + return support; +} + /* char *pretty_key(char *, size_t, zend_bool, zend_bool) */ char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen) { @@ -175,6 +219,7 @@ void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...) vspprintf(&message, 0, format, args); zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC); + efree(message); } else #endif php_verror(NULL, "", type, format, args TSRMLS_CC); @@ -193,7 +238,7 @@ void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC) strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm)); #define HTTP_LOG_WRITE(file, type, msg) \ - if (file && strlen(file)) { \ + if (file && *file) { \ php_stream *log = php_stream_open_wrapper(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \ \ if (log) { \ @@ -220,7 +265,7 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header } } - if (body) { + if (php_header(TSRMLS_C) && body) { PHPWRITE(body, strlen(body)); } @@ -228,6 +273,8 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header { case 301: http_log(HTTP_G(log).redirect, "301-REDIRECT", header); break; case 302: http_log(HTTP_G(log).redirect, "302-REDIRECT", header); break; + case 303: http_log(HTTP_G(log).redirect, "303-REDIRECT", header); break; + case 307: http_log(HTTP_G(log).redirect, "307-REDIRECT", header); break; case 304: http_log(HTTP_G(log).cache, "304-CACHE", header); break; case 405: http_log(HTTP_G(log).allowed_methods, "405-ALLOWED", header); break; default: http_log(NULL, header, body); break; @@ -290,67 +337,6 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_ } /* }}} */ -/* {{{ char *http_chunked_decode(char *, size_t, char **, size_t *) */ -PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC) -{ - const char *e_ptr; - char *d_ptr; - - *decoded_len = 0; - *decoded = ecalloc(1, encoded_len); - d_ptr = *decoded; - e_ptr = encoded; - - while (((e_ptr - encoded) - encoded_len) > 0) { - size_t chunk_len = 0, EOL_len = 0; - int eol_mismatch = 0; - char *n_ptr; - - chunk_len = strtol(e_ptr, &n_ptr, 16); - - /* check if: - * - we could not read in chunk size - * - chunk size is not followed by (CR)LF|NUL - */ - if ((n_ptr == e_ptr) || (*n_ptr && (eol_mismatch = n_ptr != http_locate_eol(e_ptr, &EOL_len)))) { - /* don't fail on apperently not encoded data */ - if (e_ptr == encoded) { - memcpy(*decoded, encoded, encoded_len); - *decoded_len = encoded_len; - return encoded + encoded_len; - } else { - efree(*decoded); - if (eol_mismatch) { - if (EOL_len == 2) { - http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%X 0x%X)", *n_ptr, *(n_ptr + 1)); - } else { - http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0A; got: 0x%X)", *n_ptr); - } - } else { - char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n ")); - http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded); - efree(error); - } - return NULL; - } - } else { - e_ptr = n_ptr; - } - - /* reached the end */ - if (!chunk_len) { - break; - } - - memcpy(d_ptr, e_ptr += EOL_len, chunk_len); - d_ptr += chunk_len; - e_ptr += chunk_len + EOL_len; - *decoded_len += chunk_len; - } - - return e_ptr; -} -/* }}} */ /* {{{ char *http_guess_content_type(char *magic_file, long magic_mode, void *data, size_t size, http_send_mode mode) */ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmode, void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC) @@ -358,15 +344,19 @@ PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod char *ct = NULL; #ifdef HTTP_HAVE_MAGIC - struct magic_set *magic = magic_open(magicmode); + /* magic_load() fails if MAGIC_MIME is set because it + cowardly adds .mime to the file name */ + struct magic_set *magic = magic_open(magicmode &~ MAGIC_MIME); if (!magic) { http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode); } else if (-1 == magic_load(magic, magicfile)) { - http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s'", magicfile); + http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s' (%s)", magicfile, magic_error(magic)); } else { const char *ctype = NULL; + magic_setflags(magic, magicmode); + switch (data_mode) { case SEND_RSRC: