X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=613d2597446b2cd2c02a121090990d1c4634d437;hp=91e8b37bbc2d10912ef67da5c70fdea3051d1cbe;hb=f8f0fd4dc265150a309824448b08249151d2ec45;hpb=0f65d4c86b76d8560f902f8d87b52fd38385d3cf diff --git a/http_api.c b/http_api.c index 91e8b37..613d259 100644 --- a/http_api.c +++ b/http_api.c @@ -15,39 +15,48 @@ /* $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" -#include "main/snprintf.h" +#include "snprintf.h" #include "ext/standard/md5.h" #include "ext/standard/url.h" #include "ext/standard/base64.h" #include "ext/standard/php_string.h" +#include "ext/standard/php_smart_str.h" #include "ext/standard/php_lcg.h" #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" +#include "php_http_build_query.c" #endif #include "php_http.h" #include "php_http_api.h" -#include +#ifdef HTTP_HAVE_CURL + +#ifdef PHP_WIN32 +#include +#include +#endif -#if defined(HAVE_CURL) && HAVE_CURL #include #include #endif + ZEND_DECLARE_MODULE_GLOBALS(http) /* {{{ day/month names */ @@ -58,7 +67,7 @@ static const char *wkdays[] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" }; static const char *weekdays[] = { - "Monday", "Tuesday", "Wednesday", + "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" }; static const char *months[] = { @@ -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) @@ -156,6 +165,14 @@ static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, i static size_t http_curl_body_callback(char *, size_t, size_t, void *); static size_t http_curl_hdrs_callback(char *, size_t, size_t, void *); + +#define http_curl_getinfo(c, h) _http_curl_getinfo((c), (h) TSRMLS_CC) +static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC); +#define http_curl_getinfo_ex(c, i, a) _http_curl_getinfo_ex((c), (i), (a) TSRMLS_CC) +static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC); +#define http_curl_getinfoname(i) _http_curl_getinfoname((i) TSRMLS_CC) +static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC); + #endif /* }}} HAVE_CURL */ @@ -282,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) @@ -458,18 +475,15 @@ 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; } - /* redirects */ + /* redirects, defaults to 0 */ if (zoption = http_curl_getopt1(options, "redirect", IS_LONG)) { curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0); curl_easy_setopt(ch, CURLOPT_MAXREDIRS, Z_LVAL_P(zoption)); @@ -505,9 +519,12 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption)); } - /* compress */ + /* compress, enabled by default (empty string enables deflate and gzip) */ if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) { - /* empty string enables deflate and gzip */ + if (Z_LVAL_P(zoption)) { + curl_easy_setopt(ch, CURLOPT_ENCODING, ""); + } + } else { curl_easy_setopt(ch, CURLOPT_ENCODING, ""); } @@ -521,18 +538,37 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti curl_easy_setopt(ch, CURLOPT_REFERER, Z_STRVAL_P(zoption)); } - /* useragent */ + /* useragent, default "PECL::HTTP/version (PHP/version)" */ if (zoption = http_curl_getopt1(options, "useragent", IS_STRING)) { curl_easy_setopt(ch, CURLOPT_USERAGENT, Z_STRVAL_P(zoption)); + } else { + curl_easy_setopt(ch, CURLOPT_USERAGENT, + "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")"); } - /* cookies */ + /* cookies, array('name' => 'value') */ if (zoption = http_curl_getopt1(options, "cookies", IS_ARRAY)) { - zval cookies, glue; - ZVAL_STRINGL(&glue, "; ", 2, 0); - php_implode(&glue, zoption, &cookies); - if (Z_STRVAL(cookies)) { - curl_easy_setopt(ch, CURLOPT_COOKIE, Z_STRVAL(cookies)); + char *cookie_key; + zval **cookie_val; + int key_type; + smart_str qstr = {0}; + + zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption)); + while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) { + if (key_type == HASH_KEY_IS_STRING) { + zend_hash_get_current_key(Z_ARRVAL_P(zoption), &cookie_key, NULL, 0); + zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val); + smart_str_appends(&qstr, cookie_key); + smart_str_appendl(&qstr, "=", 1); + smart_str_appendl(&qstr, Z_STRVAL_PP(cookie_val), Z_STRLEN_PP(cookie_val)); + smart_str_appendl(&qstr, "; ", 2); + zend_hash_move_forward(Z_ARRVAL_P(zoption)); + } + } + smart_str_0(&qstr); + + if (qstr.c) { + curl_easy_setopt(ch, CURLOPT_COOKIE, qstr.c); } } @@ -542,14 +578,22 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti curl_easy_setopt(ch, CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption)); } - /* additional headers */ + /* additional headers, array('name' => 'value') */ if (zoption = http_curl_getopt1(options, "headers", IS_ARRAY)) { - zval **header; + int key_type; + char *header_key, header[1024] = {0}; + zval **header_val; struct curl_slist *headers = NULL; + zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption)); - while (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header)) { - headers = curl_slist_append(headers, Z_STRVAL_PP(header)); - zend_hash_move_forward(Z_ARRVAL_P(zoption)); + while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) { + if (key_type == HASH_KEY_IS_STRING) { + zend_hash_get_current_key(Z_ARRVAL_P(zoption), &header_key, NULL, 0); + zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val); + snprintf(header, 1024, "%s: %s", header_key, Z_STRVAL_PP(header_val)); + headers = curl_slist_append(headers, header); + zend_hash_move_forward(Z_ARRVAL_P(zoption)); + } } if (headers) { curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers); @@ -558,9 +602,168 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti } /* }}} */ -#endif -/* }}} HAVE_CURL */ +/* {{{ static inline char *http_curl_getinfoname(CURLINFO) */ +static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC) +{ +#define CASE(I) case CURLINFO_ ##I : return #I + switch (i) + { + /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */ + CASE(EFFECTIVE_URL); + /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */ + CASE(RESPONSE_CODE); + /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */ + CASE(TOTAL_TIME); + /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */ + CASE(NAMELOOKUP_TIME); + /* CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE +5, */ + CASE(CONNECT_TIME); + /* CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE +6, */ + CASE(PRETRANSFER_TIME); + /* CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE +7, */ + CASE(SIZE_UPLOAD); + /* CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE +8, */ + CASE(SIZE_DOWNLOAD); + /* CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE +9, */ + CASE(SPEED_DOWNLOAD); + /* CURLINFO_SPEED_UPLOAD = CURLINFO_DOUBLE +10, */ + CASE(SPEED_UPLOAD); + /* CURLINFO_HEADER_SIZE = CURLINFO_LONG +11, */ + CASE(HEADER_SIZE); + /* CURLINFO_REQUEST_SIZE = CURLINFO_LONG +12, */ + CASE(REQUEST_SIZE); + /* CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG +13, */ + CASE(SSL_VERIFYRESULT); + /* CURLINFO_FILETIME = CURLINFO_LONG +14, */ + CASE(FILETIME); + /* CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE +15, */ + CASE(CONTENT_LENGTH_DOWNLOAD); + /* CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE +16, */ + CASE(CONTENT_LENGTH_UPLOAD); + /* CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE +17, */ + CASE(STARTTRANSFER_TIME); + /* CURLINFO_CONTENT_TYPE = CURLINFO_STRING +18, */ + CASE(CONTENT_TYPE); + /* CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE +19, */ + CASE(REDIRECT_TIME); + /* CURLINFO_REDIRECT_COUNT = CURLINFO_LONG +20, */ + CASE(REDIRECT_COUNT); + /* CURLINFO_PRIVATE = CURLINFO_STRING +21, */ + CASE(PRIVATE); + /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */ + CASE(HTTP_CONNECTCODE); + /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */ + CASE(HTTPAUTH_AVAIL); + /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */ + CASE(PROXYAUTH_AVAIL); + } +#undef CASE + return NULL; +} +/* }}} */ + +/* {{{ static inline void http_curl_getinfo_ex(CURL, CURLINFO, zval *) */ +static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC) +{ + char *key; + if (key = http_curl_getinfoname(i)) { + switch (i & ~CURLINFO_MASK) + { + case CURLINFO_STRING: + { + char *c; + if (CURLE_OK == curl_easy_getinfo(ch, i, &c)) { + add_assoc_string(array, key, c ? c : "", 1); + } + } + break; + + case CURLINFO_DOUBLE: + { + double d; + if (CURLE_OK == curl_easy_getinfo(ch, i, &d)) { + add_assoc_double(array, key, (double) d); + } + } + break; + + case CURLINFO_LONG: + { + long l; + if (CURLE_OK == curl_easy_getinfo(ch, i, &l)) { + add_assoc_long(array, key, (long) l); + } + } + break; + } + } +} +/* }}} */ + +/* {{{ static inline http_curl_getinfo(CURL, HashTable *) */ +static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC) +{ + zval *array; + + MAKE_STD_ZVAL(array); + Z_ARRVAL_P(array) = info; + +#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , array) + /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */ + INFO(EFFECTIVE_URL); + /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */ + INFO(RESPONSE_CODE); + /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */ + INFO(TOTAL_TIME); + /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */ + INFO(NAMELOOKUP_TIME); + /* CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE +5, */ + INFO(CONNECT_TIME); + /* CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE +6, */ + INFO(PRETRANSFER_TIME); + /* CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE +7, */ + INFO(SIZE_UPLOAD); + /* CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE +8, */ + INFO(SIZE_DOWNLOAD); + /* CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE +9, */ + INFO(SPEED_DOWNLOAD); + /* CURLINFO_SPEED_UPLOAD = CURLINFO_DOUBLE +10, */ + INFO(SPEED_UPLOAD); + /* CURLINFO_HEADER_SIZE = CURLINFO_LONG +11, */ + INFO(HEADER_SIZE); + /* CURLINFO_REQUEST_SIZE = CURLINFO_LONG +12, */ + INFO(REQUEST_SIZE); + /* CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG +13, */ + INFO(SSL_VERIFYRESULT); + /* CURLINFO_FILETIME = CURLINFO_LONG +14, */ + INFO(FILETIME); + /* CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE +15, */ + INFO(CONTENT_LENGTH_DOWNLOAD); + /* CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE +16, */ + INFO(CONTENT_LENGTH_UPLOAD); + /* CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE +17, */ + INFO(STARTTRANSFER_TIME); + /* CURLINFO_CONTENT_TYPE = CURLINFO_STRING +18, */ + INFO(CONTENT_TYPE); + /* CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE +19, */ + INFO(REDIRECT_TIME); + /* CURLINFO_REDIRECT_COUNT = CURLINFO_LONG +20, */ + INFO(REDIRECT_COUNT); + /* CURLINFO_PRIVATE = CURLINFO_STRING +21, */ + INFO(PRIVATE); + /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */ + INFO(HTTP_CONNECTCODE); + /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */ + INFO(HTTPAUTH_AVAIL); + /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */ + INFO(PROXYAUTH_AVAIL); +#undef INFO + efree(array); +} +/* }}} */ +/* {{{ Day/Month/TZ checks for http_parse_date() + Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. */ static int check_day(char *day, size_t len) { int i; @@ -602,6 +805,10 @@ static int check_tzone(char *tzone) } return -1; } +/* }}} */ + +#endif +/* }}} HAVE_CURL */ /* }}} internals */ @@ -624,12 +831,12 @@ PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC) } /* }}} */ -/* time_t http_parse_date(char *) +/* {{{ time_t http_parse_date(char *) Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. */ -PHP_HTTP_API time_t http_parse_date(const char *date) +PHP_HTTP_API time_t _http_parse_date(const char *date) { time_t t = 0; - int tz_offset = -1, year = -1, month = -1, monthday = -1, weekday = -1, + int tz_offset = -1, year = -1, month = -1, monthday = -1, weekday = -1, hours = -1, minutes = -1, seconds = -1; struct tm tm; enum assume_next dignext = DATE_MDAY; @@ -657,14 +864,14 @@ PHP_HTTP_API time_t http_parse_date(const char *date) found = 1; } } - + if (!found && (month == -1)) { month = check_month(buf); if (month != -1) { found = 1; } } - + if (!found && (tz_offset == -1)) { /* this just must be a time zone string */ tz_offset = check_tzone(buf); @@ -672,7 +879,7 @@ PHP_HTTP_API time_t http_parse_date(const char *date) found = 1; } } - + if (!found) { return -1; /* bad string */ } @@ -786,7 +993,7 @@ PHP_HTTP_API time_t http_parse_date(const char *date) if((delta > 0) && (t + delta < t)) { return -1; /* time_t overflow */ } - + t += delta; } @@ -822,7 +1029,7 @@ PHP_HTTP_API inline zval *_http_get_server_var(const char *key TSRMLS_DC) { zval **var; if (SUCCESS == zend_hash_find( - Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), + HTTP_SERVER_VARS, (char *) key, strlen(key) + 1, (void **) &var)) { return *var; } @@ -845,12 +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)); - make_digest(etag, digest); - if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { - http_send_status(304); - } else { - http_send_etag(etag, 32); + /* 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); + } else { + http_send_etag(etag, 32); + } } } @@ -899,19 +1110,22 @@ 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)); } - efree(quoted_etag); return result; } /* }}} */ /* {{{ STATUS http_send_last_modified(int) */ -PHP_HTTP_API STATUS _http_send_last_modified(const int t TSRMLS_DC) +PHP_HTTP_API STATUS _http_send_last_modified(const time_t t TSRMLS_DC) { char modified[96] = "Last-Modified: ", *date; date = http_date(t); strcat(modified, date); efree(date); + + /* remember */ + HTTP_G(lmod) = t; + return http_send_header(modified); } /* }}} */ @@ -929,6 +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; } /* }}} */ @@ -1032,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 */ @@ -1070,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; @@ -1118,6 +1339,10 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges, ptr = &end; break; + case ' ': + /* IE - ignore for now */ + break; + case 0: case ',': @@ -1166,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: @@ -1193,7 +1419,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges, PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const size_t size, const http_send_mode mode TSRMLS_DC) { zval **zrange; - long b, e, **begin, **end; + long **begin, **end; char range_header[255], multi_header[68] = "Content-Type: multipart/byteranges; boundary=", bound[23], preface[1024]; int i, c; @@ -1206,20 +1432,12 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin); zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end); - /* so zranges can be freed */ - b = **begin; - e = **end; - - /* free zranges */ - zval_dtor(zranges); - efree(zranges); - /* send content range header */ - snprintf(range_header, 255, "Content-Range: bytes %d-%d/%d", b, e, size); + snprintf(range_header, 255, "Content-Range: bytes %d-%d/%d", **begin, **end, size); http_send_header(range_header); /* send requested chunk */ - return http_send_chunk(data, b, e + 1, mode); + return http_send_chunk(data, **begin, **end + 1, mode); } /* multi range */ @@ -1247,15 +1465,10 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz **begin, **end, size); php_body_write(preface, strlen(preface) TSRMLS_CC); http_send_chunk(data, **begin, **end + 1, mode); - } - /* free zranges */ - zval_dtor(zranges); - efree(zranges); - /* write boundary once more */ - php_body_write("\n", 1 TSRMLS_CC); + php_body_write("\r\n", 1 TSRMLS_CC); php_body_write(bound, strlen(bound) TSRMLS_CC); return SUCCESS; @@ -1266,16 +1479,19 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size, const http_send_mode data_mode TSRMLS_DC) { - zval *zranges = NULL; + char *new_etag = NULL; + int is_range_request = http_is_range_request(); if (!data_ptr) { return FAILURE; } - /* never ever use the output to compute the ETag if http_send() is used */ + /* etag handling */ if (HTTP_G(etag_started)) { - char *new_etag = (char *) emalloc(33); + 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); if (NULL == http_etag(&new_etag, data_ptr, data_size, data_mode)) { efree(new_etag); @@ -1283,7 +1499,7 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size, } /* send 304 Not Modified if etag matches */ - if (http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) { + if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) { efree(new_etag); return http_send_status(304); } @@ -1292,33 +1508,53 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size, efree(new_etag); } - if (http_is_range_request()) { + /* 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); + } - MAKE_STD_ZVAL(zranges); - array_init(zranges); + if (is_range_request) { - switch (http_get_request_ranges(zranges, data_size)) - { - case RANGE_NO: - zval_dtor(zranges); - efree(zranges); - /* go ahead and send all */ - break; + /* 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))) + ) { - case RANGE_OK: - return http_send_ranges(zranges, data_ptr, data_size, data_mode); - break; + STATUS result = FAILURE; + zval *zranges = NULL; + MAKE_STD_ZVAL(zranges); + array_init(zranges); - case RANGE_ERR: - zval_dtor(zranges); - efree(zranges); - http_send_status(416); - return FAILURE; - break; + switch (http_get_request_ranges(zranges, data_size)) + { + case RANGE_NO: + zval_dtor(zranges); + efree(zranges); + /* go ahead and send all */ + break; - default: - return FAILURE; - break; + case RANGE_OK: + result = http_send_ranges(zranges, data_ptr, data_size, data_mode); + zval_dtor(zranges); + efree(zranges); + return result; + break; + + case RANGE_ERR: + zval_dtor(zranges); + efree(zranges); + http_send_status(416); + return FAILURE; + break; + + default: + return FAILURE; + break; + } } } /* send all */ @@ -1336,7 +1572,7 @@ PHP_HTTP_API STATUS _http_send_data(const zval *zdata TSRMLS_DC) return FAILURE; } - return http_send((void *) zdata, Z_STRLEN_P(zdata), SEND_DATA); + return http_send(zdata, Z_STRLEN_P(zdata), SEND_DATA); } /* }}} */ @@ -1347,7 +1583,7 @@ PHP_HTTP_API STATUS _http_send_stream(const php_stream *file TSRMLS_DC) return FAILURE; } - return http_send((void *) file, HTTP_G(ssb).sb.st_size, SEND_RSRC); + return http_send(file, HTTP_G(ssb).sb.st_size, SEND_RSRC); } /* }}} */ @@ -1497,11 +1733,11 @@ PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders, /* }}} */ /* {{{ HAVE_CURL */ -#if defined(HAVE_CURL) && HAVE_CURL +#ifdef HTTP_HAVE_CURL -/* {{{ STATUS http_get(char *, HashTable *, char **, size_t *) */ +/* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */ PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options, - char **data, size_t *data_len TSRMLS_DC) + HashTable *info, char **data, size_t *data_len TSRMLS_DC) { CURL *ch = curl_easy_init(); @@ -1519,6 +1755,9 @@ PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options, php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); return FAILURE; } + if (info) { + http_curl_getinfo(ch, info); + } curl_easy_cleanup(ch); http_curl_movebuf(CURLBUF_EVRY, data, data_len); @@ -1527,9 +1766,9 @@ PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options, } /* }}} */ -/* {{{ STATUS http_head(char *, HashTable *, char **data, size_t *) */ +/* {{{ STATUS http_head(char *, HashTable *, HashTable *, char **data, size_t *) */ PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options, - char **data, size_t *data_len TSRMLS_DC) + HashTable *info, char **data, size_t *data_len TSRMLS_DC) { CURL *ch = curl_easy_init(); @@ -1548,6 +1787,9 @@ PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options, php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); return FAILURE; } + if (info) { + http_curl_getinfo(ch, info); + } curl_easy_cleanup(ch); http_curl_movebuf(CURLBUF_HDRS, data, data_len); @@ -1556,9 +1798,9 @@ PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options, } /* }}} */ -/* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, char **, size_t *) */ +/* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */ PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata, - size_t postdata_len, HashTable *options, char **data, + size_t postdata_len, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC) { CURL *ch = curl_easy_init(); @@ -1580,6 +1822,9 @@ PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata, php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); return FAILURE; } + if (info) { + http_curl_getinfo(ch, info); + } curl_easy_cleanup(ch); http_curl_movebuf(CURLBUF_EVRY, data, data_len); @@ -1588,9 +1833,9 @@ PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata, } /* }}} */ -/* {{{ STATUS http_post_array(char *, HashTable *, HashTable *, char **, size_t *) */ +/* {{{ STATUS http_post_array(char *, HashTable *, HashTable *, HashTable *, char **, size_t *) */ PHP_HTTP_API STATUS _http_post_array(const char *URL, HashTable *postarray, - HashTable *options, char **data, size_t *data_len TSRMLS_DC) + HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC) { smart_str qstr = {0}; STATUS status; @@ -1604,7 +1849,7 @@ PHP_HTTP_API STATUS _http_post_array(const char *URL, HashTable *postarray, } smart_str_0(&qstr); - status = http_post_data(URL, qstr.c, qstr.len, options, data, data_len); + status = http_post_data(URL, qstr.c, qstr.len, options, info, data, data_len); if (qstr.c) { efree(qstr.c); }