X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=2b3e33c7d57fbc400aaf41d260d3111ecbbeb2c7;hp=2161d6d571d14f2807c022450122e174a0971e98;hb=15eb1d1f8f77ed2481169c792715c11656182795;hpb=815d3dc46b3c98fded874db7b8ef5f0f70dd9927 diff --git a/http_api.c b/http_api.c index 2161d6d..2b3e33c 100644 --- a/http_api.c +++ b/http_api.c @@ -15,18 +15,22 @@ /* $Id$ */ -#define _WINSOCKAPI_ -#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS - #ifdef HAVE_CONFIG_H # include "config.h" #endif #include +#ifdef PHP_WIN32 +# include +#elif defined(HAVE_NETDB_H) +# include +#endif + #include "php.h" #include "php_version.h" #include "php_streams.h" +#include "php_output.h" #include "snprintf.h" #include "ext/standard/md5.h" #include "ext/standard/url.h" @@ -153,18 +157,20 @@ static int http_sort_q(const void *a, const void *b TSRMLS_DC) static STATUS _http_send_chunk(const void *data, const size_t begin, const size_t end, const http_send_mode mode TSRMLS_DC) { - char *buf; - size_t read = 0; long len = end - begin; - php_stream *s; switch (mode) { case SEND_RSRC: - s = (php_stream *) data; + { + char *buf; + size_t read = 0; + php_stream *s = (php_stream *) data; + if (php_stream_seek(s, begin, SEEK_SET)) { return FAILURE; } + buf = (char *) ecalloc(1, HTTP_SENDBUF_SIZE); /* read into buf and write out */ while ((len -= HTTP_SENDBUF_SIZE) >= 0) { @@ -176,6 +182,9 @@ static STATUS _http_send_chunk(const void *data, const size_t begin, efree(buf); return FAILURE; } + /* ob_flush() && flush() */ + php_end_ob_buffer(1, 1 TSRMLS_CC); + sapi_flush(TSRMLS_C); } /* read & write left over */ @@ -189,15 +198,39 @@ static STATUS _http_send_chunk(const void *data, const size_t begin, efree(buf); return FAILURE; } + /* ob_flush() & flush() */ + php_end_ob_buffer(1, 1 TSRMLS_CC); + sapi_flush(TSRMLS_C); } efree(buf); return SUCCESS; - break; + } case SEND_DATA: - return len == php_body_write(((char *)data) + begin, len TSRMLS_CC) - ? SUCCESS : FAILURE; - break; + { + char *s = (char *) data + begin; + + while ((len -= HTTP_SENDBUF_SIZE) >= 0) { + if (HTTP_SENDBUF_SIZE - php_body_write(s, HTTP_SENDBUF_SIZE TSRMLS_CC)) { + return FAILURE; + } + s += HTTP_SENDBUF_SIZE; + /* ob_flush() & flush() */ + php_end_ob_buffer(1, 1 TSRMLS_CC); + sapi_flush(TSRMLS_C); + } + + /* write left over */ + if (len) { + if (HTTP_SENDBUF_SIZE + len - php_body_write(s, HTTP_SENDBUF_SIZE + len TSRMLS_CC)) { + return FAILURE; + } + /* ob_flush() & flush() */ + php_end_ob_buffer(1, 1 TSRMLS_CC); + sapi_flush(TSRMLS_C); + } + return SUCCESS; + } default: return FAILURE; @@ -571,14 +604,16 @@ PHP_HTTP_API STATUS _http_send_status_header(const int status, const char *heade } /* }}} */ -/* {{{ zval *http_get_server_var(char *) */ -PHP_HTTP_API zval *_http_get_server_var(const char *key TSRMLS_DC) +/* {{{ 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) { zval **var; - if (SUCCESS == zend_hash_find( - HTTP_SERVER_VARS, - (char *) key, strlen(key) + 1, (void **) &var)) { - return *var; + if (SUCCESS == zend_hash_find(HTTP_SERVER_VARS, (char *) key, key_size, (void **) &var)) { + if (check) { + return Z_STRVAL_PP(var) && Z_STRLEN_PP(var) ? *var : NULL; + } else { + return *var; + } } return NULL; } @@ -606,6 +641,7 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len, if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { http_send_status(304); + zend_bailout(); } else { http_send_etag(etag, 32); } @@ -661,14 +697,15 @@ PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_fun } /* }}} */ -/* {{{ int http_modified_match(char *, int) */ -PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_DC) +/* {{{ int http_modified_match(char *, time_t) */ +PHP_HTTP_API int _http_modified_match_ex(const char *entry, const time_t t, + const int enforce_presence TSRMLS_DC) { int retval; zval *zmodified; char *modified, *chr_ptr; - HTTP_GSC(zmodified, entry, 0); + HTTP_GSC(zmodified, entry, !enforce_presence); modified = estrndup(Z_STRVAL_P(zmodified), Z_STRLEN_P(zmodified)); if (chr_ptr = strrchr(modified, ';')) { @@ -681,13 +718,14 @@ PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_D /* }}} */ /* {{{ int http_etag_match(char *, char *) */ -PHP_HTTP_API int _http_etag_match(const char *entry, const char *etag TSRMLS_DC) +PHP_HTTP_API int _http_etag_match_ex(const char *entry, const char *etag, + const int enforce_presence TSRMLS_DC) { zval *zetag; char *quoted_etag; STATUS result; - HTTP_GSC(zetag, entry, 0); + HTTP_GSC(zetag, entry, !enforce_presence); if (NULL != strchr(Z_STRVAL_P(zetag), '*')) { return 1; @@ -886,7 +924,7 @@ PHP_HTTP_API char *_http_absolute_uri_ex( const char *host, size_t host_len, unsigned port TSRMLS_DC) { -#ifdef ZEND_ENGINE_2 +#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) struct servent *se; #endif php_url *purl, furl = {NULL}; @@ -902,7 +940,7 @@ PHP_HTTP_API char *_http_absolute_uri_ex( return NULL; } - if (!(purl = php_url_parse(url))) { + if (!(purl = php_url_parse((char *) url))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse supplied URL"); return NULL; } @@ -913,12 +951,12 @@ PHP_HTTP_API char *_http_absolute_uri_ex( furl.query = purl->query; furl.fragment = purl->fragment; - if (proto) { + if (proto && proto_len) { furl.scheme = scheme = estrdup(proto); } else if (purl->scheme) { furl.scheme = purl->scheme; -#ifdef ZEND_ENGINE_2 - } else if (port && (se = getservbyport(htons(port), "tcp"))) { +#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) + } else if (port && (se = getservbyport(port, "tcp"))) { furl.scheme = (scheme = estrdup(se->s_name)); #endif } else { @@ -930,14 +968,13 @@ PHP_HTTP_API char *_http_absolute_uri_ex( } else if (purl->port) { furl.port = purl->port; } else if (strncmp(furl.scheme, "http", 4)) { -#ifdef ZEND_ENGINE_2 +#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) if (se = getservbyname(furl.scheme, "tcp")) { - furl.port = ntohs(se->s_port); - } else + furl.port = se->s_port; + } #endif - furl.port = 80; } else { - furl.port = (furl.scheme[5] == 's') ? 443 : 80; + furl.port = (furl.scheme[4] == 's') ? 443 : 80; } if (host) { @@ -982,14 +1019,17 @@ PHP_HTTP_API char *_http_absolute_uri_ex( HTTP_URI_STRLCATL(URL, full_len, furl.host); - if ( (strcmp(furl.scheme, "http") && (furl.port != 80)) || - (strcmp(furl.scheme, "https") && (furl.port != 443))) { + if ( (!strcmp(furl.scheme, "http") && (furl.port != 80)) || + (!strcmp(furl.scheme, "https") && (furl.port != 443))) { char port_string[8] = {0}; snprintf(port_string, 7, ":%u", furl.port); HTTP_URI_STRLCATL(URL, full_len, port_string); } if (furl.path) { + if (furl.path[0] != '/') { + HTTP_URI_STRLCATS(URL, full_len, "/"); + } HTTP_URI_STRLCATL(URL, full_len, furl.path); } else { HTTP_URI_STRLCATS(URL, full_len, "/"); @@ -1014,70 +1054,53 @@ PHP_HTTP_API char *_http_absolute_uri_ex( } /* }}} */ -/* {{{ char *http_negotiate_q(char *, zval *, char *, hash_entry_type) */ -PHP_HTTP_API char *_http_negotiate_q(const char *entry, const zval *supported, - const char *def TSRMLS_DC) +/* {{{ char *http_negotiate_q(char *, HashTable *, char *) */ +PHP_HTTP_API char *_http_negotiate_q(const char *entry, const HashTable *supported, const char *def TSRMLS_DC) { - zval *zaccept, *zarray, *zdelim, **zentry, *zentries, **zsupp; - char *q_ptr, *result; - int i, c; + zval *zaccept, zdelim, zarray, zentries, **zentry, **zsupp; + char *q_ptr = NULL, *key = NULL; + int i = 0, idx = 0; double qual; HTTP_GSC(zaccept, entry, estrdup(def)); - MAKE_STD_ZVAL(zarray); - array_init(zarray); - - MAKE_STD_ZVAL(zdelim); - ZVAL_STRING(zdelim, ",", 0); - php_explode(zdelim, zaccept, zarray, -1); - efree(zdelim); + array_init(&zarray); + array_init(&zentries); - MAKE_STD_ZVAL(zentries); - array_init(zentries); + Z_STRVAL(zdelim) = ","; + Z_STRLEN(zdelim) = 1; - c = zend_hash_num_elements(Z_ARRVAL_P(zarray)); - for (i = 0; i < c; i++, zend_hash_move_forward(Z_ARRVAL_P(zarray))) { + php_explode(&zdelim, zaccept, &zarray, -1); - if (SUCCESS != zend_hash_get_current_data( - Z_ARRVAL_P(zarray), (void **) &zentry)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Cannot parse %s header: %s", entry, Z_STRVAL_P(zaccept)); - break; - } - - /* check for qualifier */ - if (NULL != (q_ptr = strrchr(Z_STRVAL_PP(zentry), ';'))) { + FOREACH_HASH_VAL(Z_ARRVAL(zarray), zentry) { + if (q_ptr = strrchr(Z_STRVAL_PP(zentry), ';')) { qual = strtod(q_ptr + 3, NULL); + *q_ptr = 0; + q_ptr = NULL; } else { - qual = 1000.0 - i; + qual = 1000.0 - i++; } - - /* walk through the supported array */ - FOREACH_VAL(supported, zsupp) { + FOREACH_HASH_VAL((HashTable *)supported, zsupp) { if (!strcasecmp(Z_STRVAL_PP(zsupp), Z_STRVAL_PP(zentry))) { - add_assoc_double(zentries, Z_STRVAL_PP(zsupp), qual); + add_assoc_double(&zentries, Z_STRVAL_PP(zsupp), qual); break; } } } + zval_dtor(&zarray); - zval_dtor(zarray); - efree(zarray); - - zend_hash_internal_pointer_reset(Z_ARRVAL_P(zentries)); - - if ( (SUCCESS != zend_hash_sort(Z_ARRVAL_P(zentries), zend_qsort, - http_sort_q, 0 TSRMLS_CC)) || - (HASH_KEY_NON_EXISTANT == zend_hash_get_current_key( - Z_ARRVAL_P(zentries), &result, 0, 1))) { - result = estrdup(def); + zend_hash_sort(Z_ARRVAL(zentries), zend_qsort, http_sort_q, 0 TSRMLS_CC); + + FOREACH_HASH_KEY(Z_ARRVAL(zentries), key, idx) { + if (key) { + key = estrdup(key); + zval_dtor(&zentries); + return key; + } } - - zval_dtor(zentries); - efree(zentries); - - return result; + zval_dtor(&zentries); + + return estrdup(def); } /* }}} */ @@ -1146,7 +1169,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, { /* "0-12345" */ case -10: - if ((length - end) < 1) { + if (length <= end) { return RANGE_ERR; } begin = 0; @@ -1154,11 +1177,11 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, /* "-12345" */ case -1: - if ((length - end) < 1) { + if (length <= end) { return RANGE_ERR; } begin = length - end; - end = length; + end = length - 1; break; /* "12345-(xxx)" */ @@ -1167,7 +1190,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, { /* "12345-" */ case -1: - if ((length - begin) < 1) { + if (length <= begin) { return RANGE_ERR; } end = length - 1; @@ -1175,9 +1198,9 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, /* "12345-67890" */ default: - if ( ((length - begin) < 1) || - ((length - end) < 1) || - ((begin - end) >= 0)) { + if ( (length <= begin) || + (length <= end) || + (end < begin)) { return RANGE_ERR; } break; @@ -1288,7 +1311,9 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, const PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size, const http_send_mode data_mode TSRMLS_DC) { - int is_range_request = http_is_range_request(); + HashTable ranges; + http_range_status range_status; + int cache_etag = 0; if (!data_ptr) { return FAILURE; @@ -1297,73 +1322,58 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size, return SUCCESS; } - /* etag handling */ - if (HTTP_G(etag_started)) { - char *etag; + /* stop on-the-fly etag generation */ + if (cache_etag = HTTP_G(etag_started)) { /* interrupt */ HTTP_G(etag_started) = 0; /* never ever use the output to compute the ETag if http_send() is used */ - php_end_ob_buffer(0, 0 TSRMLS_CC); - if (!(etag = http_etag(data_ptr, data_size, data_mode))) { - return FAILURE; - } - - /* send 304 Not Modified if etag matches */ - if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", etag)) { - efree(etag); - return http_send_status(304); - } - - http_send_etag(etag, 32); - efree(etag); + php_end_ob_buffers(0 TSRMLS_CC); } - /* send 304 Not Modified if last-modified matches*/ - if ((!is_range_request) && http_modified_match("HTTP_IF_MODIFIED_SINCE", HTTP_G(lmod))) { - return http_send_status(304); - } - - if (is_range_request) { + zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0); + range_status = http_get_request_ranges(&ranges, data_size); - /* only send ranges if entity hasn't changed */ - if ( - ((!zend_hash_exists(HTTP_SERVER_VARS, "HTTP_IF_MATCH", 13)) || - http_etag_match("HTTP_IF_MATCH", HTTP_G(etag))) - && - ((!zend_hash_exists(HTTP_SERVER_VARS, "HTTP_IF_UNMODIFIED_SINCE", 25)) || - http_modified_match("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(lmod))) - ) { - - STATUS result = FAILURE; - HashTable ranges; - zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0); + if (range_status == RANGE_ERR) { + zend_hash_destroy(&ranges); + http_send_status(416); + return FAILURE; + } - switch (http_get_request_ranges(&ranges, data_size)) - { - case RANGE_NO: - zend_hash_destroy(&ranges); - /* go ahead and send all */ - break; + /* Range Request - only send ranges if entity hasn't changed */ + if ( range_status == RANGE_OK && + http_etag_match_ex("HTTP_IF_MATCH", HTTP_G(etag), 0) && + http_modified_match_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(lmod), 0)) { + STATUS result = http_send_ranges(&ranges, data_ptr, data_size, data_mode); + zend_hash_destroy(&ranges); + return result; + } + + zend_hash_destroy(&ranges); - case RANGE_OK: - result = http_send_ranges(&ranges, data_ptr, data_size, data_mode); - zend_hash_destroy(&ranges); - return result; - break; + /* send 304 Not Modified if etag matches */ + if (cache_etag) { + char *etag = NULL; + int etag_match = 0; - case RANGE_ERR: - zend_hash_destroy(&ranges); - http_send_status(416); - return FAILURE; - break; + if (!(etag = http_etag(data_ptr, data_size, data_mode))) { + return FAILURE; + } - default: - return FAILURE; - break; - } + http_send_etag(etag, 32); + etag_match = http_etag_match("HTTP_IF_NONE_MATCH", etag); + efree(etag); + + if (etag_match) { + return http_send_status(304); } } - /* send all */ + + /* send 304 Not Modified if last modified matches */ + if (http_modified_match("HTTP_IF_MODIFIED_SINCE", HTTP_G(lmod))) { + return http_send_status(304); + } + + /* send full entity */ return http_send_chunk(data_ptr, 0, data_size, data_mode); } /* }}} */ @@ -1388,7 +1398,7 @@ PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, } /* }}} */ -/* {{{ proto STATUS http_chunked_decode(char *, size_t, char **, size_t *) */ +/* {{{ STATUS http_chunked_decode(char *, size_t, char **, size_t *) */ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, const size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC) { @@ -1452,28 +1462,39 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, } /* }}} */ -/* {{{ proto STATUS http_split_response_ex(char *, size_t, zval *, zval *) */ +/* {{{ STATUS http_split_response(zval *, zval *, zval *) */ +PHP_HTTP_API STATUS _http_split_response(zval *response, zval *headers, zval *body TSRMLS_DC) +{ + char *b = NULL; + size_t l = 0; + STATUS status = http_split_response_ex(Z_STRVAL_P(response), Z_STRLEN_P(response), Z_ARRVAL_P(headers), &b, &l); + ZVAL_STRINGL(body, b, l, 0); + return status; +} +/* }}} */ + +/* {{{ STATUS http_split_response(char *, size_t, HashTable *, char **, size_t *) */ PHP_HTTP_API STATUS _http_split_response_ex(char *response, size_t response_len, HashTable *headers, char **body, size_t *body_len TSRMLS_DC) { - char *header = response; - *body = NULL; + char *header = response, *real_body = NULL; while (0 < (response_len - (response - header + 4))) { if ( (*response++ == '\r') && (*response++ == '\n') && (*response++ == '\r') && (*response++ == '\n')) { - *body = response; + real_body = response; break; } } - if (*body && (*body_len = (response_len - (*body - header)))) { - *body = estrndup(*body, *body_len); + if (real_body && (*body_len = (response_len - (real_body - header)))) { + *body = ecalloc(1, *body_len + 1); + memcpy(*body, real_body, *body_len); } - return http_parse_headers_ex(header, *body ? response_len - *body_len : response_len, headers, 1); + return http_parse_headers_ex(header, real_body ? response_len - *body_len : response_len, headers, 1); } /* }}} */ @@ -1555,25 +1576,26 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(char *header, int header_len, /* {{{ void http_get_request_headers_ex(HashTable *, zend_bool) */ PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool prettify TSRMLS_DC) { - char *key = NULL; - long idx = 0; - zval array; + char *key = NULL; + long idx = 0; + zval array; - Z_ARRVAL(array) = headers; + Z_ARRVAL(array) = headers; - FOREACH_HASH_KEY(HTTP_SERVER_VARS, key, idx) { - if (key && !strncmp(key, "HTTP_", 5)) { - zval **header; + FOREACH_HASH_KEY(HTTP_SERVER_VARS, key, idx) { + if (key && !strncmp(key, "HTTP_", 5)) { + zval **header; - if (prettify) { - key = pretty_key(key + 5, strlen(key) - 5, 1, 1); - } + key += 5; + if (prettify) { + key = pretty_key(key, strlen(key), 1, 1); + } - zend_hash_get_current_data(HTTP_SERVER_VARS, (void **) &header); - add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1); - key = NULL; - } - } + zend_hash_get_current_data(HTTP_SERVER_VARS, (void **) &header); + add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1); + key = NULL; + } + } } /* }}} */