X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=e76846c43dac7f40c7b35a0c88c40137e4fcdc0c;hp=9960f2bb77064aa765cfd34eb1095bb9ee345955;hb=456dd6f5e057a0fc4ff3dbaf006d71cf5c247f19;hpb=2253ca28b6a5699a8e2d62a0458ced3cb7a3107a diff --git a/http_api.c b/http_api.c index 9960f2b..e76846c 100644 --- a/http_api.c +++ b/http_api.c @@ -22,15 +22,12 @@ #include #include "php.h" -#include "php_output.h" -#include "ext/standard/md5.h" #include "php_http.h" #include "php_http_std_defs.h" #include "php_http_api.h" -#include "php_http_send_api.h" -#include "php_http_cache_api.h" #include "php_http_headers_api.h" +#include "php_http_send_api.h" #ifdef ZEND_ENGINE_2 # include "php_http_exception_object.h" @@ -85,21 +82,39 @@ void _http_error_ex(long type, long code, const char *format, ...) } /* }}} */ -/* {{{ static STATUS http_ob_stack_get(php_ob_buffer *, php_ob_buffer **) */ -static STATUS http_ob_stack_get(php_ob_buffer *o, php_ob_buffer **s) +/* {{{ STATUS http_exit(int, char*) */ +STATUS _http_exit_ex(int status, char *header, zend_bool free_header TSRMLS_DC) { - static int i = 0; - php_ob_buffer *b = emalloc(sizeof(php_ob_buffer)); - b->handler_name = estrdup(o->handler_name); - b->buffer = estrndup(o->buffer, o->text_length); - b->text_length = o->text_length; - b->chunk_size = o->chunk_size; - b->erase = o->erase; - s[i++] = b; + 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 : ""); + if (free_header && header) { + efree(header); + } + return FAILURE; + } + if (free_header && header) { + efree(header); + } + zend_bailout(); + /* fake */ return SUCCESS; } /* }}} */ +/* {{{ STATUS http_check_method(char *) */ +STATUS _http_check_method_ex(const char *method, const char *methods) +{ + const char *found; + + if ( (found = strstr(methods, method)) && + (found == method || !isalpha(found[-1])) && + (!isalpha(found[strlen(method) + 1]))) { + return SUCCESS; + } + return FAILURE; +} +/* }}} */ + /* {{{ zval *http_get_server_var_ex(char *, size_t) */ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC) { @@ -115,86 +130,9 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen } /* }}} */ -/* {{{ void http_ob_etaghandler(char *, uint, char **, uint *, int) */ -PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len, - char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) -{ - char etag[33] = { 0 }; - unsigned char digest[16]; - if (mode & PHP_OUTPUT_HANDLER_START) { - PHP_MD5Init(&HTTP_G(etag_md5)); - } - - PHP_MD5Update(&HTTP_G(etag_md5), output, output_len); - - if (mode & PHP_OUTPUT_HANDLER_END) { - PHP_MD5Final(digest, &HTTP_G(etag_md5)); - - /* just do that if desired */ - if (HTTP_G(etag_started)) { - make_digest(etag, digest); - - if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { - http_send_status(304); - zend_bailout(); - } else { - http_send_etag(etag, 32); - } - } - } - - *handled_output_len = output_len; - *handled_output = estrndup(output, output_len); -} -/* }}} */ - -/* {{{ STATUS http_start_ob_handler(php_output_handler_func_t, char *, uint, zend_bool) */ -PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_func, - char *handler_name, uint chunk_size, zend_bool erase TSRMLS_DC) -{ - php_ob_buffer **stack; - int count, i; - - if (count = OG(ob_nesting_level)) { - stack = ecalloc(count, sizeof(php_ob_buffer *)); - - if (count > 1) { - zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP, - (int (*)(void *elem, void *)) http_ob_stack_get, stack); - } - - if (count > 0) { - http_ob_stack_get(&OG(active_ob_buffer), stack); - } - - while (OG(ob_nesting_level)) { - php_end_ob_buffer(0, 0 TSRMLS_CC); - } - } - - php_ob_set_internal_handler(handler_func, chunk_size, handler_name, erase TSRMLS_CC); - - for (i = 0; i < count; i++) { - php_ob_buffer *s = stack[i]; - if (strcmp(s->handler_name, "default output handler")) { - php_start_ob_buffer_named(s->handler_name, s->chunk_size, s->erase TSRMLS_CC); - } - php_body_write(s->buffer, s->text_length TSRMLS_CC); - efree(s->handler_name); - efree(s->buffer); - efree(s); - } - if (count) { - efree(stack); - } - - return SUCCESS; -} -/* }}} */ - -/* {{{ STATUS http_chunked_decode(char *, size_t, char **, size_t *) */ -PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len, +/* {{{ char *http_chunked_decode(char *, size_t, char **, size_t *) */ +PHP_HTTP_API char *_http_chunked_decode(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC) { const char *e_ptr; @@ -215,7 +153,7 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len if (i == 9) { http_error_ex(E_WARNING, HTTP_E_PARSE, "Chunk size is too long: 0x%s...", hex_len); efree(*decoded); - return FAILURE; + return NULL; } hex_len[i++] = *e_ptr++; } @@ -227,9 +165,11 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len /* new line */ if (strncmp(e_ptr, HTTP_CRLF, 2)) { - http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid character (expected 0x0D 0x0A; got: %x %x)", *e_ptr, *(e_ptr + 1)); + http_error_ex(E_WARNING, HTTP_E_PARSE, + "Invalid character (expected 0x0D 0x0A; got: 0x%x(%c) 0x%x(%c))", + *e_ptr, *e_ptr, *(e_ptr + 1), *(e_ptr + 1)); efree(*decoded); - return FAILURE; + return NULL; } /* hex to long */ @@ -239,7 +179,7 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len if (error == hex_len) { http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size string: '%s'", hex_len); efree(*decoded); - return FAILURE; + return NULL; } } @@ -249,7 +189,7 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len *decoded_len += chunk_len; } - return SUCCESS; + return e_ptr; } /* }}} */