X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=7904c5d9271ac295671787dc1fcced2f1b939a52;hp=f68f57e3d6aed62b6a6fec835f46e94ae3b1b286;hb=8d7fee64c740137b693630ad82374c11d1aaa76a;hpb=68a779badeace396e3a86caf9cb86b7e70ff636a diff --git a/http_api.c b/http_api.c index f68f57e..7904c5d 100644 --- a/http_api.c +++ b/http_api.c @@ -18,7 +18,7 @@ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif #include @@ -37,9 +37,9 @@ #include "SAPI.h" #ifdef ZEND_ENGINE_2 -#include "ext/standard/php_http.h" +# include "ext/standard/php_http.h" #else -#include "http_build_query.c" + #include "http_build_query.c" #endif #include "php_http.h" @@ -47,13 +47,14 @@ #ifdef HTTP_HAVE_CURL -#ifdef PHP_WIN32 -#include -#include -#endif +# ifdef PHP_WIN32 +# include +# include +# endif + +# include +# include -#include -#include #endif @@ -143,6 +144,8 @@ static int check_day(char *day, size_t len); static int check_month(char *month); static int check_tzone(char *tzone); +static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen); + /* {{{ HAVE_CURL */ #ifdef HTTP_HAVE_CURL #define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC) @@ -605,7 +608,7 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti /* {{{ 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 +#define CASE(I) case CURLINFO_ ##I : return pretty_key(estrdup( #I ), strlen(#I), 0, 0) switch (i) { /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */ @@ -762,6 +765,9 @@ static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC) } /* }}} */ +#endif +/* }}} HAVE_CURL */ + /* {{{ 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) @@ -807,8 +813,29 @@ static int check_tzone(char *tzone) } /* }}} */ -#endif -/* }}} HAVE_CURL */ +/* static char *pretty_key(char *, int, int, int) */ +static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen) +{ + if (key && key_len) { + int i, wasalpha; + if (wasalpha = isalpha(key[0])) { + key[0] = uctitle ? toupper(key[0]) : tolower(key[0]); + } + for (i = 1; i < key_len; i++) { + if (isalpha(key[i])) { + key[i] = ((!wasalpha) && uctitle) ? toupper(key[i]) : tolower(key[i]); + wasalpha = 1; + } else { + if (xhyphen && (key[i] == '_')) { + key[i] = '-'; + } + wasalpha = 0; + } + } + } + return key; +} +/* }}} */ /* }}} internals */ @@ -1418,16 +1445,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); @@ -1441,37 +1469,52 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz } /* multi range */ + 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(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; - } + 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 + ); - 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); - } + 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; + } } /* }}} */ @@ -1616,7 +1659,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; @@ -1636,8 +1679,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) { @@ -1646,20 +1703,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; @@ -1693,12 +1739,12 @@ PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders, Z_TYPE_P(zbody) = IS_NULL; } - return http_parse_header(header, body - Z_STRVAL_P(zresponse), zheaders); + return http_parse_headers(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) +/* {{{ 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; @@ -1708,7 +1754,7 @@ PHP_HTTP_API STATUS _http_parse_header(char *header, long header_len, zval *arra /* status code */ if (!strncmp(header, "HTTP/1.", 7)) { - char *end = strstr(header, "\r\n"); + char *end = strstr(header, HTTP_CRLF); add_assoc_stringl(array, "Status", header + strlen("HTTP/1.x "), end - (header + strlen("HTTP/1.x ")), 1); @@ -1717,21 +1763,38 @@ PHP_HTTP_API STATUS _http_parse_header(char *header, long header_len, zval *arra line = header; - /* - * FIXXME: support for folded headers - */ - while (header_len > (line - begin)) { + while (header_len >= (line - begin)) { + int value_len = 0; + 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); - + --value_len; /* we don't have CR so value length is one char less */ + case '\n': + if (colon && ((!(*line - 1)) || ((*line != ' ') && (*line != '\t')))) { + + /* skip empty key */ + if (header != colon) { + char *key = estrndup(header, colon - header); + value_len += line - colon - 1; + + /* skip leading ws */ + while (isspace(*(++colon))) --value_len; + /* skip trailing ws */ + while (isspace(colon[value_len - 1])) --value_len; + + if (value_len < 1) { + /* hm, empty header? */ + add_assoc_stringl(array, key, "", 0, 0); + } else { + add_assoc_stringl(array, key, colon, value_len, 1); + } + efree(key); + } + colon = NULL; - header += line - header + 1; + value_len = 0; + header += line - header; } break; @@ -1746,6 +1809,23 @@ PHP_HTTP_API STATUS _http_parse_header(char *header, long header_len, zval *arra } /* }}} */ +/* {{{ void http_get_request_headers(zval *) */ +PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC) +{ + char *key; + + for ( zend_hash_internal_pointer_reset(HTTP_SERVER_VARS); + zend_hash_get_current_key(HTTP_SERVER_VARS, &key, NULL, 0) != HASH_KEY_NON_EXISTANT; + zend_hash_move_forward(HTTP_SERVER_VARS)) { + if (!strncmp(key, "HTTP_", 5)) { + zval **header; + zend_hash_get_current_data(HTTP_SERVER_VARS, (void **) &header); + add_assoc_stringl(array, pretty_key(key + 5, strlen(key) - 5, 1, 1), Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1); + } + } +} +/* }}} */ + /* {{{ HAVE_CURL */ #ifdef HTTP_HAVE_CURL @@ -1874,12 +1954,12 @@ PHP_HTTP_API STATUS _http_post_array(const char *URL, HashTable *postarray, #endif /* }}} HAVE_CURL */ -/* {{{ void http_auth_header(char *, char*) */ -PHP_HTTP_API void _http_auth_header(const char *type, const char *realm TSRMLS_DC) +/* {{{ STATUS http_auth_header(char *, char*) */ +PHP_HTTP_API STATUS _http_auth_header(const char *type, const char *realm TSRMLS_DC) { - char realm_header[1024]; - snprintf(realm_header, 1024, "WWW-Authenticate: %s realm=\"%s\"", type, realm); - http_send_status_header(401, realm_header); + char realm_header[1024] = {0}; + snprintf(realm_header, 1023, "WWW-Authenticate: %s realm=\"%s\"", type, realm); + return http_send_status_header(401, realm_header); } /* }}} */