X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_api.c;h=f68f57e3d6aed62b6a6fec835f46e94ae3b1b286;hb=46d6daa4a43957825dafbfb8afaebf88216685e7;hp=210b9301a339b57d477371c445ef25a5e3ed39ab;hpb=7dedd1935ab8400dfbd49fe63c83b74b0d0b68e6;p=m6w6%2Fext-http diff --git a/http_api.c b/http_api.c index 210b930..f68f57e 100644 --- a/http_api.c +++ b/http_api.c @@ -15,10 +15,14 @@ /* $Id$ */ +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS + #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include + #include "php.h" #include "php_version.h" #include "php_streams.h" @@ -32,22 +36,27 @@ #include "SAPI.h" -#if (PHP_MAJOR_VERSION >= 5) +#ifdef ZEND_ENGINE_2 #include "ext/standard/php_http.h" #else -#include "php_http_build_query.h" #include "http_build_query.c" #endif #include "php_http.h" #include "php_http_api.h" -#include -#if defined(HAVE_CURL) && HAVE_CURL +#ifdef HTTP_HAVE_CURL + +#ifdef PHP_WIN32 +#include +#include +#endif + #include #include #endif + ZEND_DECLARE_MODULE_GLOBALS(http) /* {{{ day/month names */ @@ -135,7 +144,7 @@ static int check_month(char *month); static int check_tzone(char *tzone); /* {{{ HAVE_CURL */ -#if defined(HAVE_CURL) && HAVE_CURL +#ifdef HTTP_HAVE_CURL #define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC) static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC); #define http_curl_freebuf(m) _http_curl_freebuf((m) TSRMLS_CC) @@ -290,7 +299,7 @@ static STATUS _http_send_chunk(const void *data, const size_t begin, /* }}} */ /* {{{ HAVE_CURL */ -#if defined(HAVE_CURL) && HAVE_CURL +#ifdef HTTP_HAVE_CURL /* {{{ static inline void http_curl_initbuf(http_curlbuf_member) */ static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC) @@ -466,12 +475,9 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1); curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_body_callback); curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, http_curl_hdrs_callback); -#if defined(ZTS) +#ifdef ZTS curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1); #endif -#if defined(PHP_DEBUG) - curl_easy_setopt(ch, CURLOPT_VERBOSE, 1); -#endif if ((!options) || (1 > zend_hash_num_elements(options))) { return; @@ -1046,16 +1052,16 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint 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); + make_digest(etag, digest); - if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { - http_send_status(304); - } else { - http_send_etag(etag, 32); - } + if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { + http_send_status(304); + } else { + http_send_etag(etag, 32); + } } } @@ -1078,12 +1084,6 @@ PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_D chr_ptr = 0; } retval = (t <= http_parse_date(modified)); -#if defined(PHP_DEBUG) - fprintf(stderr, - "\nComparing Last-Modified %s(%s)==%d:\n\t%d\n\t%d\n\n", - get_active_function_name(TSRMLS_C), entry, retval, t, - http_parse_date(modified)); -#endif efree(modified); return retval; } @@ -1110,12 +1110,6 @@ PHP_HTTP_API int _http_etag_match(const char *entry, const char *etag TSRMLS_DC) } else { result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag)); } -#if defined(PHP_DEBUG) - fprintf(stderr, - "\nComparing E-Tag %s(%s)==%d:\n\t<%s>\n\t<%s>\n\n", - get_active_function_name(TSRMLS_C), entry, result, - Z_STRVAL_P(zetag), quoted_etag); -#endif efree(quoted_etag); return result; } @@ -1128,10 +1122,10 @@ PHP_HTTP_API STATUS _http_send_last_modified(const time_t t TSRMLS_DC) date = http_date(t); strcat(modified, date); efree(date); - + /* remember */ HTTP_G(lmod) = t; - + return http_send_header(modified); } /* }}} */ @@ -1149,13 +1143,13 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag, snprintf(etag_header, header_len, "ETag: \"%s\"", etag); ret = http_send_header(etag_header); efree(etag_header); - + /* remember */ if (HTTP_G(etag)) { efree(HTTP_G(etag)); } HTTP_G(etag) = estrdup(etag); - + return ret; } /* }}} */ @@ -1259,7 +1253,7 @@ PHP_HTTP_API char *_http_negotiate_q(const char *entry, const zval *supported, if (NULL != (q_ptr = strrchr(Z_STRVAL_PP(zentry), ';'))) { qual = strtod(q_ptr + 3, NULL); } else { - qual = 1000.0 - 1; + qual = 1000.0 - i; } /* walk through the supported array */ @@ -1297,7 +1291,7 @@ PHP_HTTP_API char *_http_negotiate_q(const char *entry, const zval *supported, PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges, const size_t length TSRMLS_DC) { - zval *zrange, *zentry, **zentries; + zval *zrange; char *range, c; long begin = -1, end = -1, *ptr; @@ -1348,7 +1342,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges, case ' ': /* IE - ignore for now */ break; - + case 0: case ',': @@ -1397,17 +1391,18 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges, break; } } - - zentry = (zval *) zentries++; - MAKE_STD_ZVAL(zentry); - array_init(zentry); - add_index_long(zentry, 0, begin); - add_index_long(zentry, 1, end); - add_next_index_zval(zranges, zentry); - - begin = -1; - end = -1; - ptr = &begin; + { + zval *zentry; + MAKE_STD_ZVAL(zentry); + array_init(zentry); + add_index_long(zentry, 0, begin); + add_index_long(zentry, 1, end); + add_next_index_zval(zranges, zentry); + + begin = -1; + end = -1; + ptr = &begin; + } break; default: @@ -1486,7 +1481,7 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size, { char *new_etag = NULL; int is_range_request = http_is_range_request(); - + if (!data_ptr) { return FAILURE; } @@ -1494,7 +1489,7 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size, /* etag handling */ if (HTTP_G(etag_started)) { new_etag = (char *) emalloc(33); - + /* never ever use the output to compute the ETag if http_send() is used */ HTTP_G(etag_started) = 0; php_end_ob_buffer(0, 0 TSRMLS_CC); @@ -1512,7 +1507,7 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size, http_send_etag(new_etag, 32); efree(new_etag); } - + /* 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); @@ -1528,7 +1523,7 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size, ((!zend_hash_exists(HTTP_SERVER_VARS, "HTTP_IF_UNMODIFIED_SINCE", 25)) || http_modified_match("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(lmod))) ) { - + STATUS result = FAILURE; zval *zranges = NULL; MAKE_STD_ZVAL(zranges); @@ -1674,8 +1669,8 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, } /* }}} */ -/* {{{ proto void http_split_response(zval *, zval *, zval *) */ -PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders, +/* {{{ proto STATUS http_split_response(zval *, zval *, zval *) */ +PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders, zval *zbody TSRMLS_DC) { char *header, *response, *body = NULL; @@ -1698,47 +1693,61 @@ PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders, Z_TYPE_P(zbody) = IS_NULL; } - /* check for HTTP status - FIXXME: strchr() */ + return http_parse_header(header, body - Z_STRVAL_P(zresponse), zheaders); +} +/* }}} */ + +/* {{{ STATUS http_parse_header(char *, long, zval *) */ +PHP_HTTP_API STATUS _http_parse_header(char *header, long header_len, zval *array TSRMLS_DC) +{ + char *colon = NULL, *line = NULL, *begin = header; + + if (header_len < 8) { + return FAILURE; + } + + /* status code */ if (!strncmp(header, "HTTP/1.", 7)) { - char *end = strchr(header, '\r'); - add_assoc_stringl(zheaders, "Status", + char *end = strstr(header, "\r\n"); + add_assoc_stringl(array, "Status", header + strlen("HTTP/1.x "), end - (header + strlen("HTTP/1.x ")), 1); header = end + 2; } - /* split headers */ - { - char *colon = NULL, *line = header; - while ( (line - Z_STRVAL_P(zresponse) + 3) < - (body - Z_STRVAL_P(zresponse))) { - switch (*line++) - { - case '\r': - if (colon && (*line == '\n')) { - char *key = estrndup(header, colon - header); - add_assoc_stringl(zheaders, key, - colon + 2, line - colon - 3, 1); - efree(key); - - colon = NULL; - header += line - header + 1; - } - break; + line = header; - case ':': - if (!colon) { - colon = line - 1; - } - break; - } + /* + * FIXXME: support for folded headers + */ + while (header_len > (line - begin)) { + switch (*line++) + { + case 0: + case '\r': + if (colon && (*line == '\n')) { + char *key = estrndup(header, colon - header); + add_assoc_stringl(array, key, colon + 2, line - colon - 3, 1); + efree(key); + + colon = NULL; + header += line - header + 1; + } + break; + + case ':': + if (!colon) { + colon = line - 1; + } + break; } } + return SUCCESS; } /* }}} */ /* {{{ HAVE_CURL */ -#if defined(HAVE_CURL) && HAVE_CURL +#ifdef HTTP_HAVE_CURL /* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */ PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,