X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=d8a0828df32ca2bd4f57645bffdbb0e9e2b99648;hp=210b9301a339b57d477371c445ef25a5e3ed39ab;hb=a28b5309657ba64473499e3592f2c943c38dab55;hpb=7dedd1935ab8400dfbd49fe63c83b74b0d0b68e6 diff --git a/http_api.c b/http_api.c index 210b930..d8a0828 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: @@ -1423,16 +1418,17 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges, /* {{{ STATUS http_send_ranges(zval *, void *, size_t, http_send_mode) */ 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; + int c; long **begin, **end; - char range_header[255], multi_header[68] = "Content-Type: multipart/byteranges; boundary=", bound[23], preface[1024]; - int i, c; + zval **zrange; /* Send HTTP 206 Partial Content */ http_send_status(206); /* single range */ if ((c = zend_hash_num_elements(Z_ARRVAL_P(zranges))) == 1) { + char range_header[256] = {0}; + zend_hash_index_find(Z_ARRVAL_P(zranges), 0, (void **) &zrange); zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin); zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end); @@ -1446,37 +1442,52 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz } /* multi range */ - - snprintf(bound, 23, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C)); - strncat(multi_header, bound + 2, 21); - http_send_header(multi_header); - - /* send each requested chunk */ - for ( i = 0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(zranges)); - i < c; - i++, zend_hash_move_forward(Z_ARRVAL_P(zranges))) { - if ( HASH_KEY_NON_EXISTANT == zend_hash_get_current_data( - Z_ARRVAL_P(zranges), (void **) &zrange) || - SUCCESS != zend_hash_index_find( - Z_ARRVAL_PP(zrange), 0, (void **) &begin) || - SUCCESS != zend_hash_index_find( - Z_ARRVAL_PP(zrange), 1, (void **) &end)) { - break; + else { + int i; + char bound[23] = {0}, preface[1024] = {0}, + multi_header[68] = "Content-Type: multipart/byteranges; boundary="; + + snprintf(bound, 22, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C)); + strncat(multi_header, bound + 2, 21); + http_send_header(multi_header); + + /* send each requested chunk */ + for ( i = 0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(zranges)); + i < c; + i++, zend_hash_move_forward(Z_ARRVAL_P(zranges))) { + if ( HASH_KEY_NON_EXISTANT == zend_hash_get_current_data( + Z_ARRVAL_P(zranges), (void **) &zrange) || + SUCCESS != zend_hash_index_find( + Z_ARRVAL_PP(zrange), 0, (void **) &begin) || + SUCCESS != zend_hash_index_find( + Z_ARRVAL_PP(zrange), 1, (void **) &end)) { + break; + } + + snprintf(preface, 1023, + HTTP_CRLF "%s" + HTTP_CRLF "Content-Type: %s" + HTTP_CRLF "Content-Range: bytes %ld-%ld/%ld" + HTTP_CRLF + HTTP_CRLF, + + bound, + HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream", + **begin, + **end, + size + ); + + php_body_write(preface, strlen(preface) TSRMLS_CC); + http_send_chunk(data, **begin, **end + 1, mode); } - snprintf(preface, 1024, - "\r\n%s\r\nContent-Type: %s\r\nContent-Range: bytes %d-%d/%d\r\n\r\n", bound, - HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream", - **begin, **end, size); - php_body_write(preface, strlen(preface) TSRMLS_CC); - http_send_chunk(data, **begin, **end + 1, mode); - } - - /* write boundary once more */ - php_body_write("\r\n", 1 TSRMLS_CC); - php_body_write(bound, strlen(bound) TSRMLS_CC); + /* write boundary once more */ + php_body_write(HTTP_CRLF, 2 TSRMLS_CC); + php_body_write(bound, strlen(bound) TSRMLS_CC); - return SUCCESS; + return SUCCESS; + } } /* }}} */ @@ -1486,7 +1497,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 +1505,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 +1523,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 +1539,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); @@ -1621,7 +1632,7 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, char *d_ptr; *decoded_len = 0; - *decoded = (char *) ecalloc(1, encoded_len); + *decoded = (char *) ecalloc(encoded_len, 1); d_ptr = *decoded; e_ptr = encoded; @@ -1641,8 +1652,22 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, hex_len[i++] = *e_ptr++; } + /* reached the end */ + if (!strcmp(hex_len, "0")) { + break; + } + + /* new line */ + if (strncmp(e_ptr, HTTP_CRLF, 2)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Invalid character (expected 0x0D 0x0A; got: %x %x)", + *e_ptr, *(e_ptr + 1)); + efree(*decoded); + return FAILURE; + } + /* hex to long */ - if (strcmp(hex_len, "0")) { + { char *error = NULL; chunk_len = strtol(hex_len, &error, 16); if (error == hex_len) { @@ -1651,20 +1676,9 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, efree(*decoded); return FAILURE; } - } else { - break; } - /* new line */ - if (*e_ptr++ != '\r' || *e_ptr++ != '\n') { - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Invalid character (expected 0x0A, 0x0D; got: %x)", - *(e_ptr - 1)); - efree(*decoded); - return FAILURE; - } - - memcpy(d_ptr, e_ptr, chunk_len); + memcpy(d_ptr, e_ptr += 2, chunk_len); d_ptr += chunk_len; e_ptr += chunk_len + 2; *decoded_len += chunk_len; @@ -1674,8 +1688,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 +1712,58 @@ 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_headers(header, body - Z_STRVAL_P(zresponse), zheaders); +} +/* }}} */ + +/* {{{ STATUS http_parse_headers(char *, long, zval *) */ +PHP_HTTP_API STATUS _http_parse_headers(char *header, int 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, HTTP_CRLF); + 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; - } + while (header_len > (line - begin)) { + switch (*line++) + { + case 0: + case '\n': + if (colon && (*line != ' ') && (*line != '\t')) { + char *key = estrndup(header, colon - header); + add_assoc_stringl(array, key, colon + 2, line - colon - 4, 1); + efree(key); + + colon = NULL; + header += line - header; + } + 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,