From 0ac32c9b8590e88a5f110cc8b3154001d5c0c089 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Sun, 10 Apr 2005 15:58:30 +0000 Subject: [PATCH] * more modular file structure # one big file was convenient for vim but not for GUI editors --- config.m4 | 5 +- config.w32 | 9 +- http.c | 16 +- http_api.c | 1831 ++-------------------------------------- http_auth_api.c | 90 ++ http_cache_api.c | 211 +++++ http_date_api.c | 348 ++++++++ http_functions.c | 45 +- http_headers_api.c | 445 ++++++++++ http_message_api.c | 180 ++++ http_methods.c | 17 +- http_send_api.c | 421 +++++++++ http_url_api.c | 381 +++++++++ php_http.h | 3 + php_http_api.h | 136 +-- php_http_auth_api.h | 39 + php_http_cache_api.h | 54 ++ php_http_curl_api.h | 2 + php_http_date_api.h | 39 + php_http_headers_api.h | 60 ++ php_http_message_api.h | 89 ++ php_http_send_api.h | 72 ++ php_http_std_defs.h | 47 +- php_http_url_api.h | 55 ++ phpstr/phpstr.c | 4 +- phpstr/phpstr.h | 8 +- 26 files changed, 2678 insertions(+), 1929 deletions(-) create mode 100644 http_auth_api.c create mode 100644 http_cache_api.c create mode 100644 http_date_api.c create mode 100644 http_headers_api.c create mode 100644 http_message_api.c create mode 100644 http_send_api.c create mode 100644 http_url_api.c create mode 100644 php_http_auth_api.h create mode 100644 php_http_cache_api.h create mode 100644 php_http_date_api.h create mode 100644 php_http_headers_api.h create mode 100644 php_http_message_api.h create mode 100644 php_http_send_api.h create mode 100644 php_http_url_api.h diff --git a/config.m4 b/config.m4 index 3598743..d442090 100644 --- a/config.m4 +++ b/config.m4 @@ -71,7 +71,10 @@ dnl ---- dnl ---- dnl DONE dnl ---- - PHP_NEW_EXTENSION([http], [http.c http_api.c http_curl_api.c http_functions.c http_methods.c phpstr/phpstr.c], [$ext_shared]) + PHP_HTTP_SOURCES="http.c http_functions.c http_methods.c phpstr/phpstr.c \ + http_api.c http_auth_api.c http_cache_api.c http_curl_api.c http_date_api.c \ + http_headers_api.c http_message_api.c http_send_api.c http_url_api.c" + PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, [$ext_shared]) PHP_SUBST([HTTP_SHARED_LIBADD]) AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support]) fi diff --git a/config.w32 b/config.w32 index 9206ef5..6d1d0df 100644 --- a/config.w32 +++ b/config.w32 @@ -4,7 +4,12 @@ ARG_ENABLE("http", "whether to enable extended HTTP support", "no"); if (PHP_HTTP != "no") { - EXTENSION("http", "http.c http_functions.c http_methods.c http_api.c http_curl_api.c", null, + EXTENSION("http", + "http.c http_functions.c http_methods.c "+ + "http_api.c http_auth_api.c http_cache_api.c "+ + "http_curl_api.c http_date_api.c http_headers_api.c "+ + "http_message_api.c http_send_api.c http_url_api.c ", + null, "/I\"" + configure_module_dirname + "/phpstr\""); ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http"); AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support") @@ -18,4 +23,4 @@ if (PHP_HTTP != "no") { } else { WARNING("curl convenience functions not enabled; libraries and headers not found"); } -} +} \ No newline at end of file diff --git a/http.c b/http.c index fe5d66e..6efdedd 100644 --- a/http.c +++ b/http.c @@ -38,9 +38,17 @@ #include "SAPI.h" #include "php_http.h" +#include "php_http_std_defs.h" #include "php_http_api.h" +#include "php_http_auth_api.h" #include "php_http_curl_api.h" -#include "php_http_std_defs.h" +#include "php_http_cache_api.h" +#include "php_http_curl_api.h" +#include "php_http_date_api.h" +#include "php_http_headers_api.h" +#include "php_http_message_api.h" +#include "php_http_send_api.h" +#include "php_http_url_api.h" #include "phpstr/phpstr.h" @@ -393,6 +401,9 @@ static void php_http_init_globals(zend_http_globals *http_globals) http_globals->lmod = 0; #ifdef HTTP_HAVE_CURL phpstr_init_ex(&http_globals->curlbuf, HTTP_CURLBUF_SIZE, 0); +# if LIBCURL_VERSION_NUM < 0x070c00 + memset(&http_globals->curlerr, 0, sizeof(http_globals->curlerr)); +# endif zend_llist_init(&http_globals->to_free, sizeof(char *), free_to_free, 0); #endif http_globals->allowed_methods = NULL; @@ -526,6 +537,9 @@ PHP_RSHUTDOWN_FUNCTION(http) } #ifdef HTTP_HAVE_CURL +# if LIBCURL_VERSION_NUM < 0x070c00 + memset(&HTTP_G(curlerr), 0, sizeof(HTTP_G(curlerr))); +# endif phpstr_dtor(&HTTP_G(curlbuf)); #endif diff --git a/http_api.c b/http_api.c index 66d616d..a548e13 100644 --- a/http_api.c +++ b/http_api.c @@ -21,266 +21,18 @@ #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" -#include "ext/standard/base64.h" -#include "ext/standard/php_string.h" -#include "ext/standard/php_lcg.h" - -#include "SAPI.h" - -#ifdef ZEND_ENGINE_2 -# include "ext/standard/php_http.h" -#endif #include "php_http.h" -#include "php_http_api.h" #include "php_http_std_defs.h" +#include "php_http_api.h" +#include "php_http_send_api.h" +#include "php_http_cache_api.h" +#include "php_http_headers_api.h" -ZEND_DECLARE_MODULE_GLOBALS(http) - -/* {{{ day/month names */ -static const char *days[] = { - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" -}; -static const char *wkdays[] = { - "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" -}; -static const char *weekdays[] = { - "Monday", "Tuesday", "Wednesday", - "Thursday", "Friday", "Saturday", "Sunday" -}; -static const char *months[] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Okt", "Nov", "Dec" -}; -enum assume_next { - DATE_MDAY, - DATE_YEAR, - DATE_TIME -}; -static const struct time_zone { - const char *name; - const int offset; -} time_zones[] = { - {"GMT", 0}, /* Greenwich Mean */ - {"UTC", 0}, /* Universal (Coordinated) */ - {"WET", 0}, /* Western European */ - {"BST", 0}, /* British Summer */ - {"WAT", 60}, /* West Africa */ - {"AST", 240}, /* Atlantic Standard */ - {"ADT", 240}, /* Atlantic Daylight */ - {"EST", 300}, /* Eastern Standard */ - {"EDT", 300}, /* Eastern Daylight */ - {"CST", 360}, /* Central Standard */ - {"CDT", 360}, /* Central Daylight */ - {"MST", 420}, /* Mountain Standard */ - {"MDT", 420}, /* Mountain Daylight */ - {"PST", 480}, /* Pacific Standard */ - {"PDT", 480}, /* Pacific Daylight */ - {"YST", 540}, /* Yukon Standard */ - {"YDT", 540}, /* Yukon Daylight */ - {"HST", 600}, /* Hawaii Standard */ - {"HDT", 600}, /* Hawaii Daylight */ - {"CAT", 600}, /* Central Alaska */ - {"AHST", 600}, /* Alaska-Hawaii Standard */ - {"NT", 660}, /* Nome */ - {"IDLW", 720}, /* International Date Line West */ - {"CET", -60}, /* Central European */ - {"MET", -60}, /* Middle European */ - {"MEWT", -60}, /* Middle European Winter */ - {"MEST", -120}, /* Middle European Summer */ - {"CEST", -120}, /* Central European Summer */ - {"MESZ", -60}, /* Middle European Summer */ - {"FWT", -60}, /* French Winter */ - {"FST", -60}, /* French Summer */ - {"EET", -120}, /* Eastern Europe, USSR Zone 1 */ - {"WAST", -420}, /* West Australian Standard */ - {"WADT", -420}, /* West Australian Daylight */ - {"CCT", -480}, /* China Coast, USSR Zone 7 */ - {"JST", -540}, /* Japan Standard, USSR Zone 8 */ - {"EAST", -600}, /* Eastern Australian Standard */ - {"EADT", -600}, /* Eastern Australian Daylight */ - {"GST", -600}, /* Guam Standard, USSR Zone 9 */ - {"NZT", -720}, /* New Zealand */ - {"NZST", -720}, /* New Zealand Standard */ - {"NZDT", -720}, /* New Zealand Daylight */ - {"IDLE", -720}, /* International Date Line East */ -}; -/* }}} */ - -/* {{{ internals */ - -static int http_sort_q(const void *a, const void *b TSRMLS_DC); -#define http_send_chunk(d, b, e, m) _http_send_chunk((d), (b), (e), (m) TSRMLS_CC) -static STATUS _http_send_chunk(const void *data, size_t begin, size_t end, http_send_mode mode TSRMLS_DC); - -static int check_day(char *day, size_t len); -static int check_month(char *month); -static int check_tzone(char *tzone); - -static int http_ob_stack_get(php_ob_buffer *, php_ob_buffer **); - -/* {{{ static int http_sort_q(const void *, const void *) */ -static int http_sort_q(const void *a, const void *b TSRMLS_DC) -{ - Bucket *f, *s; - zval result, *first, *second; - - f = *((Bucket **) a); - s = *((Bucket **) b); - - first = *((zval **) f->pData); - second= *((zval **) s->pData); - - if (numeric_compare_function(&result, first, second TSRMLS_CC) != SUCCESS) { - return 0; - } - return (Z_LVAL(result) > 0 ? -1 : (Z_LVAL(result) < 0 ? 1 : 0)); -} -/* }}} */ - -/* {{{ static STATUS http_send_chunk(const void *, size_t, size_t, - http_send_mode) */ -static STATUS _http_send_chunk(const void *data, size_t begin, size_t end, http_send_mode mode TSRMLS_DC) -{ - long len = end - begin; - - switch (mode) - { - case SEND_RSRC: - { - 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) { - if (!(read = php_stream_read(s, buf, HTTP_SENDBUF_SIZE))) { - efree(buf); - return FAILURE; - } - if (read - php_body_write(buf, read TSRMLS_CC)) { - efree(buf); - return FAILURE; - } - /* ob_flush() && flush() */ - php_end_ob_buffer(1, 1 TSRMLS_CC); - sapi_flush(TSRMLS_C); - } - - /* read & write left over */ - if (len) { - if (read = php_stream_read(s, buf, HTTP_SENDBUF_SIZE + len)) { - if (read - php_body_write(buf, read TSRMLS_CC)) { - efree(buf); - return FAILURE; - } - } else { - efree(buf); - return FAILURE; - } - /* ob_flush() & flush() */ - php_end_ob_buffer(1, 1 TSRMLS_CC); - sapi_flush(TSRMLS_C); - } - efree(buf); - return SUCCESS; - } - - case SEND_DATA: - { - 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; - break; - } -} -/* }}} */ - -/* {{{ 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; - const char * const *check = (len > 3) ? &weekdays[0] : &wkdays[0]; - for (i = 0; i < 7; i++) { - if (!strcmp(day, check[0])) { - return i; - } - check++; - } - return -1; -} - -static int check_month(char *month) -{ - int i; - const char * const *check = &months[0]; - for (i = 0; i < 12; i++) { - if (!strcmp(month, check[0])) { - return i; - } - check++; - } - return -1; -} - -/* return the time zone offset between GMT and the input one, in number - of seconds or -1 if the timezone wasn't found/legal */ - -static int check_tzone(char *tzone) -{ - int i; - const struct time_zone *check = time_zones; - for (i = 0; i < sizeof(time_zones) / sizeof(time_zones[0]); i++) { - if (!strcmp(tzone, check->name)) { - return check->offset * 60; - } - check++; - } - return -1; -} -/* }}} */ +ZEND_EXTERN_MODULE_GLOBALS(http); /* char *pretty_key(char *, size_t, zend_bool, zebd_bool) */ char *pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen) @@ -321,286 +73,6 @@ static STATUS http_ob_stack_get(php_ob_buffer *o, php_ob_buffer **s) } /* }}} */ -/* }}} internals */ - -/* {{{ public API */ - -/* {{{ char *http_date(time_t) */ -PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC) -{ - struct tm *gmtime, tmbuf; - - if (gmtime = php_gmtime_r(&t, &tmbuf)) { - char *date = ecalloc(1, 31); - snprintf(date, 30, - "%s, %02d %s %04d %02d:%02d:%02d GMT", - days[gmtime->tm_wday], gmtime->tm_mday, - months[gmtime->tm_mon], gmtime->tm_year + 1900, - gmtime->tm_hour, gmtime->tm_min, gmtime->tm_sec - ); - return date; - } - - return NULL; -} -/* }}} */ - -/* {{{ 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) -{ - time_t t = 0; - 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; - const char *indate = date; - - int found = 0, part = 0; /* max 6 parts */ - - while (*date && (part < 6)) { - int found = 0; - - while (*date && !isalnum(*date)) { - date++; - } - - if (isalpha(*date)) { - /* a name coming up */ - char buf[32] = ""; - size_t len; - sscanf(date, "%31[A-Za-z]", buf); - len = strlen(buf); - - if (weekday == -1) { - weekday = check_day(buf, len); - if (weekday != -1) { - 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); - if (tz_offset != -1) { - found = 1; - } - } - - if (!found) { - return -1; /* bad string */ - } - date += len; - } - else if (isdigit(*date)) { - /* a digit */ - int val; - char *end; - if ((seconds == -1) && - (3 == sscanf(date, "%02d:%02d:%02d", &hours, &minutes, &seconds))) { - /* time stamp! */ - date += 8; - found = 1; - } - else { - val = (int) strtol(date, &end, 10); - - if ((tz_offset == -1) && ((end - date) == 4) && (val < 1300) && - (indate < date) && ((date[-1] == '+' || date[-1] == '-'))) { - /* four digits and a value less than 1300 and it is preceeded with - a plus or minus. This is a time zone indication. */ - found = 1; - tz_offset = (val / 100 * 60 + val % 100) * 60; - - /* the + and - prefix indicates the local time compared to GMT, - this we need ther reversed math to get what we want */ - tz_offset = date[-1] == '+' ? -tz_offset : tz_offset; - } - - if (((end - date) == 8) && (year == -1) && (month == -1) && (monthday == -1)) { - /* 8 digits, no year, month or day yet. This is YYYYMMDD */ - found = 1; - year = val / 10000; - month = (val % 10000) / 100 - 1; /* month is 0 - 11 */ - monthday = val % 100; - } - - if (!found && (dignext == DATE_MDAY) && (monthday == -1)) { - if ((val > 0) && (val < 32)) { - monthday = val; - found = 1; - } - dignext = DATE_YEAR; - } - - if (!found && (dignext == DATE_YEAR) && (year == -1)) { - year = val; - found = 1; - if (year < 1900) { - year += year > 70 ? 1900 : 2000; - } - if(monthday == -1) { - dignext = DATE_MDAY; - } - } - - if (!found) { - return -1; - } - - date = end; - } - } - - part++; - } - - if (-1 == seconds) { - seconds = minutes = hours = 0; /* no time, make it zero */ - } - - if ((-1 == monthday) || (-1 == month) || (-1 == year)) { - /* lacks vital info, fail */ - return -1; - } - - if (sizeof(time_t) < 5) { - /* 32 bit time_t can only hold dates to the beginning of 2038 */ - if (year > 2037) { - return 0x7fffffff; - } - } - - tm.tm_sec = seconds; - tm.tm_min = minutes; - tm.tm_hour = hours; - tm.tm_mday = monthday; - tm.tm_mon = month; - tm.tm_year = year - 1900; - tm.tm_wday = 0; - tm.tm_yday = 0; - tm.tm_isdst = 0; - - t = mktime(&tm); - - /* time zone adjust */ - { - struct tm *gmt, keeptime2; - long delta; - time_t t2; - - if(!(gmt = php_gmtime_r(&t, &keeptime2))) { - return -1; /* illegal date/time */ - } - - t2 = mktime(gmt); - - /* Add the time zone diff (between the given timezone and GMT) and the - diff between the local time zone and GMT. */ - delta = (tz_offset != -1 ? tz_offset : 0) + (t - t2); - - if((delta > 0) && (t + delta < t)) { - return -1; /* time_t overflow */ - } - - t += delta; - } - - return t; -} -/* }}} */ - -/* {{{ char *http_etag(void *, size_t, http_send_mode) */ -PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC) -{ - char ssb_buf[128] = {0}; - unsigned char digest[16]; - PHP_MD5_CTX ctx; - char *new_etag = ecalloc(1, 33); - - PHP_MD5Init(&ctx); - - switch (data_mode) - { - case SEND_DATA: - PHP_MD5Update(&ctx, data_ptr, data_len); - break; - - case SEND_RSRC: - if (!HTTP_G(ssb).sb.st_ino) { - if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) { - return NULL; - } - } - snprintf(ssb_buf, 127, "%ld=%ld=%ld", - HTTP_G(ssb).sb.st_mtime, - HTTP_G(ssb).sb.st_ino, - HTTP_G(ssb).sb.st_size - ); - PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf)); - break; - - default: - efree(new_etag); - return NULL; - break; - } - - PHP_MD5Final(digest, &ctx); - make_digest(new_etag, digest); - - return new_etag; -} -/* }}} */ - -/* {{{ time_t http_lmod(void *, http_send_mode) */ -PHP_HTTP_API time_t _http_lmod(const void *data_ptr, http_send_mode data_mode TSRMLS_DC) -{ - switch (data_mode) - { - case SEND_DATA: - { - return time(NULL); - } - - case SEND_RSRC: - { - if (!HTTP_G(ssb).sb.st_mtime) { - if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) { - return 0; - } - } - return HTTP_G(ssb).sb.st_mtime; - } - - default: - { - if (!HTTP_G(ssb).sb.st_mtime) { - if(php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &HTTP_G(ssb))) { - return 0; - } - } - return HTTP_G(ssb).sb.st_mtime; - } - } -} -/* }}} */ - -/* {{{ STATUS http_send_status_header(int, char *) */ -PHP_HTTP_API STATUS _http_send_status_header(int status, const char *header TSRMLS_DC) -{ - sapi_header_line h = {(char *) header, strlen(header), status}; - return sapi_header_op(SAPI_HEADER_REPLACE, &h TSRMLS_CC); -} -/* }}} */ - /* {{{ 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) { @@ -694,1249 +166,106 @@ PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_fun } /* }}} */ -/* {{{ zend_bool http_modified_match(char *, time_t) */ -PHP_HTTP_API zend_bool _http_modified_match_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC) +/* {{{ STATUS http_chunked_decode(char *, size_t, char **, size_t *) */ +PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len, + char **decoded, size_t *decoded_len TSRMLS_DC) { - zend_bool retval; - zval *zmodified; - char *modified, *chr_ptr; + const char *e_ptr; + char *d_ptr; - HTTP_GSC(zmodified, entry, !enforce_presence); + *decoded_len = 0; + *decoded = ecalloc(1, encoded_len); + d_ptr = *decoded; + e_ptr = encoded; - modified = estrndup(Z_STRVAL_P(zmodified), Z_STRLEN_P(zmodified)); - if (chr_ptr = strrchr(modified, ';')) { - chr_ptr = 0; - } - retval = (t <= http_parse_date(modified)); - efree(modified); - return retval; -} -/* }}} */ + while (((e_ptr - encoded) - encoded_len) > 0) { + char hex_len[9] = {0}; + size_t chunk_len = 0; + int i = 0; -/* {{{ zend_bool http_etag_match(char *, char *) */ -PHP_HTTP_API zend_bool _http_etag_match_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC) -{ - zval *zetag; - char *quoted_etag; - zend_bool result; + /* read in chunk size */ + while (isxdigit(*e_ptr)) { + if (i == 9) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Chunk size is too long: 0x%s...", hex_len); + efree(*decoded); + return FAILURE; + } + hex_len[i++] = *e_ptr++; + } - HTTP_GSC(zetag, entry, !enforce_presence); + /* reached the end */ + if (!strcmp(hex_len, "0")) { + break; + } - if (NULL != strchr(Z_STRVAL_P(zetag), '*')) { - return 1; - } + /* 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; + } - quoted_etag = (char *) emalloc(strlen(etag) + 3); - sprintf(quoted_etag, "\"%s\"", etag); + /* hex to long */ + { + char *error = NULL; + chunk_len = strtol(hex_len, &error, 16); + if (error == hex_len) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Invalid chunk size string: '%s'", hex_len); + efree(*decoded); + return FAILURE; + } + } - if (!strchr(Z_STRVAL_P(zetag), ',')) { - result = !strcmp(Z_STRVAL_P(zetag), quoted_etag); - } else { - result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag)); + memcpy(d_ptr, e_ptr += 2, chunk_len); + d_ptr += chunk_len; + e_ptr += chunk_len + 2; + *decoded_len += chunk_len; } - efree(quoted_etag); - return result; + + return SUCCESS; } /* }}} */ -/* {{{ STATUS http_send_last_modified(int) */ -PHP_HTTP_API STATUS _http_send_last_modified(time_t t TSRMLS_DC) +/* {{{ STATUS http_split_response(zval *, zval *, zval *) */ +PHP_HTTP_API STATUS _http_split_response(zval *response, zval *headers, zval *body TSRMLS_DC) { - char *date = NULL; - if (date = http_date(t)) { - char modified[96] = "Last-Modified: "; - strcat(modified, date); - efree(date); - - /* remember */ - HTTP_G(lmod) = t; - - return http_send_header(modified); - } - return FAILURE; + 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_send_etag(char *, size_t) */ -PHP_HTTP_API STATUS _http_send_etag(const char *etag, size_t etag_len TSRMLS_DC) +/* {{{ 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) { - STATUS status; - char *etag_header; + char *header = response, *real_body = NULL; - if (!etag_len){ - php_error_docref(NULL TSRMLS_CC,E_ERROR, - "Attempt to send empty ETag (previous: %s)\n", HTTP_G(etag)); - return FAILURE; + while (0 < (response_len - (response - header + 4))) { + if ( (*response++ == '\r') && + (*response++ == '\n') && + (*response++ == '\r') && + (*response++ == '\n')) { + real_body = response; + break; + } } - /* remember */ - if (HTTP_G(etag)) { - efree(HTTP_G(etag)); + if (real_body && (*body_len = (response_len - (real_body - header)))) { + *body = ecalloc(1, *body_len + 1); + memcpy(*body, real_body, *body_len); } - HTTP_G(etag) = estrdup(etag); - etag_header = ecalloc(1, sizeof("ETag: \"\"") + etag_len); - sprintf(etag_header, "ETag: \"%s\"", etag); - if (SUCCESS != (status = http_send_header(etag_header))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", etag_header); - } - efree(etag_header); - return status; + return http_parse_headers_ex(header, real_body ? response_len - *body_len : response_len, headers, 1); } /* }}} */ -/* {{{ STATUS http_send_cache_control(char *, size_t) */ -PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control, size_t cc_len TSRMLS_DC) -{ - STATUS status; - char *cc_header = ecalloc(1, sizeof("Cache-Control: ") + cc_len); - - sprintf(cc_header, "Cache-Control: %s", cache_control); - if (SUCCESS != (status = http_send_header(cc_header))) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, - "Could not send '%s' header", cc_header); - } - efree(cc_header); - return status; -} -/* }}} */ - -/* {{{ STATUS http_send_content_type(char *, size_t) */ -PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_len TSRMLS_DC) -{ - STATUS status; - char *ct_header; - - if (!strchr(content_type, '/')) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Content-Type '%s' doesn't seem to consist of a primary and a secondary part", - content_type); - return FAILURE; - } - - /* remember for multiple ranges */ - if (HTTP_G(ctype)) { - efree(HTTP_G(ctype)); - } - HTTP_G(ctype) = estrndup(content_type, ct_len); - - ct_header = ecalloc(1, sizeof("Content-Type: ") + ct_len); - sprintf(ct_header, "Content-Type: %s", content_type); - - if (SUCCESS != (status = http_send_header(ct_header))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Couldn't send '%s' header", ct_header); - } - efree(ct_header); - return status; -} -/* }}} */ - -/* {{{ STATUS http_send_content_disposition(char *, size_t, zend_bool) */ -PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t f_len, zend_bool send_inline TSRMLS_DC) -{ - STATUS status; - char *cd_header; - - if (send_inline) { - cd_header = ecalloc(1, sizeof("Content-Disposition: inline; filename=\"\"") + f_len); - sprintf(cd_header, "Content-Disposition: inline; filename=\"%s\"", filename); - } else { - cd_header = ecalloc(1, sizeof("Content-Disposition: attachment; filename=\"\"") + f_len); - sprintf(cd_header, "Content-Disposition: attachment; filename=\"%s\"", filename); - } - - if (SUCCESS != (status = http_send_header(cd_header))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", cd_header); - } - efree(cd_header); - return status; -} -/* }}} */ - -/* {{{ STATUS http_cache_last_modified(time_t, time_t, char *, size_t) */ -PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified, - time_t send_modified, const char *cache_control, size_t cc_len TSRMLS_DC) -{ - if (cc_len) { - http_send_cache_control(cache_control, cc_len); - } - - if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) { - if (SUCCESS == http_send_status(304)) { - zend_bailout(); - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified"); - return FAILURE; - } - } - return http_send_last_modified(send_modified); -} -/* }}} */ - -/* {{{ STATUS http_cache_etag(char *, size_t, char *, size_t) */ -PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, - const char *cache_control, size_t cc_len TSRMLS_DC) -{ - if (cc_len) { - http_send_cache_control(cache_control, cc_len); - } - - if (etag_len) { - http_send_etag(etag, etag_len); - if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { - if (SUCCESS == http_send_status(304)) { - zend_bailout(); - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified"); - return FAILURE; - } - } - } - - /* if no etag is given and we didn't already start ob_etaghandler -- start it */ - if (!HTTP_G(etag_started)) { - if (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)) { - HTTP_G(etag_started) = 1; - return SUCCESS; - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not start ob_etaghandler"); - return FAILURE; - } - } - return SUCCESS; -} -/* }}} */ - -/* {{{ char *http_absolute_uri(char *) */ -PHP_HTTP_API char *_http_absolute_uri_ex( - const char *url, size_t url_len, - const char *proto, size_t proto_len, - const char *host, size_t host_len, - unsigned port TSRMLS_DC) -{ -#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) - struct servent *se; -#endif - php_url *purl, furl = {NULL}; - size_t full_len = 0; - zval *zhost = NULL; - char *scheme = NULL, *URL = ecalloc(1, HTTP_URI_MAXLEN + 1); - - if ((!url || !url_len) && ( - (!(url = SG(request_info).request_uri)) || - (!(url_len = strlen(SG(request_info).request_uri))))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Cannot build an absolute URI if supplied URL and REQUEST_URI is empty"); - return NULL; - } - - if (!(purl = php_url_parse((char *) url))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse supplied URL"); - return NULL; - } - - furl.user = purl->user; - furl.pass = purl->pass; - furl.path = purl->path; - furl.query = purl->query; - furl.fragment = purl->fragment; - - if (proto && proto_len) { - furl.scheme = scheme = estrdup(proto); - } else if (purl->scheme) { - furl.scheme = purl->scheme; -#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) - } else if (port && (se = getservbyport(port, "tcp"))) { - furl.scheme = (scheme = estrdup(se->s_name)); -#endif - } else { - furl.scheme = "http"; - } - - if (port) { - furl.port = port; - } else if (purl->port) { - furl.port = purl->port; - } else if (strncmp(furl.scheme, "http", 4)) { -#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) - if (se = getservbyname(furl.scheme, "tcp")) { - furl.port = se->s_port; - } -#endif - } else { - furl.port = (furl.scheme[4] == 's') ? 443 : 80; - } - - if (host) { - furl.host = (char *) host; - } else if (purl->host) { - furl.host = purl->host; - } else if ( (zhost = http_get_server_var("HTTP_HOST")) || - (zhost = http_get_server_var("SERVER_NAME"))) { - furl.host = Z_STRVAL_P(zhost); - } else { - furl.host = "localhost"; - } - -#define HTTP_URI_STRLCATS(URL, full_len, add_string) HTTP_URI_STRLCAT(URL, full_len, add_string, sizeof(add_string)-1) -#define HTTP_URI_STRLCATL(URL, full_len, add_string) HTTP_URI_STRLCAT(URL, full_len, add_string, strlen(add_string)) -#define HTTP_URI_STRLCAT(URL, full_len, add_string, add_len) \ - if ((full_len += add_len) > HTTP_URI_MAXLEN) { \ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, \ - "Absolute URI would have exceeded max URI length (%d bytes) - " \ - "tried to add %d bytes ('%s')", \ - HTTP_URI_MAXLEN, add_len, add_string); \ - if (scheme) { \ - efree(scheme); \ - } \ - php_url_free(purl); \ - return URL; \ - } else { \ - strcat(URL, add_string); \ - } - - HTTP_URI_STRLCATL(URL, full_len, furl.scheme); - HTTP_URI_STRLCATS(URL, full_len, "://"); - - if (furl.user) { - HTTP_URI_STRLCATL(URL, full_len, furl.user); - if (furl.pass) { - HTTP_URI_STRLCATS(URL, full_len, ":"); - HTTP_URI_STRLCATL(URL, full_len, furl.pass); - } - HTTP_URI_STRLCATS(URL, full_len, "@"); - } - - HTTP_URI_STRLCATL(URL, full_len, furl.host); - - 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, "/"); - } - - if (furl.query) { - HTTP_URI_STRLCATS(URL, full_len, "?"); - HTTP_URI_STRLCATL(URL, full_len, furl.query); - } - - if (furl.fragment) { - HTTP_URI_STRLCATS(URL, full_len, "#"); - HTTP_URI_STRLCATL(URL, full_len, furl.fragment); - } - - if (scheme) { - efree(scheme); - } - php_url_free(purl); - - return URL; -} -/* }}} */ - -/* {{{ 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, zdelim, zarray, zentries, **zentry, **zsupp; - char *q_ptr = NULL, *key = NULL; - int i = 0; - ulong idx = 0; - double qual; - - HTTP_GSC(zaccept, entry, estrdup(def)); - - array_init(&zarray); - array_init(&zentries); - - Z_STRVAL(zdelim) = ","; - Z_STRLEN(zdelim) = 1; - - php_explode(&zdelim, zaccept, &zarray, -1); - - 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++; - } - 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); - break; - } - } - } - zval_dtor(&zarray); - - 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); - - return estrdup(def); -} -/* }}} */ - -/* {{{ http_range_status http_get_request_ranges(HashTable *ranges, size_t) */ -PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_t length TSRMLS_DC) -{ - zval *zrange; - char *range, c; - long begin = -1, end = -1, *ptr; - - HTTP_GSC(zrange, "HTTP_RANGE", RANGE_NO); - range = Z_STRVAL_P(zrange); - - if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes="); - return RANGE_NO; - } - - ptr = &begin; - range += sizeof("bytes=") - 1; - - do { - switch (c = *(range++)) - { - case '0': - *ptr *= 10; - break; - - case '1': case '2': case '3': - case '4': case '5': case '6': - case '7': case '8': case '9': - /* - * If the value of the pointer is already set (non-negative) - * then multiply its value by ten and add the current value, - * else initialise the pointers value with the current value - * -- - * This let us recognize empty fields when validating the - * ranges, i.e. a "-10" for begin and "12345" for the end - * was the following range request: "Range: bytes=0-12345"; - * While a "-1" for begin and "12345" for the end would - * have been: "Range: bytes=-12345". - */ - if (*ptr > 0) { - *ptr *= 10; - *ptr += c - '0'; - } else { - *ptr = c - '0'; - } - break; - - case '-': - ptr = &end; - break; - - case ' ': - /* IE - ignore for now */ - break; - - case 0: - case ',': - - if (length) { - /* validate ranges */ - switch (begin) - { - /* "0-12345" */ - case -10: - /* "0-" */ - if (end == -1) { - return RANGE_NO; - } - /* "0-0" or overflow */ - if (end == -10 || length <= end) { - return RANGE_ERR; - } - begin = 0; - break; - - /* "-12345" */ - case -1: - /* "-", "-0" or overflow */ - if (end == -1 || end == -10 || length <= end) { - return RANGE_ERR; - } - begin = length - end; - end = length - 1; - break; - - /* "12345-(xxx)" */ - default: - switch (end) - { - /* "12345-0" */ - case -10: - return RANGE_ERR; - break; - - /* "12345-" */ - case -1: - if (length <= begin) { - return RANGE_ERR; - } - end = length - 1; - break; - - /* "12345-67890" */ - default: - if ( (length <= begin) || - (length <= end) || - (end < begin)) { - return RANGE_ERR; - } - break; - } - break; - } - } - { - zval *zentry; - MAKE_STD_ZVAL(zentry); - array_init(zentry); - add_index_long(zentry, 0, begin); - add_index_long(zentry, 1, end); - zend_hash_next_index_insert(ranges, &zentry, sizeof(zval *), NULL); - - begin = -1; - end = -1; - ptr = &begin; - } - break; - - default: - return RANGE_NO; - break; - } - } while (c != 0); - - return RANGE_OK; -} -/* }}} */ - -/* {{{ STATUS http_send_ranges(HashTable *, void *, size_t, http_send_mode) */ -PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_t size, http_send_mode mode TSRMLS_DC) -{ - long **begin, **end; - zval **zrange; - - /* single range */ - if (zend_hash_num_elements(ranges) == 1) { - char range_header[256] = {0}; - - if (SUCCESS != zend_hash_index_find(ranges, 0, (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)) { - return FAILURE; - } - - /* Send HTTP 206 Partial Content */ - http_send_status(206); - - /* send content range header */ - 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, **begin, **end + 1, mode); - } - - /* multi range */ - else { - char bound[23] = {0}, preface[1024] = {0}, - multi_header[68] = "Content-Type: multipart/byteranges; boundary="; - - /* Send HTTP 206 Partial Content */ - http_send_status(206); - - /* send multipart/byteranges header */ - 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 */ - FOREACH_HASH_VAL(ranges, zrange) { - if (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); - } - - /* write boundary once more */ - php_body_write(HTTP_CRLF, sizeof(HTTP_CRLF) - 1 TSRMLS_CC); - php_body_write(bound, strlen(bound) TSRMLS_CC); - php_body_write("--", 2 TSRMLS_CC); - - return SUCCESS; - } -} -/* }}} */ - -/* {{{ STATUS http_send(void *, size_t, http_send_mode) */ -PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send_mode data_mode TSRMLS_DC) -{ - HashTable ranges; - http_range_status range_status; - int cache_etag = 0; - - if (!data_ptr) { - return FAILURE; - } - if (!data_size) { - return SUCCESS; - } - - /* 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_buffers(0 TSRMLS_CC); - } - - zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0); - range_status = http_get_request_ranges(&ranges, data_size); - - if (range_status == RANGE_ERR) { - zend_hash_destroy(&ranges); - http_send_status(416); - return FAILURE; - } - - /* 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); - - /* send 304 Not Modified if etag matches */ - if (cache_etag) { - char *etag = NULL; - int etag_match = 0; - - if (!(etag = http_etag(data_ptr, data_size, data_mode))) { - return FAILURE; - } - - 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 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); -} -/* }}} */ - -/* {{{ STATUS http_send_stream(php_stream *) */ -PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_stream TSRMLS_DC) -{ - STATUS status; - - if ((!file) || php_stream_stat(file, &HTTP_G(ssb))) { - return FAILURE; - } - - status = http_send(file, HTTP_G(ssb).sb.st_size, SEND_RSRC); - - if (close_stream) { - php_stream_close(file); - } - - return status; -} -/* }}} */ - -/* {{{ STATUS http_chunked_decode(char *, size_t, char **, size_t *) */ -PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len, - char **decoded, size_t *decoded_len TSRMLS_DC) -{ - const char *e_ptr; - char *d_ptr; - - *decoded_len = 0; - *decoded = ecalloc(1, encoded_len); - d_ptr = *decoded; - e_ptr = encoded; - - while (((e_ptr - encoded) - encoded_len) > 0) { - char hex_len[9] = {0}; - size_t chunk_len = 0; - int i = 0; - - /* read in chunk size */ - while (isxdigit(*e_ptr)) { - if (i == 9) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Chunk size is too long: 0x%s...", hex_len); - efree(*decoded); - return FAILURE; - } - 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 */ - { - char *error = NULL; - chunk_len = strtol(hex_len, &error, 16); - if (error == hex_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Invalid chunk size string: '%s'", hex_len); - efree(*decoded); - return FAILURE; - } - } - - memcpy(d_ptr, e_ptr += 2, chunk_len); - d_ptr += chunk_len; - e_ptr += chunk_len + 2; - *decoded_len += chunk_len; - } - - return SUCCESS; -} -/* }}} */ - -/* {{{ 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, *real_body = NULL; - - while (0 < (response_len - (response - header + 4))) { - if ( (*response++ == '\r') && - (*response++ == '\n') && - (*response++ == '\r') && - (*response++ == '\n')) { - real_body = response; - break; - } - } - - 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, real_body ? response_len - *body_len : response_len, headers, 1); -} -/* }}} */ - -/* {{{ STATUS http_parse_headers(char *, size_t, HashTable *, zend_bool) */ -PHP_HTTP_API STATUS _http_parse_headers_ex(char *header, size_t header_len, - HashTable *headers, zend_bool prettify TSRMLS_DC) -{ - char *colon = NULL, *line = NULL, *begin = header; - zval array; - - Z_ARRVAL(array) = headers; - - if (header_len < 2) { - return FAILURE; - } - - /* status code */ - if (!strncmp(header, "HTTP/1.", 7)) { - char *end = strstr(header, HTTP_CRLF); - add_assoc_stringl(&array, "Status", - header + sizeof("HTTP/1.x ") - 1, - end - (header + sizeof("HTTP/1.x ") - 1), 1); - header = end + 2; - } - - line = header; - - while (header_len >= (line - begin)) { - int value_len = 0; - - switch (*line++) - { - case 0: - --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) { - zval **previous = NULL; - int keylen = colon - header; - char *key = estrndup(header, keylen); - - if (prettify) { - key = pretty_key(key, keylen, 1, 1); - } - - 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 we already have got such a header make an array of those */ - if (SUCCESS == zend_hash_find(headers, key, keylen + 1, (void **) &previous)) { - /* already an array? - just add */ - if (Z_TYPE_PP(previous) == IS_ARRAY) { - if (value_len > 0) { - add_next_index_stringl(*previous, colon, value_len, 1); - } else { - add_next_index_stringl(*previous, "", 0, 1); - } - } else { - /* create the array */ - zval *new_array; - MAKE_STD_ZVAL(new_array); - array_init(new_array); - - add_next_index_stringl(new_array, Z_STRVAL_PP(previous), Z_STRLEN_PP(previous), 1); - if (value_len > 0) { - add_next_index_stringl(new_array, colon, value_len, 1); - } else { - add_next_index_stringl(new_array, "", 0, 1); - } - - add_assoc_zval(&array, key, new_array); - } - - previous = NULL; - } else if (value_len > 0) { - add_assoc_stringl(&array, key, colon, value_len, 1); - } else { - /* hm, empty header? */ - add_assoc_stringl(&array, key, "", 0, 1); - } - efree(key); - } - - colon = NULL; - value_len = 0; - header += line - header; - } - break; - - case ':': - if (!colon) { - colon = line - 1; - } - break; - } - } - return SUCCESS; -} -/* }}} */ - -/* {{{ */ -PHP_HTTP_API STATUS _http_parse_cookie(const char *cookie, HashTable *values TSRMLS_DC) -{ - const char *key = cookie, *val = NULL; - int vallen = 0, keylen = 0, done = 0; - zval array; - - Z_ARRVAL(array) = values; - - if (!(val = strchr(cookie, '='))) { - return FAILURE; - } - -#define HTTP_COOKIE_VAL(array, k, str, len) \ - { \ - const char *encoded = str; \ - char *decoded = NULL; \ - int decoded_len = 0, encoded_len = len; \ - decoded = estrndup(encoded, encoded_len); \ - decoded_len = php_url_decode(decoded, encoded_len); \ - add_assoc_stringl(array, k, decoded, decoded_len, 0); \ - } -#define HTTP_COOKIE_FIXKEY() \ - { \ - while (isspace(*key)) ++key; \ - keylen = val - key; \ - while (isspace(key[keylen - 1])) --keylen; \ - } -#define HTTP_COOKIE_FIXVAL() \ - { \ - ++val; \ - while (isspace(*val)) ++val; \ - vallen = key - val; \ - while (isspace(val[vallen - 1])) --vallen; \ - } - - HTTP_COOKIE_FIXKEY(); - HTTP_COOKIE_VAL(&array, "name", key, keylen); - - /* just a name=value cookie */ - if (!(key = strchr(val, ';'))) { - key = val + strlen(val); - HTTP_COOKIE_FIXVAL(); - HTTP_COOKIE_VAL(&array, "value", val, vallen); - } - /* additional info appended */ - else { - char *keydup = NULL; - - HTTP_COOKIE_FIXVAL(); - HTTP_COOKIE_VAL(&array, "value", val, vallen); - - do { - if (!(val = strchr(key, '='))) { - break; - } - ++key; - HTTP_COOKIE_FIXKEY(); - keydup = estrndup(key, keylen); - if (!(key = strchr(val, ';'))) { - done = 1; - key = val + strlen(val); - } - HTTP_COOKIE_FIXVAL(); - HTTP_COOKIE_VAL(&array, keydup, val, vallen); - efree(keydup); - } while (!done); - } - return SUCCESS; -} -/* }}} */ - -/* {{{ 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; - - Z_ARRVAL(array) = headers; - - FOREACH_HASH_KEY(HTTP_SERVER_VARS, key, idx) { - if (key && !strncmp(key, "HTTP_", 5)) { - zval **header; - - 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; - } - } -} -/* }}} */ - -/* {{{ STATUS http_urlencode_hash_ex(HashTable *, zend_bool, char *, size_t, char **, size_t *) */ -PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, zend_bool override_argsep, - char *pre_encoded_data, size_t pre_encoded_len, - char **encoded_data, size_t *encoded_len TSRMLS_DC) -{ - char *arg_sep; - phpstr *qstr = phpstr_new(); - - if (override_argsep || !strlen(arg_sep = INI_STR("arg_separator.output"))) { - arg_sep = HTTP_URL_ARGSEP_DEFAULT; - } - - if (pre_encoded_len && pre_encoded_data) { - phpstr_append(qstr, pre_encoded_data, pre_encoded_len); - } - - if (SUCCESS != http_urlencode_hash_implementation(hash, qstr, arg_sep)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't encode query data"); - phpstr_free(qstr); - return FAILURE; - } - - phpstr_data(qstr, encoded_data, encoded_len); - phpstr_free(qstr); - - return SUCCESS; -} -/* }}} */ - -/* {{{ 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] = {0}; - snprintf(realm_header, 1023, "WWW-Authenticate: %s realm=\"%s\"", type, realm); - return http_send_status_header(401, realm_header); -} -/* }}} */ - -/* {{{ STATUS http_auth_credentials(char **, char **) */ -PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC) -{ - if (strncmp(sapi_module.name, "isapi", 5)) { - zval *zuser, *zpass; - - HTTP_GSC(zuser, "PHP_AUTH_USER", FAILURE); - HTTP_GSC(zpass, "PHP_AUTH_PW", FAILURE); - - *user = estrndup(Z_STRVAL_P(zuser), Z_STRLEN_P(zuser)); - *pass = estrndup(Z_STRVAL_P(zpass), Z_STRLEN_P(zpass)); - - return SUCCESS; - } else { - zval *zauth = NULL; - HTTP_GSC(zauth, "HTTP_AUTHORIZATION", FAILURE); - { - char *decoded, *colon; - int decoded_len; - decoded = php_base64_decode(Z_STRVAL_P(zauth), Z_STRLEN_P(zauth), - &decoded_len); - - if (colon = strchr(decoded + 6, ':')) { - *user = estrndup(decoded + 6, colon - decoded - 6); - *pass = estrndup(colon + 1, decoded + decoded_len - colon - 6 - 1); - - return SUCCESS; - } else { - return FAILURE; - } - } - } -} -/* }}} */ - -/* {{{ http_urlencode_hash_implementation - Original Author: Sara Golemon */ -PHP_HTTP_API STATUS _http_urlencode_hash_implementation_ex( - HashTable *ht, phpstr *formstr, char *arg_sep, - const char *num_prefix, int num_prefix_len, - const char *key_prefix, int key_prefix_len, - const char *key_suffix, int key_suffix_len, - zval *type TSRMLS_DC) -{ - char *key = NULL, *ekey, *newprefix, *p; - int arg_sep_len, key_len, ekey_len, key_type, newprefix_len; - ulong idx; - zval **zdata = NULL, *copyzval; - - if (!ht || !formstr) { - return FAILURE; - } - - if (ht->nApplyCount > 0) { - /* Prevent recursion */ - return SUCCESS; - } - - if (!arg_sep || !strlen(arg_sep)) { - arg_sep = HTTP_URL_ARGSEP_DEFAULT; - } - arg_sep_len = strlen(arg_sep); - - for (zend_hash_internal_pointer_reset(ht); - (key_type = zend_hash_get_current_key_ex(ht, &key, &key_len, &idx, 0, NULL)) != HASH_KEY_NON_EXISTANT; - zend_hash_move_forward(ht) - ) { - if (key_type == HASH_KEY_IS_STRING && key_len && key[key_len-1] == '\0') { - /* We don't want that trailing NULL */ - key_len -= 1; - } - -#ifdef ZEND_ENGINE_2 - /* handling for private & protected object properties */ - if (key && *key == '\0' && type != NULL) { - char *tmp; - - zend_object *zobj = zend_objects_get_address(type TSRMLS_CC); - if (zend_check_property_access(zobj, key TSRMLS_CC) != SUCCESS) { - /* private or protected property access outside of the class */ - continue; - } - zend_unmangle_property_name(key, &tmp, &key); - key_len = strlen(key); - } -#endif - - if (zend_hash_get_current_data_ex(ht, (void **)&zdata, NULL) == FAILURE || !zdata || !(*zdata)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array."); - return FAILURE; - } - if (Z_TYPE_PP(zdata) == IS_ARRAY || Z_TYPE_PP(zdata) == IS_OBJECT) { - if (key_type == HASH_KEY_IS_STRING) { - ekey = php_url_encode(key, key_len, &ekey_len); - newprefix_len = key_suffix_len + ekey_len + key_prefix_len + 1; - newprefix = emalloc(newprefix_len + 1); - p = newprefix; - - if (key_prefix) { - memcpy(p, key_prefix, key_prefix_len); - p += key_prefix_len; - } - - memcpy(p, ekey, ekey_len); - p += ekey_len; - efree(ekey); - - if (key_suffix) { - memcpy(p, key_suffix, key_suffix_len); - p += key_suffix_len; - } - - *(p++) = '['; - *p = '\0'; - } else { - /* Is an integer key */ - ekey_len = spprintf(&ekey, 12, "%ld", idx); - newprefix_len = key_prefix_len + num_prefix_len + ekey_len + key_suffix_len + 1; - newprefix = emalloc(newprefix_len + 1); - p = newprefix; - - if (key_prefix) { - memcpy(p, key_prefix, key_prefix_len); - p += key_prefix_len; - } - - memcpy(p, num_prefix, num_prefix_len); - p += num_prefix_len; - - memcpy(p, ekey, ekey_len); - p += ekey_len; - efree(ekey); - - if (key_suffix) { - memcpy(p, key_suffix, key_suffix_len); - p += key_suffix_len; - } - *(p++) = '['; - *p = '\0'; - } - ht->nApplyCount++; - http_urlencode_hash_implementation_ex(HASH_OF(*zdata), formstr, arg_sep, - NULL, 0, newprefix, newprefix_len, "]", 1, (Z_TYPE_PP(zdata) == IS_OBJECT ? *zdata : NULL)); - ht->nApplyCount--; - efree(newprefix); - } else if (Z_TYPE_PP(zdata) == IS_NULL || Z_TYPE_PP(zdata) == IS_RESOURCE) { - /* Skip these types */ - continue; - } else { - if (formstr->used) { - phpstr_append(formstr, arg_sep, arg_sep_len); - } - /* Simple key=value */ - phpstr_append(formstr, key_prefix, key_prefix_len); - if (key_type == HASH_KEY_IS_STRING) { - ekey = php_url_encode(key, key_len, &ekey_len); - phpstr_append(formstr, ekey, ekey_len); - efree(ekey); - } else { - /* Numeric key */ - if (num_prefix) { - phpstr_append(formstr, num_prefix, num_prefix_len); - } - ekey_len = spprintf(&ekey, 12, "%ld", idx); - phpstr_append(formstr, ekey, ekey_len); - efree(ekey); - } - phpstr_append(formstr, key_suffix, key_suffix_len); - phpstr_appends(formstr, "="); - switch (Z_TYPE_PP(zdata)) { - case IS_STRING: - ekey = php_url_encode(Z_STRVAL_PP(zdata), Z_STRLEN_PP(zdata), &ekey_len); - break; - case IS_LONG: - case IS_BOOL: - ekey_len = spprintf(&ekey, 12, "%ld", Z_LVAL_PP(zdata)); - break; - case IS_DOUBLE: - ekey_len = spprintf(&ekey, 48, "%.*G", (int) EG(precision), Z_DVAL_PP(zdata)); - break; - default: - /* fall back on convert to string */ - MAKE_STD_ZVAL(copyzval); - *copyzval = **zdata; - zval_copy_ctor(copyzval); - convert_to_string_ex(©zval); - ekey = php_url_encode(Z_STRVAL_P(copyzval), Z_STRLEN_P(copyzval), &ekey_len); - zval_ptr_dtor(©zval); - } - phpstr_append(formstr, ekey, ekey_len); - efree(ekey); - } - } - - return SUCCESS; -} -/* }}} */ - -/* }}} public API */ - /* * Local variables: * tab-width: 4 diff --git a/http_auth_api.c b/http_auth_api.c new file mode 100644 index 0000000..386faff --- /dev/null +++ b/http_auth_api.c @@ -0,0 +1,90 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "php.h" +#include "ext/standard/base64.h" + +#include "SAPI.h" + +#include "php_http.h" +#include "php_http_api.h" +#include "php_http_std_defs.h" +#include "php_http_send_api.h" + +/* + * TODO: + * - Digest Auth + */ + +/* {{{ 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] = {0}; + snprintf(realm_header, 1023, "WWW-Authenticate: %s realm=\"%s\"", type, realm); + return http_send_status_header(401, realm_header); +} +/* }}} */ + +/* {{{ STATUS http_auth_credentials(char **, char **) */ +PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC) +{ + if (strncmp(sapi_module.name, "isapi", 5)) { + zval *zuser, *zpass; + + HTTP_GSC(zuser, "PHP_AUTH_USER", FAILURE); + HTTP_GSC(zpass, "PHP_AUTH_PW", FAILURE); + + *user = estrndup(Z_STRVAL_P(zuser), Z_STRLEN_P(zuser)); + *pass = estrndup(Z_STRVAL_P(zpass), Z_STRLEN_P(zpass)); + + return SUCCESS; + } else { + zval *zauth = NULL; + HTTP_GSC(zauth, "HTTP_AUTHORIZATION", FAILURE); + { + char *decoded, *colon; + int decoded_len; + decoded = php_base64_decode(Z_STRVAL_P(zauth), Z_STRLEN_P(zauth), + &decoded_len); + + if (colon = strchr(decoded + 6, ':')) { + *user = estrndup(decoded + 6, colon - decoded - 6); + *pass = estrndup(colon + 1, decoded + decoded_len - colon - 6 - 1); + + return SUCCESS; + } else { + return FAILURE; + } + } + } +} +/* }}} */ + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ + diff --git a/http_cache_api.c b/http_cache_api.c new file mode 100644 index 0000000..8df1ada --- /dev/null +++ b/http_cache_api.c @@ -0,0 +1,211 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "php.h" +#include "php_streams.h" +#include "ext/standard/md5.h" + +#include "php_http.h" +#include "php_http_std_defs.h" +#include "php_http_cache_api.h" +#include "php_http_send_api.h" +#include "php_http_api.h" +#include "php_http_date_api.h" + +ZEND_EXTERN_MODULE_GLOBALS(http); + +/* {{{ char *http_etag(void *, size_t, http_send_mode) */ +PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC) +{ + char ssb_buf[128] = {0}; + unsigned char digest[16]; + PHP_MD5_CTX ctx; + char *new_etag = ecalloc(1, 33); + + PHP_MD5Init(&ctx); + + switch (data_mode) + { + case SEND_DATA: + PHP_MD5Update(&ctx, data_ptr, data_len); + break; + + case SEND_RSRC: + if (!HTTP_G(ssb).sb.st_ino) { + if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) { + return NULL; + } + } + snprintf(ssb_buf, 127, "%ld=%ld=%ld", + HTTP_G(ssb).sb.st_mtime, + HTTP_G(ssb).sb.st_ino, + HTTP_G(ssb).sb.st_size + ); + PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf)); + break; + + default: + efree(new_etag); + return NULL; + break; + } + + PHP_MD5Final(digest, &ctx); + make_digest(new_etag, digest); + + return new_etag; +} +/* }}} */ + +/* {{{ time_t http_lmod(void *, http_send_mode) */ +PHP_HTTP_API time_t _http_lmod(const void *data_ptr, http_send_mode data_mode TSRMLS_DC) +{ + switch (data_mode) + { + case SEND_DATA: + { + return time(NULL); + } + + case SEND_RSRC: + { + php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb)); + return HTTP_G(ssb).sb.st_mtime; + } + + default: + { + php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &HTTP_G(ssb)); + return HTTP_G(ssb).sb.st_mtime; + } + } +} +/* }}} */ + +/* {{{ zend_bool http_modified_match(char *, time_t) */ +PHP_HTTP_API zend_bool _http_modified_match_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC) +{ + zend_bool retval; + zval *zmodified; + char *modified, *chr_ptr; + + HTTP_GSC(zmodified, entry, !enforce_presence); + + modified = estrndup(Z_STRVAL_P(zmodified), Z_STRLEN_P(zmodified)); + if (chr_ptr = strrchr(modified, ';')) { + chr_ptr = 0; + } + retval = (t <= http_parse_date(modified)); + efree(modified); + return retval; +} +/* }}} */ + +/* {{{ zend_bool http_etag_match(char *, char *) */ +PHP_HTTP_API zend_bool _http_etag_match_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC) +{ + zval *zetag; + char *quoted_etag; + zend_bool result; + + HTTP_GSC(zetag, entry, !enforce_presence); + + if (NULL != strchr(Z_STRVAL_P(zetag), '*')) { + return 1; + } + + quoted_etag = (char *) emalloc(strlen(etag) + 3); + sprintf(quoted_etag, "\"%s\"", etag); + + if (!strchr(Z_STRVAL_P(zetag), ',')) { + result = !strcmp(Z_STRVAL_P(zetag), quoted_etag); + } else { + result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag)); + } + efree(quoted_etag); + return result; +} +/* }}} */ + +/* {{{ STATUS http_cache_last_modified(time_t, time_t, char *, size_t) */ +PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified, + time_t send_modified, const char *cache_control, size_t cc_len TSRMLS_DC) +{ + if (cc_len) { + http_send_cache_control(cache_control, cc_len); + } + + if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) { + if (SUCCESS == http_send_status(304)) { + zend_bailout(); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified"); + return FAILURE; + } + } + return http_send_last_modified(send_modified); +} +/* }}} */ + +/* {{{ STATUS http_cache_etag(char *, size_t, char *, size_t) */ +PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, + const char *cache_control, size_t cc_len TSRMLS_DC) +{ + if (cc_len) { + http_send_cache_control(cache_control, cc_len); + } + + if (etag_len) { + http_send_etag(etag, etag_len); + if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { + if (SUCCESS == http_send_status(304)) { + zend_bailout(); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified"); + return FAILURE; + } + } + } + + /* if no etag is given and we didn't already start ob_etaghandler -- start it */ + if (!HTTP_G(etag_started)) { + if (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)) { + HTTP_G(etag_started) = 1; + return SUCCESS; + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not start ob_etaghandler"); + return FAILURE; + } + } + return SUCCESS; +} +/* }}} */ + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ + diff --git a/http_date_api.c b/http_date_api.c new file mode 100644 index 0000000..fc67a89 --- /dev/null +++ b/http_date_api.c @@ -0,0 +1,348 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include "php.h" +#include "php_http.h" +#include "php_http_std_defs.h" + +static int check_day(char *day, size_t len); +static int check_month(char *month); +static int check_tzone(char *tzone); + +/* {{{ day/month names */ +static const char *days[] = { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" +}; +static const char *wkdays[] = { + "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" +}; +static const char *weekdays[] = { + "Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday", "Sunday" +}; +static const char *months[] = { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Okt", "Nov", "Dec" +}; +enum assume_next { + DATE_MDAY, + DATE_YEAR, + DATE_TIME +}; +static const struct time_zone { + const char *name; + const int offset; +} time_zones[] = { + {"GMT", 0}, /* Greenwich Mean */ + {"UTC", 0}, /* Universal (Coordinated) */ + {"WET", 0}, /* Western European */ + {"BST", 0}, /* British Summer */ + {"WAT", 60}, /* West Africa */ + {"AST", 240}, /* Atlantic Standard */ + {"ADT", 240}, /* Atlantic Daylight */ + {"EST", 300}, /* Eastern Standard */ + {"EDT", 300}, /* Eastern Daylight */ + {"CST", 360}, /* Central Standard */ + {"CDT", 360}, /* Central Daylight */ + {"MST", 420}, /* Mountain Standard */ + {"MDT", 420}, /* Mountain Daylight */ + {"PST", 480}, /* Pacific Standard */ + {"PDT", 480}, /* Pacific Daylight */ + {"YST", 540}, /* Yukon Standard */ + {"YDT", 540}, /* Yukon Daylight */ + {"HST", 600}, /* Hawaii Standard */ + {"HDT", 600}, /* Hawaii Daylight */ + {"CAT", 600}, /* Central Alaska */ + {"AHST", 600}, /* Alaska-Hawaii Standard */ + {"NT", 660}, /* Nome */ + {"IDLW", 720}, /* International Date Line West */ + {"CET", -60}, /* Central European */ + {"MET", -60}, /* Middle European */ + {"MEWT", -60}, /* Middle European Winter */ + {"MEST", -120}, /* Middle European Summer */ + {"CEST", -120}, /* Central European Summer */ + {"MESZ", -60}, /* Middle European Summer */ + {"FWT", -60}, /* French Winter */ + {"FST", -60}, /* French Summer */ + {"EET", -120}, /* Eastern Europe, USSR Zone 1 */ + {"WAST", -420}, /* West Australian Standard */ + {"WADT", -420}, /* West Australian Daylight */ + {"CCT", -480}, /* China Coast, USSR Zone 7 */ + {"JST", -540}, /* Japan Standard, USSR Zone 8 */ + {"EAST", -600}, /* Eastern Australian Standard */ + {"EADT", -600}, /* Eastern Australian Daylight */ + {"GST", -600}, /* Guam Standard, USSR Zone 9 */ + {"NZT", -720}, /* New Zealand */ + {"NZST", -720}, /* New Zealand Standard */ + {"NZDT", -720}, /* New Zealand Daylight */ + {"IDLE", -720}, /* International Date Line East */ +}; +/* }}} */ + +/* {{{ 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; + const char * const *check = (len > 3) ? &weekdays[0] : &wkdays[0]; + for (i = 0; i < 7; i++) { + if (!strcmp(day, check[0])) { + return i; + } + check++; + } + return -1; +} + +static int check_month(char *month) +{ + int i; + const char * const *check = &months[0]; + for (i = 0; i < 12; i++) { + if (!strcmp(month, check[0])) { + return i; + } + check++; + } + return -1; +} + +/* return the time zone offset between GMT and the input one, in number + of seconds or -1 if the timezone wasn't found/legal */ + +static int check_tzone(char *tzone) +{ + int i; + const struct time_zone *check = time_zones; + for (i = 0; i < sizeof(time_zones) / sizeof(time_zones[0]); i++) { + if (!strcmp(tzone, check->name)) { + return check->offset * 60; + } + check++; + } + return -1; +} +/* }}} */ + +/* {{{ char *http_date(time_t) */ +PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC) +{ + struct tm *gmtime, tmbuf; + + if (gmtime = php_gmtime_r(&t, &tmbuf)) { + char *date = ecalloc(1, 31); + snprintf(date, 30, + "%s, %02d %s %04d %02d:%02d:%02d GMT", + days[gmtime->tm_wday], gmtime->tm_mday, + months[gmtime->tm_mon], gmtime->tm_year + 1900, + gmtime->tm_hour, gmtime->tm_min, gmtime->tm_sec + ); + return date; + } + + return NULL; +} +/* }}} */ + +/* {{{ 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) +{ + time_t t = 0; + 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; + const char *indate = date; + + int found = 0, part = 0; /* max 6 parts */ + + while (*date && (part < 6)) { + int found = 0; + + while (*date && !isalnum(*date)) { + date++; + } + + if (isalpha(*date)) { + /* a name coming up */ + char buf[32] = ""; + size_t len; + sscanf(date, "%31[A-Za-z]", buf); + len = strlen(buf); + + if (weekday == -1) { + weekday = check_day(buf, len); + if (weekday != -1) { + 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); + if (tz_offset != -1) { + found = 1; + } + } + + if (!found) { + return -1; /* bad string */ + } + date += len; + } + else if (isdigit(*date)) { + /* a digit */ + int val; + char *end; + if ((seconds == -1) && + (3 == sscanf(date, "%02d:%02d:%02d", &hours, &minutes, &seconds))) { + /* time stamp! */ + date += 8; + found = 1; + } + else { + val = (int) strtol(date, &end, 10); + + if ((tz_offset == -1) && ((end - date) == 4) && (val < 1300) && + (indate < date) && ((date[-1] == '+' || date[-1] == '-'))) { + /* four digits and a value less than 1300 and it is preceeded with + a plus or minus. This is a time zone indication. */ + found = 1; + tz_offset = (val / 100 * 60 + val % 100) * 60; + + /* the + and - prefix indicates the local time compared to GMT, + this we need ther reversed math to get what we want */ + tz_offset = date[-1] == '+' ? -tz_offset : tz_offset; + } + + if (((end - date) == 8) && (year == -1) && (month == -1) && (monthday == -1)) { + /* 8 digits, no year, month or day yet. This is YYYYMMDD */ + found = 1; + year = val / 10000; + month = (val % 10000) / 100 - 1; /* month is 0 - 11 */ + monthday = val % 100; + } + + if (!found && (dignext == DATE_MDAY) && (monthday == -1)) { + if ((val > 0) && (val < 32)) { + monthday = val; + found = 1; + } + dignext = DATE_YEAR; + } + + if (!found && (dignext == DATE_YEAR) && (year == -1)) { + year = val; + found = 1; + if (year < 1900) { + year += year > 70 ? 1900 : 2000; + } + if(monthday == -1) { + dignext = DATE_MDAY; + } + } + + if (!found) { + return -1; + } + + date = end; + } + } + + part++; + } + + if (-1 == seconds) { + seconds = minutes = hours = 0; /* no time, make it zero */ + } + + if ((-1 == monthday) || (-1 == month) || (-1 == year)) { + /* lacks vital info, fail */ + return -1; + } + + if (sizeof(time_t) < 5) { + /* 32 bit time_t can only hold dates to the beginning of 2038 */ + if (year > 2037) { + return 0x7fffffff; + } + } + + tm.tm_sec = seconds; + tm.tm_min = minutes; + tm.tm_hour = hours; + tm.tm_mday = monthday; + tm.tm_mon = month; + tm.tm_year = year - 1900; + tm.tm_wday = 0; + tm.tm_yday = 0; + tm.tm_isdst = 0; + + t = mktime(&tm); + + /* time zone adjust */ + if (t != -1) { + struct tm *gmt, keeptime2; + long delta; + time_t t2; + + if(!(gmt = php_gmtime_r(&t, &keeptime2))) { + return -1; /* illegal date/time */ + } + + t2 = mktime(gmt); + + /* Add the time zone diff (between the given timezone and GMT) and the + diff between the local time zone and GMT. */ + delta = (tz_offset != -1 ? tz_offset : 0) + (t - t2); + + if((delta > 0) && (t + delta < t)) { + return -1; /* time_t overflow */ + } + + t += delta; + } + + return t; +} +/* }}} */ + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ + diff --git a/http_functions.c b/http_functions.c index 470c47b..a0eb58b 100644 --- a/http_functions.c +++ b/http_functions.c @@ -20,22 +20,28 @@ #endif #include "php.h" -#include "php_ini.h" -#include "snprintf.h" #include "ext/standard/info.h" #include "ext/session/php_session.h" #include "ext/standard/php_string.h" #include "SAPI.h" +#include "phpstr/phpstr.h" + #include "php_http.h" +#include "php_http_std_defs.h" #include "php_http_api.h" +#include "php_http_auth_api.h" #include "php_http_curl_api.h" -#include "php_http_std_defs.h" - -#include "phpstr/phpstr.h" +#include "php_http_cache_api.h" +#include "php_http_curl_api.h" +#include "php_http_date_api.h" +#include "php_http_headers_api.h" +#include "php_http_message_api.h" +#include "php_http_send_api.h" +#include "php_http_url_api.h" -ZEND_DECLARE_MODULE_GLOBALS(http) +ZEND_EXTERN_MODULE_GLOBALS(http) /* {{{ proto string http_date([int timestamp]) * @@ -738,7 +744,7 @@ PHP_FUNCTION(http_get) array_init(info); } - if (SUCCESS == http_get(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { + if (SUCCESS == http_get(URL, Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) { RETURN_STRINGL(data, data_len, 0); } else { RETURN_FALSE; @@ -768,7 +774,7 @@ PHP_FUNCTION(http_head) array_init(info); } - if (SUCCESS == http_head(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { + if (SUCCESS == http_head(URL, Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) { RETURN_STRINGL(data, data_len, 0); } else { RETURN_FALSE; @@ -798,7 +804,7 @@ PHP_FUNCTION(http_post_data) array_init(info); } - if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { + if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) { RETURN_STRINGL(data, data_len, 0); } else { RETURN_FALSE; @@ -828,7 +834,7 @@ PHP_FUNCTION(http_post_array) array_init(info); } - if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { + if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) { RETURN_STRINGL(data, data_len, 0); } else { RETURN_FALSE; @@ -959,7 +965,7 @@ PHP_FUNCTION(http_build_query) zval *formdata; char *prefix = NULL, *arg_sep = INI_STR("arg_separator.output"); int prefix_len = 0, arg_sep_len = strlen(arg_sep); - phpstr *formstr = phpstr_new(); + phpstr *formstr; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) { RETURN_FALSE; @@ -974,6 +980,7 @@ PHP_FUNCTION(http_build_query) arg_sep = HTTP_URL_ARGSEP_DEFAULT; } + formstr = phpstr_new(); if (SUCCESS != http_urlencode_hash_implementation_ex(HASH_OF(formdata), formstr, arg_sep, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL) TSRMLS_CC)) { phpstr_free(formstr); RETURN_FALSE; @@ -992,7 +999,21 @@ PHP_FUNCTION(http_build_query) PHP_FUNCTION(http_test) { - RETURN_TRUE; +#define HTTP_MESSAGE_STR \ + "GET / HTTP/1.1\r\n" \ + "Content-Type: foo/bar\r\n" \ + "Robots: Noindex,Nofollow\r\n" \ + "\r\n" \ + "Body Data!\n" +#define HTTP_MESSAGE_LEN lenof(HTTP_MESSAGE_STR) + http_message *msg = http_message_parse(HTTP_MESSAGE_STR, HTTP_MESSAGE_LEN); + char *str; + size_t len; + + http_message_tostring(msg, &str, &len); + + RETVAL_STRINGL(str, len, 0); + http_message_free(msg); } /* diff --git a/http_headers_api.c b/http_headers_api.c new file mode 100644 index 0000000..f820a13 --- /dev/null +++ b/http_headers_api.c @@ -0,0 +1,445 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include "php.h" + +#include "php_http.h" +#include "php_http_std_defs.h" +#include "php_http_api.h" +#include "php_http_headers_api.h" + +/* {{{ static int http_sort_q(const void *, const void *) */ +static int http_sort_q(const void *a, const void *b TSRMLS_DC) +{ + Bucket *f, *s; + zval result, *first, *second; + + f = *((Bucket **) a); + s = *((Bucket **) b); + + first = *((zval **) f->pData); + second= *((zval **) s->pData); + + if (numeric_compare_function(&result, first, second TSRMLS_CC) != SUCCESS) { + return 0; + } + return (Z_LVAL(result) > 0 ? -1 : (Z_LVAL(result) < 0 ? 1 : 0)); +} +/* }}} */ + +/* {{{ 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, zdelim, zarray, zentries, **zentry, **zsupp; + char *q_ptr = NULL, *key = NULL; + int i = 0; + ulong idx = 0; + double qual; + + HTTP_GSC(zaccept, entry, estrdup(def)); + + array_init(&zarray); + array_init(&zentries); + + Z_STRVAL(zdelim) = ","; + Z_STRLEN(zdelim) = 1; + + php_explode(&zdelim, zaccept, &zarray, -1); + + 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++; + } + 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); + break; + } + } + } + zval_dtor(&zarray); + + 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); + + return estrdup(def); +} +/* }}} */ + +/* {{{ http_range_status http_get_request_ranges(HashTable *ranges, size_t) */ +PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_t length TSRMLS_DC) +{ + zval *zrange; + char *range, c; + long begin = -1, end = -1, *ptr; + + HTTP_GSC(zrange, "HTTP_RANGE", RANGE_NO); + range = Z_STRVAL_P(zrange); + + if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes="); + return RANGE_NO; + } + + ptr = &begin; + range += sizeof("bytes=") - 1; + + do { + switch (c = *(range++)) + { + case '0': + *ptr *= 10; + break; + + case '1': case '2': case '3': + case '4': case '5': case '6': + case '7': case '8': case '9': + /* + * If the value of the pointer is already set (non-negative) + * then multiply its value by ten and add the current value, + * else initialise the pointers value with the current value + * -- + * This let us recognize empty fields when validating the + * ranges, i.e. a "-10" for begin and "12345" for the end + * was the following range request: "Range: bytes=0-12345"; + * While a "-1" for begin and "12345" for the end would + * have been: "Range: bytes=-12345". + */ + if (*ptr > 0) { + *ptr *= 10; + *ptr += c - '0'; + } else { + *ptr = c - '0'; + } + break; + + case '-': + ptr = &end; + break; + + case ' ': + /* IE - ignore for now */ + break; + + case 0: + case ',': + + if (length) { + /* validate ranges */ + switch (begin) + { + /* "0-12345" */ + case -10: + /* "0-" */ + if (end == -1) { + return RANGE_NO; + } + /* "0-0" or overflow */ + if (end == -10 || length <= end) { + return RANGE_ERR; + } + begin = 0; + break; + + /* "-12345" */ + case -1: + /* "-", "-0" or overflow */ + if (end == -1 || end == -10 || length <= end) { + return RANGE_ERR; + } + begin = length - end; + end = length - 1; + break; + + /* "12345-(xxx)" */ + default: + switch (end) + { + /* "12345-0" */ + case -10: + return RANGE_ERR; + break; + + /* "12345-" */ + case -1: + if (length <= begin) { + return RANGE_ERR; + } + end = length - 1; + break; + + /* "12345-67890" */ + default: + if ( (length <= begin) || + (length <= end) || + (end < begin)) { + return RANGE_ERR; + } + break; + } + break; + } + } + { + zval *zentry; + MAKE_STD_ZVAL(zentry); + array_init(zentry); + add_index_long(zentry, 0, begin); + add_index_long(zentry, 1, end); + zend_hash_next_index_insert(ranges, &zentry, sizeof(zval *), NULL); + + begin = -1; + end = -1; + ptr = &begin; + } + break; + + default: + return RANGE_NO; + break; + } + } while (c != 0); + + return RANGE_OK; +} +/* }}} */ + +/* {{{ STATUS http_parse_headers(char *, size_t, HashTable *, zend_bool) */ +PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, size_t header_len, + HashTable *headers, zend_bool prettify TSRMLS_DC) +{ + const char *colon = NULL, *line = NULL, *begin = header; + zval array; + + Z_ARRVAL(array) = headers; + + if (header_len < 2) { + return FAILURE; + } + + /* status code */ + if (!strncmp(header, "HTTP/1.", 7)) { + char *end = strstr(header, HTTP_CRLF); + size_t len = end - (header + lenof("HTTP/1.x ")); + char *val = estrndup(header + lenof("HTTP/1.x "), len); + + add_assoc_stringl(&array, "Status", val, len, 0); + header = end + 2; + } + + line = header; + + while (header_len >= (line - begin)) { + int value_len = 0; + + switch (*line++) + { + case 0: + --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) { + zval **previous = NULL; + char *value = empty_string; + int keylen = colon - header; + char *key = estrndup(header, keylen); + + if (prettify) { + key = pretty_key(key, keylen, 1, 1); + } + + 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 > 0) { + value = estrndup(colon, value_len); + } else { + value_len = 0; + } + + /* if we already have got such a header make an array of those */ + if (SUCCESS == zend_hash_find(headers, key, keylen + 1, (void **) &previous)) { + /* already an array? - just add */ + if (Z_TYPE_PP(previous) == IS_ARRAY) { + add_next_index_stringl(*previous, value, value_len, 0); + } else { + /* create the array */ + zval *new_array; + MAKE_STD_ZVAL(new_array); + array_init(new_array); + + add_next_index_stringl(new_array, Z_STRVAL_PP(previous), Z_STRLEN_PP(previous), 1); + add_next_index_stringl(new_array, value, value_len, 0); + add_assoc_zval(&array, key, new_array); + } + + previous = NULL; + } else { + add_assoc_stringl(&array, key, value, value_len, 0); + } + efree(key); + } + + colon = NULL; + value_len = 0; + header += line - header; + } + break; + + case ':': + if (!colon) { + colon = line - 1; + } + break; + } + } + return SUCCESS; +} +/* }}} */ + +/* {{{ */ +PHP_HTTP_API STATUS _http_parse_cookie(const char *cookie, HashTable *values TSRMLS_DC) +{ + const char *key = cookie, *val = NULL; + int vallen = 0, keylen = 0, done = 0; + zval array; + + Z_ARRVAL(array) = values; + + if (!(val = strchr(cookie, '='))) { + return FAILURE; + } + +#define HTTP_COOKIE_VAL(array, k, str, len) \ + { \ + const char *encoded = str; \ + char *decoded = NULL; \ + int decoded_len = 0, encoded_len = len; \ + decoded = estrndup(encoded, encoded_len); \ + decoded_len = php_url_decode(decoded, encoded_len); \ + add_assoc_stringl(array, k, decoded, decoded_len, 0); \ + } +#define HTTP_COOKIE_FIXKEY() \ + { \ + while (isspace(*key)) ++key; \ + keylen = val - key; \ + while (isspace(key[keylen - 1])) --keylen; \ + } +#define HTTP_COOKIE_FIXVAL() \ + { \ + ++val; \ + while (isspace(*val)) ++val; \ + vallen = key - val; \ + while (isspace(val[vallen - 1])) --vallen; \ + } + + HTTP_COOKIE_FIXKEY(); + HTTP_COOKIE_VAL(&array, "name", key, keylen); + + /* just a name=value cookie */ + if (!(key = strchr(val, ';'))) { + key = val + strlen(val); + HTTP_COOKIE_FIXVAL(); + HTTP_COOKIE_VAL(&array, "value", val, vallen); + } + /* additional info appended */ + else { + char *keydup = NULL; + + HTTP_COOKIE_FIXVAL(); + HTTP_COOKIE_VAL(&array, "value", val, vallen); + + do { + if (!(val = strchr(key, '='))) { + break; + } + ++key; + HTTP_COOKIE_FIXKEY(); + keydup = estrndup(key, keylen); + if (!(key = strchr(val, ';'))) { + done = 1; + key = val + strlen(val); + } + HTTP_COOKIE_FIXVAL(); + HTTP_COOKIE_VAL(&array, keydup, val, vallen); + efree(keydup); + } while (!done); + } + return SUCCESS; +} +/* }}} */ + +/* {{{ 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; + + Z_ARRVAL(array) = headers; + + FOREACH_HASH_KEY(HTTP_SERVER_VARS, key, idx) { + if (key && !strncmp(key, "HTTP_", 5)) { + zval **header; + + 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; + } + } +} +/* }}} */ + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ + diff --git a/http_message_api.c b/http_message_api.c new file mode 100644 index 0000000..b89e0a8 --- /dev/null +++ b/http_message_api.c @@ -0,0 +1,180 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "php.h" +#include "php_http.h" +#include "php_http_std_defs.h" +#include "php_http_message_api.h" +#include "php_http_headers_api.h" + +#include "phpstr/phpstr.h" + +PHP_HTTP_API void _http_message_dtor(http_message *message) +{ + if (message) { + zend_hash_destroy(&message->hdrs); + phpstr_dtor(PHPSTR(message)); + if (message->dup && message->raw.dup) { + efree(message->raw.dup); + } + if (message->type == HTTP_MSG_REQUEST) { + if (message->info.request.method) { + efree(message->info.request.method); + } + if (message->info.request.URI) { + efree(message->info.request.URI); + } + } + } +} + +PHP_HTTP_API void _http_message_free(http_message *message) +{ + if (message) { + if (message->nested) { + http_message_free(message->nested); + } + http_message_dtor(message); + efree(message); + } +} + +PHP_HTTP_API http_message *_http_message_init_ex(http_message *message, http_message_type type) +{ + if (!message) { + message = ecalloc(1, sizeof(http_message)); + } + + message->type = type; + message->nested = NULL; + phpstr_init(&message->body); + zend_hash_init(&message->hdrs, 0, NULL, ZVAL_PTR_DTOR, 0); + + return message; +} + +PHP_HTTP_API http_message *_http_message_parse_ex(const char *message, size_t length, zend_bool dup TSRMLS_DC) +{ + const char *message_start = message, *body = NULL; + size_t message_length = length, header_length = 0; + http_message *msg; + + if (length < HTTP_MSG_MIN_SIZE) { + return NULL; + } + if (!message) { + return NULL; + } + + if (!(message_start = strstr(message, HTTP_CRLF))) { + return NULL; + } + + msg = http_message_init(); + + // response + if (!strncmp(message, "HTTP/1.", lenof("HTTP/1."))) { + msg->type = HTTP_MSG_RESPONSE; + msg->info.response.http_version = atof(message + lenof("HTTP/")); + msg->info.response.status = atoi(message + lenof("HTTP/1.1 ")); + } else + // request + if (!strncmp(message_start - lenof("HTTP/1.1"), "HTTP/1.", lenof("HTTP/1."))) { + const char *method_sep_uri = strchr(message, ' '); + + msg->type = HTTP_MSG_REQUEST; + msg->info.request.http_version = atof(message_start - lenof("1.1")); + msg->info.request.method = estrndup(message, method_sep_uri - message); + msg->info.request.URI = estrndup(method_sep_uri + 1, message_start - method_sep_uri - 1 - lenof(" HTTP/1.1")); + } else { + http_message_free(msg); + return NULL; + } + + message_start += lenof(HTTP_CRLF); + message_length -= message_start - message; + + if (msg->dup = dup) { + msg->len = length; + msg->raw.dup = estrndup(message, length); + } else { + msg->len = length; + msg->raw.ptr = message; + } + + if (body = strstr(message_start, HTTP_CRLF HTTP_CRLF)) { + body += lenof(HTTP_CRLF HTTP_CRLF); + header_length = body - message_start; + phpstr_from_string_ex(PHPSTR(msg), body, message_length - header_length); + } else { + header_length = message_length; + } + + if (SUCCESS != http_parse_headers_ex(message_start, header_length, &msg->hdrs, 1)) { + http_message_free(msg); + return NULL; + } + return msg; +} + +PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_t *length) +{ + phpstr str; + char *key, *data; + ulong idx; + zval **header; + + phpstr_init_ex(&str, msg->len, 1); + + switch (msg->type) + { + case HTTP_MSG_REQUEST: + phpstr_appendf(&str, "%s %s HTTP/%1.1f" HTTP_CRLF, + msg->info.request.method, + msg->info.request.URI, + msg->info.request.http_version); + break; + + case HTTP_MSG_RESPONSE: + phpstr_appendf(&str, "HTTP/%1.1f %d" HTTP_CRLF, + msg->info.response.http_version, + msg->info.response.status); + break; + } + + FOREACH_HASH_KEYVAL(&msg->hdrs, key, idx, header) { + if (key) { + phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key, Z_STRVAL_PP(header)); + key = NULL; + } + } + + phpstr_appends(&str, HTTP_CRLF); + phpstr_append(&str, msg->body.data, msg->body.used); + phpstr_fix(&str); + + data = phpstr_data(&str, string, length); + if (!string) { + efree(data); + } + + phpstr_dtor(&str); +} diff --git a/http_methods.c b/http_methods.c index 1c3b99c..1b2d80b 100644 --- a/http_methods.c +++ b/http_methods.c @@ -21,9 +21,14 @@ #include "php.h" #include "php_http.h" +#include "php_http_std_defs.h" #include "php_http_api.h" +#include "php_http_cache_api.h" #include "php_http_curl_api.h" -#include "php_http_std_defs.h" +#include "php_http_date_api.h" +#include "php_http_headers_api.h" +#include "php_http_send_api.h" +#include "php_http_url_api.h" #ifdef ZEND_ENGINE_2 @@ -438,6 +443,11 @@ PHP_METHOD(HttpResponse, send) do_cache = GET_PROP(obj, cache); do_gzip = GET_PROP(obj, gzip); + /* gzip */ + if (Z_LVAL_P(do_gzip)) { + php_start_ob_buffer_named("ob_gzhandler", 0, 1 TSRMLS_CC); + } + /* caching */ if (Z_LVAL_P(do_cache)) { zval *cctrl, *etag, *lmod, *ccraw; @@ -458,11 +468,6 @@ PHP_METHOD(HttpResponse, send) } } - /* gzip */ - if (Z_LVAL_P(do_gzip)) { - /* ... */ - } - /* content type */ { zval *ctype = GET_PROP(obj, contentType); diff --git a/http_send_api.c b/http_send_api.c new file mode 100644 index 0000000..b4b4267 --- /dev/null +++ b/http_send_api.c @@ -0,0 +1,421 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "php.h" +#include "php_streams.h" +#include "snprintf.h" + +#include "SAPI.h" + +#include "php_http.h" +#include "php_http_std_defs.h" +#include "php_http_api.h" +#include "php_http_send_api.h" +#include "php_http_headers_api.h" +#include "php_http_date_api.h" +#include "php_http_cache_api.h" + +ZEND_EXTERN_MODULE_GLOBALS(http); + +#define http_send_chunk(d, b, e, m) _http_send_chunk((d), (b), (e), (m) TSRMLS_CC) +/* {{{ static STATUS http_send_chunk(const void *, size_t, size_t, http_send_mode) */ +static STATUS _http_send_chunk(const void *data, size_t begin, size_t end, http_send_mode mode TSRMLS_DC) +{ + long len = end - begin; + + switch (mode) + { + case SEND_RSRC: + { + 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) { + if (!(read = php_stream_read(s, buf, HTTP_SENDBUF_SIZE))) { + efree(buf); + return FAILURE; + } + if (read - php_body_write(buf, read TSRMLS_CC)) { + efree(buf); + return FAILURE; + } + /* ob_flush() && flush() */ + php_end_ob_buffer(1, 1 TSRMLS_CC); + sapi_flush(TSRMLS_C); + } + + /* read & write left over */ + if (len) { + if (read = php_stream_read(s, buf, HTTP_SENDBUF_SIZE + len)) { + if (read - php_body_write(buf, read TSRMLS_CC)) { + efree(buf); + return FAILURE; + } + } else { + efree(buf); + return FAILURE; + } + /* ob_flush() & flush() */ + php_end_ob_buffer(1, 1 TSRMLS_CC); + sapi_flush(TSRMLS_C); + } + efree(buf); + return SUCCESS; + } + + case SEND_DATA: + { + 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; + break; + } +} +/* }}} */ + + +/* {{{ STATUS http_send_status_header(int, char *) */ +PHP_HTTP_API STATUS _http_send_status_header(int status, const char *header TSRMLS_DC) +{ + sapi_header_line h = {(char *) header, strlen(header), status}; + return sapi_header_op(SAPI_HEADER_REPLACE, &h TSRMLS_CC); +} +/* }}} */ + +/* {{{ STATUS http_send_last_modified(int) */ +PHP_HTTP_API STATUS _http_send_last_modified(time_t t TSRMLS_DC) +{ + char *date = NULL; + if (date = http_date(t)) { + char modified[96] = "Last-Modified: "; + strcat(modified, date); + efree(date); + + /* remember */ + HTTP_G(lmod) = t; + + return http_send_header(modified); + } + return FAILURE; +} +/* }}} */ + +/* {{{ STATUS http_send_etag(char *, size_t) */ +PHP_HTTP_API STATUS _http_send_etag(const char *etag, size_t etag_len TSRMLS_DC) +{ + STATUS status; + char *etag_header; + + if (!etag_len){ + php_error_docref(NULL TSRMLS_CC,E_ERROR, + "Attempt to send empty ETag (previous: %s)\n", HTTP_G(etag)); + return FAILURE; + } + + /* remember */ + if (HTTP_G(etag)) { + efree(HTTP_G(etag)); + } + HTTP_G(etag) = estrdup(etag); + + etag_header = ecalloc(1, sizeof("ETag: \"\"") + etag_len); + sprintf(etag_header, "ETag: \"%s\"", etag); + if (SUCCESS != (status = http_send_header(etag_header))) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", etag_header); + } + efree(etag_header); + return status; +} +/* }}} */ + +/* {{{ STATUS http_send_cache_control(char *, size_t) */ +PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control, size_t cc_len TSRMLS_DC) +{ + STATUS status; + char *cc_header = ecalloc(1, sizeof("Cache-Control: ") + cc_len); + + sprintf(cc_header, "Cache-Control: %s", cache_control); + if (SUCCESS != (status = http_send_header(cc_header))) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, + "Could not send '%s' header", cc_header); + } + efree(cc_header); + return status; +} +/* }}} */ + +/* {{{ STATUS http_send_content_type(char *, size_t) */ +PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_len TSRMLS_DC) +{ + STATUS status; + char *ct_header; + + if (!strchr(content_type, '/')) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Content-Type '%s' doesn't seem to consist of a primary and a secondary part", + content_type); + return FAILURE; + } + + /* remember for multiple ranges */ + if (HTTP_G(ctype)) { + efree(HTTP_G(ctype)); + } + HTTP_G(ctype) = estrndup(content_type, ct_len); + + ct_header = ecalloc(1, sizeof("Content-Type: ") + ct_len); + sprintf(ct_header, "Content-Type: %s", content_type); + + if (SUCCESS != (status = http_send_header(ct_header))) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Couldn't send '%s' header", ct_header); + } + efree(ct_header); + return status; +} +/* }}} */ + +/* {{{ STATUS http_send_content_disposition(char *, size_t, zend_bool) */ +PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t f_len, zend_bool send_inline TSRMLS_DC) +{ + STATUS status; + char *cd_header; + + if (send_inline) { + cd_header = ecalloc(1, sizeof("Content-Disposition: inline; filename=\"\"") + f_len); + sprintf(cd_header, "Content-Disposition: inline; filename=\"%s\"", filename); + } else { + cd_header = ecalloc(1, sizeof("Content-Disposition: attachment; filename=\"\"") + f_len); + sprintf(cd_header, "Content-Disposition: attachment; filename=\"%s\"", filename); + } + + if (SUCCESS != (status = http_send_header(cd_header))) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", cd_header); + } + efree(cd_header); + return status; +} +/* }}} */ + +/* {{{ STATUS http_send_ranges(HashTable *, void *, size_t, http_send_mode) */ +PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_t size, http_send_mode mode TSRMLS_DC) +{ + long **begin, **end; + zval **zrange; + + /* single range */ + if (zend_hash_num_elements(ranges) == 1) { + char range_header[256] = {0}; + + if (SUCCESS != zend_hash_index_find(ranges, 0, (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)) { + return FAILURE; + } + + /* Send HTTP 206 Partial Content */ + http_send_status(206); + + /* send content range header */ + 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, **begin, **end + 1, mode); + } + + /* multi range */ + else { + char bound[23] = {0}, preface[1024] = {0}, + multi_header[68] = "Content-Type: multipart/byteranges; boundary="; + + /* Send HTTP 206 Partial Content */ + http_send_status(206); + + /* send multipart/byteranges header */ + 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 */ + FOREACH_HASH_VAL(ranges, zrange) { + if (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); + } + + /* write boundary once more */ + php_body_write(HTTP_CRLF, sizeof(HTTP_CRLF) - 1 TSRMLS_CC); + php_body_write(bound, strlen(bound) TSRMLS_CC); + php_body_write("--", 2 TSRMLS_CC); + + return SUCCESS; + } +} +/* }}} */ + +/* {{{ STATUS http_send(void *, size_t, http_send_mode) */ +PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send_mode data_mode TSRMLS_DC) +{ + HashTable ranges; + http_range_status range_status; + int cache_etag = 0; + + if (!data_ptr) { + return FAILURE; + } + if (!data_size) { + return SUCCESS; + } + + /* 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_buffers(0 TSRMLS_CC); + } + + zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0); + range_status = http_get_request_ranges(&ranges, data_size); + + if (range_status == RANGE_ERR) { + zend_hash_destroy(&ranges); + http_send_status(416); + return FAILURE; + } + + /* 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); + + /* send 304 Not Modified if etag matches */ + if (cache_etag) { + char *etag = NULL; + int etag_match = 0; + + if (!(etag = http_etag(data_ptr, data_size, data_mode))) { + return FAILURE; + } + + 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 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); +} +/* }}} */ + +/* {{{ STATUS http_send_stream(php_stream *) */ +PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_stream TSRMLS_DC) +{ + STATUS status; + + if ((!file) || php_stream_stat(file, &HTTP_G(ssb))) { + return FAILURE; + } + + status = http_send(file, HTTP_G(ssb).sb.st_size, SEND_RSRC); + + if (close_stream) { + php_stream_close(file); + } + + return status; +} +/* }}} */ + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ + diff --git a/http_url_api.c b/http_url_api.c new file mode 100644 index 0000000..8788064 --- /dev/null +++ b/http_url_api.c @@ -0,0 +1,381 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef PHP_WIN32 +# include +#elif defined(HAVE_NETDB_H) +# include +#endif + +#include "php.h" +#include "zend_ini.h" +#include "php_output.h" +#include "ext/standard/url.h" + +#include "SAPI.h" + +#include "phpstr/phpstr.h" + +#include "php_http.h" +#include "php_http_api.h" +#include "php_http_url_api.h" +#include "php_http_std_defs.h" + +ZEND_EXTERN_MODULE_GLOBALS(http); + +/* {{{ char *http_absolute_url(char *) */ +PHP_HTTP_API char *_http_absolute_url_ex( + const char *url, size_t url_len, + const char *proto, size_t proto_len, + const char *host, size_t host_len, + unsigned port TSRMLS_DC) +{ +#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) + struct servent *se; +#endif + php_url *purl, furl = {NULL}; + size_t full_len = 0; + zval *zhost = NULL; + char *scheme = NULL, *URL = ecalloc(1, HTTP_URI_MAXLEN + 1); + + if ((!url || !url_len) && ( + (!(url = SG(request_info).request_uri)) || + (!(url_len = strlen(SG(request_info).request_uri))))) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Cannot build an absolute URI if supplied URL and REQUEST_URI is empty"); + return NULL; + } + + if (!(purl = php_url_parse((char *) url))) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse supplied URL"); + return NULL; + } + + furl.user = purl->user; + furl.pass = purl->pass; + furl.path = purl->path; + furl.query = purl->query; + furl.fragment = purl->fragment; + + if (proto && proto_len) { + furl.scheme = scheme = estrdup(proto); + } else if (purl->scheme) { + furl.scheme = purl->scheme; +#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) + } else if (port && (se = getservbyport(port, "tcp"))) { + furl.scheme = (scheme = estrdup(se->s_name)); +#endif + } else { + furl.scheme = "http"; + } + + if (port) { + furl.port = port; + } else if (purl->port) { + furl.port = purl->port; + } else if (strncmp(furl.scheme, "http", 4)) { +#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) + if (se = getservbyname(furl.scheme, "tcp")) { + furl.port = se->s_port; + } +#endif + } else { + furl.port = (furl.scheme[4] == 's') ? 443 : 80; + } + + if (host) { + furl.host = (char *) host; + } else if (purl->host) { + furl.host = purl->host; + } else if ( (zhost = http_get_server_var("HTTP_HOST")) || + (zhost = http_get_server_var("SERVER_NAME"))) { + furl.host = Z_STRVAL_P(zhost); + } else { + furl.host = "localhost"; + } + +#define HTTP_URI_STRLCATS(URL, full_len, add_string) HTTP_URI_STRLCAT(URL, full_len, add_string, sizeof(add_string)-1) +#define HTTP_URI_STRLCATL(URL, full_len, add_string) HTTP_URI_STRLCAT(URL, full_len, add_string, strlen(add_string)) +#define HTTP_URI_STRLCAT(URL, full_len, add_string, add_len) \ + if ((full_len += add_len) > HTTP_URI_MAXLEN) { \ + php_error_docref(NULL TSRMLS_CC, E_NOTICE, \ + "Absolute URI would have exceeded max URI length (%d bytes) - " \ + "tried to add %d bytes ('%s')", \ + HTTP_URI_MAXLEN, add_len, add_string); \ + if (scheme) { \ + efree(scheme); \ + } \ + php_url_free(purl); \ + return URL; \ + } else { \ + strcat(URL, add_string); \ + } + + HTTP_URI_STRLCATL(URL, full_len, furl.scheme); + HTTP_URI_STRLCATS(URL, full_len, "://"); + + if (furl.user) { + HTTP_URI_STRLCATL(URL, full_len, furl.user); + if (furl.pass) { + HTTP_URI_STRLCATS(URL, full_len, ":"); + HTTP_URI_STRLCATL(URL, full_len, furl.pass); + } + HTTP_URI_STRLCATS(URL, full_len, "@"); + } + + HTTP_URI_STRLCATL(URL, full_len, furl.host); + + 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, "/"); + } + + if (furl.query) { + HTTP_URI_STRLCATS(URL, full_len, "?"); + HTTP_URI_STRLCATL(URL, full_len, furl.query); + } + + if (furl.fragment) { + HTTP_URI_STRLCATS(URL, full_len, "#"); + HTTP_URI_STRLCATL(URL, full_len, furl.fragment); + } + + if (scheme) { + efree(scheme); + } + php_url_free(purl); + + return URL; +} +/* }}} */ + +/* {{{ STATUS http_urlencode_hash_ex(HashTable *, zend_bool, char *, size_t, char **, size_t *) */ +PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, zend_bool override_argsep, + char *pre_encoded_data, size_t pre_encoded_len, + char **encoded_data, size_t *encoded_len TSRMLS_DC) +{ + char *arg_sep; + phpstr *qstr = phpstr_new(); + + if (override_argsep || !strlen(arg_sep = INI_STR("arg_separator.output"))) { + arg_sep = HTTP_URL_ARGSEP; + } + + if (pre_encoded_len && pre_encoded_data) { + phpstr_append(qstr, pre_encoded_data, pre_encoded_len); + } + + if (SUCCESS != http_urlencode_hash_implementation(hash, qstr, arg_sep)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't encode query data"); + phpstr_free(qstr); + return FAILURE; + } + + phpstr_data(qstr, encoded_data, encoded_len); + phpstr_free(qstr); + + return SUCCESS; +} +/* }}} */ + +/* {{{ http_urlencode_hash_implementation + Original Author: Sara Golemon */ +PHP_HTTP_API STATUS _http_urlencode_hash_implementation_ex( + HashTable *ht, phpstr *formstr, char *arg_sep, + const char *num_prefix, int num_prefix_len, + const char *key_prefix, int key_prefix_len, + const char *key_suffix, int key_suffix_len, + zval *type TSRMLS_DC) +{ + char *key = NULL, *ekey, *newprefix, *p; + int arg_sep_len, key_len, ekey_len, key_type, newprefix_len; + ulong idx; + zval **zdata = NULL, *copyzval; + + if (!ht || !formstr) { + return FAILURE; + } + + if (ht->nApplyCount > 0) { + /* Prevent recursion */ + return SUCCESS; + } + + if (!arg_sep || !strlen(arg_sep)) { + arg_sep = HTTP_URL_ARGSEP; + } + arg_sep_len = strlen(arg_sep); + + for (zend_hash_internal_pointer_reset(ht); + (key_type = zend_hash_get_current_key_ex(ht, &key, &key_len, &idx, 0, NULL)) != HASH_KEY_NON_EXISTANT; + zend_hash_move_forward(ht) + ) { + if (key_type == HASH_KEY_IS_STRING && key_len && key[key_len-1] == '\0') { + /* We don't want that trailing NULL */ + key_len -= 1; + } + +#ifdef ZEND_ENGINE_2 + /* handling for private & protected object properties */ + if (key && *key == '\0' && type != NULL) { + char *tmp; + + zend_object *zobj = zend_objects_get_address(type TSRMLS_CC); + if (zend_check_property_access(zobj, key TSRMLS_CC) != SUCCESS) { + /* private or protected property access outside of the class */ + continue; + } + zend_unmangle_property_name(key, &tmp, &key); + key_len = strlen(key); + } +#endif + + if (zend_hash_get_current_data_ex(ht, (void **)&zdata, NULL) == FAILURE || !zdata || !(*zdata)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array."); + return FAILURE; + } + if (Z_TYPE_PP(zdata) == IS_ARRAY || Z_TYPE_PP(zdata) == IS_OBJECT) { + if (key_type == HASH_KEY_IS_STRING) { + ekey = php_url_encode(key, key_len, &ekey_len); + newprefix_len = key_suffix_len + ekey_len + key_prefix_len + 1; + newprefix = emalloc(newprefix_len + 1); + p = newprefix; + + if (key_prefix) { + memcpy(p, key_prefix, key_prefix_len); + p += key_prefix_len; + } + + memcpy(p, ekey, ekey_len); + p += ekey_len; + efree(ekey); + + if (key_suffix) { + memcpy(p, key_suffix, key_suffix_len); + p += key_suffix_len; + } + + *(p++) = '['; + *p = '\0'; + } else { + /* Is an integer key */ + ekey_len = spprintf(&ekey, 12, "%ld", idx); + newprefix_len = key_prefix_len + num_prefix_len + ekey_len + key_suffix_len + 1; + newprefix = emalloc(newprefix_len + 1); + p = newprefix; + + if (key_prefix) { + memcpy(p, key_prefix, key_prefix_len); + p += key_prefix_len; + } + + memcpy(p, num_prefix, num_prefix_len); + p += num_prefix_len; + + memcpy(p, ekey, ekey_len); + p += ekey_len; + efree(ekey); + + if (key_suffix) { + memcpy(p, key_suffix, key_suffix_len); + p += key_suffix_len; + } + *(p++) = '['; + *p = '\0'; + } + ht->nApplyCount++; + http_urlencode_hash_implementation_ex(HASH_OF(*zdata), formstr, arg_sep, + NULL, 0, newprefix, newprefix_len, "]", 1, (Z_TYPE_PP(zdata) == IS_OBJECT ? *zdata : NULL)); + ht->nApplyCount--; + efree(newprefix); + } else if (Z_TYPE_PP(zdata) == IS_NULL || Z_TYPE_PP(zdata) == IS_RESOURCE) { + /* Skip these types */ + continue; + } else { + if (formstr->used) { + phpstr_append(formstr, arg_sep, arg_sep_len); + } + /* Simple key=value */ + phpstr_append(formstr, key_prefix, key_prefix_len); + if (key_type == HASH_KEY_IS_STRING) { + ekey = php_url_encode(key, key_len, &ekey_len); + phpstr_append(formstr, ekey, ekey_len); + efree(ekey); + } else { + /* Numeric key */ + if (num_prefix) { + phpstr_append(formstr, num_prefix, num_prefix_len); + } + ekey_len = spprintf(&ekey, 12, "%ld", idx); + phpstr_append(formstr, ekey, ekey_len); + efree(ekey); + } + phpstr_append(formstr, key_suffix, key_suffix_len); + phpstr_appends(formstr, "="); + switch (Z_TYPE_PP(zdata)) { + case IS_STRING: + ekey = php_url_encode(Z_STRVAL_PP(zdata), Z_STRLEN_PP(zdata), &ekey_len); + break; + case IS_LONG: + case IS_BOOL: + ekey_len = spprintf(&ekey, 12, "%ld", Z_LVAL_PP(zdata)); + break; + case IS_DOUBLE: + ekey_len = spprintf(&ekey, 48, "%.*G", (int) EG(precision), Z_DVAL_PP(zdata)); + break; + default: + /* fall back on convert to string */ + MAKE_STD_ZVAL(copyzval); + *copyzval = **zdata; + zval_copy_ctor(copyzval); + convert_to_string_ex(©zval); + ekey = php_url_encode(Z_STRVAL_P(copyzval), Z_STRLEN_P(copyzval), &ekey_len); + zval_ptr_dtor(©zval); + } + phpstr_append(formstr, ekey, ekey_len); + efree(ekey); + } + } + + return SUCCESS; +} +/* }}} */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ + diff --git a/php_http.h b/php_http.h index 3a53a58..62ae474 100644 --- a/php_http.h +++ b/php_http.h @@ -206,6 +206,9 @@ ZEND_BEGIN_MODULE_GLOBALS(http) char *allowed_methods; #ifdef HTTP_HAVE_CURL phpstr curlbuf; +# if LIBCURL_VERSION_NUM < 0x070c00 + char curlerr[CURL_ERROR_SIZE + 1]; +# endif zend_llist to_free; #endif /* HTTP_HAVE_CURL */ ZEND_END_MODULE_GLOBALS(http) diff --git a/php_http_api.h b/php_http_api.h index baa8860..b7327b4 100644 --- a/php_http_api.h +++ b/php_http_api.h @@ -18,158 +18,34 @@ #ifndef PHP_HTTP_API_H #define PHP_HTTP_API_H -#ifdef PHP_WIN32 -# define PHP_HTTP_API __declspec(dllexport) -#else -# define PHP_HTTP_API -#endif - -/* make functions that return SUCCESS|FAILURE more obvious */ -typedef int STATUS; - -/* {{{ enum http_range_status */ -typedef enum { - RANGE_OK, - RANGE_NO, - RANGE_ERR -} http_range_status; -/* }}} */ - -/* {{{ enum http_send_mode */ -typedef enum { - SEND_DATA, - SEND_RSRC -} http_send_mode; -/* }}} */ +#include "php_http_std_defs.h" char *pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen); -/* {{{ public API */ -#define http_date(t) _http_date((t) TSRMLS_CC) -PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC); - -#define http_parse_date(d) _http_parse_date((d)) -PHP_HTTP_API time_t _http_parse_date(const char *date); - -#define http_send_status(s) sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) (s) TSRMLS_CC) -#define http_send_header(h) http_send_status_header(0, (h)) -#define http_send_status_header(s, h) _http_send_status_header((s), (h) TSRMLS_CC) -PHP_HTTP_API STATUS _http_send_status_header(int status, const char *header TSRMLS_DC); - +#define HTTP_GSC(var, name, ret) HTTP_GSP(var, name, return ret) +#define HTTP_GSP(var, name, ret) \ + if (!(var = _http_get_server_var_ex(name, strlen(name)+1, 1 TSRMLS_CC))) { \ + ret; \ + } #define http_got_server_var(v) (NULL != _http_get_server_var_ex((v), sizeof(v), 1 TSRMLS_CC)) #define http_get_server_var(v) http_get_server_var_ex((v), sizeof(v)) #define http_get_server_var_ex(v, s) _http_get_server_var_ex((v), (s), 0 TSRMLS_CC) PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC); -#define http_etag(p, l, m) _http_etag((p), (l), (m) TSRMLS_CC) -PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC); - -#define http_lmod(p, m) _http_lmod((p), (m) TSRMLS_CC) -PHP_HTTP_API time_t _http_lmod(const void *data_ptr, http_send_mode data_mode TSRMLS_DC); - #define http_ob_etaghandler(o, l, ho, hl, m) _http_ob_etaghandler((o), (l), (ho), (hl), (m) TSRMLS_CC) PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC); #define http_start_ob_handler(f, h, s, e) _http_start_ob_handler((f), (h), (s), (e) TSRMLS_CC) PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_func, char *handler_name, uint chunk_size, zend_bool erase TSRMLS_DC); -#define http_modified_match(entry, modified) _http_modified_match_ex((entry), (modified), 1 TSRMLS_CC) -#define http_modified_match_ex(entry, modified, ep) _http_modified_match_ex((entry), (modified), (ep) TSRMLS_CC) -PHP_HTTP_API zend_bool _http_modified_match_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC); - -#define http_etag_match(entry, etag) _http_etag_match_ex((entry), (etag), 1 TSRMLS_CC) -#define http_etag_match_ex(entry, etag, ep) _http_etag_match_ex((entry), (etag), (ep) TSRMLS_CC) -PHP_HTTP_API zend_bool _http_etag_match_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC); - -#define http_send_last_modified(t) _http_send_last_modified((t) TSRMLS_CC) -PHP_HTTP_API STATUS _http_send_last_modified(time_t t TSRMLS_DC); - -#define http_send_etag(e, l) _http_send_etag((e), (l) TSRMLS_CC) -PHP_HTTP_API STATUS _http_send_etag(const char *etag, size_t etag_len TSRMLS_DC); - -#define http_send_cache_control(c, l) _http_send_cache_control((c), (l) TSRMLS_CC) -PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control, size_t cc_len TSRMLS_DC); - -#define http_send_content_type(c, l) _http_send_content_type((c), (l) TSRMLS_CC) -PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_len TSRMLS_DC); - -#define http_send_content_disposition(f, l, i) _http_send_content_disposition((f), (l), (i) TSRMLS_CC) -PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t f_len, zend_bool send_inline TSRMLS_DC); - -#define http_cache_last_modified(l, s, cc, ccl) _http_cache_last_modified((l), (s), (cc), (ccl) TSRMLS_CC) -PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified, time_t send_modified, const char *cache_control, size_t cc_len TSRMLS_DC); - -#define http_cache_etag(e, el, cc, ccl) _http_cache_etag((e), (el), (cc), (ccl) TSRMLS_CC) -PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, const char *cache_control, size_t cc_len TSRMLS_DC); - -#define http_absolute_uri(url) http_absolute_uri_ex((url), strlen(url), NULL, 0, NULL, 0, 0) -#define http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port) _http_absolute_uri_ex((url), (url_len), (proto), (proto_len), (host), (host_len), (port) TSRMLS_CC) -PHP_HTTP_API char *_http_absolute_uri_ex(const char *url, size_t url_len, const char *proto, size_t proto_len, const char *host, size_t host_len, unsigned port TSRMLS_DC); - -#define http_negotiate_language(zsupported, def) http_negotiate_language_ex(Z_ARRVAL_P(zsupported), (def)) -#define http_negotiate_language_ex(supported, def) http_negotiate_q("HTTP_ACCEPT_LANGUAGE", (supported), (def)) -#define http_negotiate_charset(zsupported, def) http_negotiate_charset_ex(Z_ARRVAL_P(zsupported), (def)) -#define http_negotiate_charset_ex(supported, def) http_negotiate_q("HTTP_ACCEPT_CHARSET", (supported), (def)) -#define http_negotiate_q(e, s, d) _http_negotiate_q((e), (s), (d) TSRMLS_CC) -PHP_HTTP_API char *_http_negotiate_q(const char *entry, const HashTable *supported, const char *def TSRMLS_DC); - -#define http_get_request_ranges(r, l) _http_get_request_ranges((r), (l) TSRMLS_CC) -PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_t length TSRMLS_DC); - -#define http_send_ranges(r, d, s, m) _http_send_ranges((r), (d), (s), (m) TSRMLS_CC) -PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_t size, http_send_mode mode TSRMLS_DC); - -#define http_send_data(d, l) http_send((d), (l), SEND_DATA) -#define http_send(d, s, m) _http_send((d), (s), (m) TSRMLS_CC) -PHP_HTTP_API STATUS _http_send(const void *data, size_t data_size, http_send_mode mode TSRMLS_DC); - -#define http_send_file(f) http_send_stream_ex(php_stream_open_wrapper(f, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL), 1) -#define http_send_stream(s) http_send_stream_ex((s), 0) -#define http_send_stream_ex(s, c) _http_send_stream_ex((s), (c) TSRMLS_CC) -PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *s, zend_bool close_stream TSRMLS_DC); - #define http_chunked_decode(e, el, d, dl) _http_chunked_decode((e), (el), (d), (dl) TSRMLS_CC) PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC); -#define http_urlencode_hash(h, q) _http_urlencode_hash_ex((h), 1, NULL, 0, (q), NULL TSRMLS_CC) -#define http_urlencode_hash_ex(h, o, p, pl, q, ql) _http_urlencode_hash_ex((h), (o), (p), (pl), (q), (ql) TSRMLS_CC) -PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, zend_bool override_argsep, char *pre_encoded_data, size_t pre_encoded_len, char **encoded_data, size_t *encoded_len TSRMLS_DC); - #define http_split_response(r, h, b) _http_split_response((r), (h), (b) TSRMLS_CC) PHP_HTTP_API STATUS _http_split_response(zval *response, zval *headers, zval *body TSRMLS_DC); #define http_split_response_ex(r, rl, h, b, bl) _http_split_response_ex((r), (rl), (h), (b), (bl) TSRMLS_CC) PHP_HTTP_API STATUS _http_split_response_ex(char *response, size_t repsonse_len, HashTable *headers, char **body, size_t *body_len TSRMLS_DC); -#define http_parse_headers(h, l, a) _http_parse_headers_ex((h), (l), Z_ARRVAL_P(a), 1 TSRMLS_CC) -#define http_parse_headers_ex(h, l, ht, p) _http_parse_headers_ex((h), (l), (ht), (p) TSRMLS_CC) -PHP_HTTP_API STATUS _http_parse_headers_ex(char *header, size_t header_len, HashTable *headers, zend_bool prettify TSRMLS_DC); - -#define http_parse_cookie(c, ht) _http_parse_cookie((c), (ht) TSRMLS_CC) -PHP_HTTP_API STATUS _http_parse_cookie(const char *cookie, HashTable *values TSRMLS_DC); - -#define http_get_request_headers(h) _http_get_request_headers_ex(Z_ARRVAL_P(h), 1 TSRMLS_CC) -#define http_get_request_headers_ex(h, p) _http_get_request_headers_ex((h), (s) TSRMLS_CC) -PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool prettify TSRMLS_DC); - -#define http_auth_credentials(u, p) _http_auth_credentials((u), (p) TSRMLS_CC) -PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC); - -#define http_auth_header(t, r) _http_auth_header((t), (r) TSRMLS_CC) -PHP_HTTP_API STATUS _http_auth_header(const char *type, const char *realm TSRMLS_DC); - -#define http_urlencode_hash_implementation(ht, formstr, argsep) \ - http_urlencode_hash_implementation_ex((ht), (formstr), (argsep), NULL, 0, NULL, 0, NULL, 0, NULL) -#define http_urlencode_hash_implementation_ex(ht, formstr, argsep, np, npl, kp, kpl, ks, ksl, type) \ - _http_urlencode_hash_implementation_ex((ht), (formstr), (argsep), (np), (npl), (kp), (kpl), (ks), (ksl), (type) TSRMLS_CC) -PHP_HTTP_API STATUS _http_urlencode_hash_implementation_ex( - HashTable *ht, phpstr *formstr, char *arg_sep, - const char *num_prefix, int num_prefix_len, - const char *key_prefix, int key_prefix_len, - const char *key_suffix, int key_suffix_len, - zval *type TSRMLS_DC); - -/* }}} */ - #endif /* diff --git a/php_http_auth_api.h b/php_http_auth_api.h new file mode 100644 index 0000000..7c06980 --- /dev/null +++ b/php_http_auth_api.h @@ -0,0 +1,39 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifndef PHP_HTTP_AUTH_API_H +#define PHP_HTTP_AUTH_API_H + +#include "php_http_std_defs.h" + +#define http_auth_credentials(u, p) _http_auth_credentials((u), (p) TSRMLS_CC) +PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC); + +#define http_auth_header(t, r) _http_auth_header((t), (r) TSRMLS_CC) +PHP_HTTP_API STATUS _http_auth_header(const char *type, const char *realm TSRMLS_DC); + +#endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ + diff --git a/php_http_cache_api.h b/php_http_cache_api.h new file mode 100644 index 0000000..4f16957 --- /dev/null +++ b/php_http_cache_api.h @@ -0,0 +1,54 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifndef PHP_HTTP_CACHE_API_H +#define PHP_HTTP_CACHE_API_H + +#include "php_http_std_defs.h" +#include "php_http_send_api.h" + +#define http_etag(p, l, m) _http_etag((p), (l), (m) TSRMLS_CC) +PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC); + +#define http_lmod(p, m) _http_lmod((p), (m) TSRMLS_CC) +PHP_HTTP_API time_t _http_lmod(const void *data_ptr, http_send_mode data_mode TSRMLS_DC); + +#define http_modified_match(entry, modified) _http_modified_match_ex((entry), (modified), 1 TSRMLS_CC) +#define http_modified_match_ex(entry, modified, ep) _http_modified_match_ex((entry), (modified), (ep) TSRMLS_CC) +PHP_HTTP_API zend_bool _http_modified_match_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC); + +#define http_etag_match(entry, etag) _http_etag_match_ex((entry), (etag), 1 TSRMLS_CC) +#define http_etag_match_ex(entry, etag, ep) _http_etag_match_ex((entry), (etag), (ep) TSRMLS_CC) +PHP_HTTP_API zend_bool _http_etag_match_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC); + +#define http_cache_last_modified(l, s, cc, ccl) _http_cache_last_modified((l), (s), (cc), (ccl) TSRMLS_CC) +PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified, time_t send_modified, const char *cache_control, size_t cc_len TSRMLS_DC); + +#define http_cache_etag(e, el, cc, ccl) _http_cache_etag((e), (el), (cc), (ccl) TSRMLS_CC) +PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, const char *cache_control, size_t cc_len TSRMLS_DC); + +#endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ + diff --git a/php_http_curl_api.h b/php_http_curl_api.h index 5e3d3e1..586259e 100644 --- a/php_http_curl_api.h +++ b/php_http_curl_api.h @@ -18,6 +18,8 @@ #ifndef PHP_HTTP_CURL_API_H #define PHP_HTTP_CURL_API_H +#include "php_http_std_defs.h" + #ifdef PHP_WIN32 # include #endif diff --git a/php_http_date_api.h b/php_http_date_api.h new file mode 100644 index 0000000..ee93458 --- /dev/null +++ b/php_http_date_api.h @@ -0,0 +1,39 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifndef PHP_HTTP_DATE_API_H +#define PHP_HTTP_DATE_API_H + +#include "php_http_std_defs.h" + +#define http_date(t) _http_date((t) TSRMLS_CC) +PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC); + +#define http_parse_date(d) _http_parse_date((d)) +PHP_HTTP_API time_t _http_parse_date(const char *date); + +#endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ + diff --git a/php_http_headers_api.h b/php_http_headers_api.h new file mode 100644 index 0000000..033160c --- /dev/null +++ b/php_http_headers_api.h @@ -0,0 +1,60 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifndef PHP_HTTP_HEADERS_API_H +#define PHP_HTTP_HEADERS_API_H + +#include "php_http_std_defs.h" + +typedef enum { + RANGE_OK, + RANGE_NO, + RANGE_ERR +} http_range_status; + +#define http_parse_headers(h, l, a) _http_parse_headers_ex((h), (l), Z_ARRVAL_P(a), 1 TSRMLS_CC) +#define http_parse_headers_ex(h, l, ht, p) _http_parse_headers_ex((h), (l), (ht), (p) TSRMLS_CC) +PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, size_t header_len, HashTable *headers, zend_bool prettify TSRMLS_DC); + +#define http_parse_cookie(c, ht) _http_parse_cookie((c), (ht) TSRMLS_CC) +PHP_HTTP_API STATUS _http_parse_cookie(const char *cookie, HashTable *values TSRMLS_DC); + +#define http_get_request_headers(h) _http_get_request_headers_ex(Z_ARRVAL_P(h), 1 TSRMLS_CC) +#define http_get_request_headers_ex(h, p) _http_get_request_headers_ex((h), (s) TSRMLS_CC) +PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool prettify TSRMLS_DC); + +#define http_negotiate_language(zsupported, def) http_negotiate_language_ex(Z_ARRVAL_P(zsupported), (def)) +#define http_negotiate_language_ex(supported, def) http_negotiate_q("HTTP_ACCEPT_LANGUAGE", (supported), (def)) +#define http_negotiate_charset(zsupported, def) http_negotiate_charset_ex(Z_ARRVAL_P(zsupported), (def)) +#define http_negotiate_charset_ex(supported, def) http_negotiate_q("HTTP_ACCEPT_CHARSET", (supported), (def)) +#define http_negotiate_q(e, s, d) _http_negotiate_q((e), (s), (d) TSRMLS_CC) +PHP_HTTP_API char *_http_negotiate_q(const char *entry, const HashTable *supported, const char *def TSRMLS_DC); + +#define http_get_request_ranges(r, l) _http_get_request_ranges((r), (l) TSRMLS_CC) +PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_t length TSRMLS_DC); + +#endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ + diff --git a/php_http_message_api.h b/php_http_message_api.h new file mode 100644 index 0000000..b82f0a7 --- /dev/null +++ b/php_http_message_api.h @@ -0,0 +1,89 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +/* +DUMP: +HttpMessage + ->toResponseString(); + ->toRequestString(); + ->__toString(); ->__sleep(); ->serialize(); + ->fromString(); __wakeup($message); ->unserialize(); + ->setStatusCode(); + ->setHeader(); ->addHeader()... +*/ + +#include "phpstr/phpstr.h" + +typedef enum { + HTTP_MSG_NONE, + HTTP_MSG_REQUEST, + HTTP_MSG_RESPONSE +} http_message_type; + +typedef struct _http_message http_message; + +struct _http_message { + phpstr body; + HashTable hdrs; + http_message_type type; + + union { + struct { + float http_version; + char *method; + char *URI; + } request; + + struct { + float http_version; + int status; + } response; + + } info; + + size_t len; + zend_bool dup; + + union { + char *dup; + const char *ptr; + } raw; + + http_message *nested; +}; + +/* required minimum length of an HTTP message "HTTP/1.1 200\r\n" */ +#define HTTP_MSG_MIN_SIZE 15 + +#define HTTP_MSG_RAW(msg) ( (msg)->dup ? msg->raw.dup : msg->raw.ptr ) + +#define http_message_init() _http_message_init_ex(NULL, 0) +#define http_message_init_ex(m, t) _http_message_init_ex((m), (t)) +#define http_message_free(m) _http_message_free((m)) +#define http_message_dtor(m) _http_message_dtor((m)) + +PHP_HTTP_API void _http_message_dtor(http_message *message); +PHP_HTTP_API void _http_message_free(http_message *message); + +#define http_message_parse(m, l) http_message_parse_ex((m), (l), 1) +#define http_message_parse_ex(m, l, d) _http_message_parse_ex((m), (l), (d) TSRMLS_CC) +PHP_HTTP_API http_message *_http_message_parse_ex(const char *message, size_t length, zend_bool duplicate TSRMLS_DC); + +#define http_message_tostring(m, s, l) _http_message_tostring((m), (s), (l)) +PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_t *length); + + diff --git a/php_http_send_api.h b/php_http_send_api.h new file mode 100644 index 0000000..5212915 --- /dev/null +++ b/php_http_send_api.h @@ -0,0 +1,72 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifndef PHP_HTTP_SEND_API_H +#define PHP_HTTP_SEND_API_H + +#include "SAPI.h" +#include "php_streams.h" +#include "php_http_std_defs.h" + +typedef enum { + SEND_DATA, + SEND_RSRC +} http_send_mode; + +#define http_send_status(s) sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) (s) TSRMLS_CC) +#define http_send_header(h) http_send_status_header(0, (h)) +#define http_send_status_header(s, h) _http_send_status_header((s), (h) TSRMLS_CC) +PHP_HTTP_API STATUS _http_send_status_header(int status, const char *header TSRMLS_DC); + +#define http_send_last_modified(t) _http_send_last_modified((t) TSRMLS_CC) +PHP_HTTP_API STATUS _http_send_last_modified(time_t t TSRMLS_DC); + +#define http_send_etag(e, l) _http_send_etag((e), (l) TSRMLS_CC) +PHP_HTTP_API STATUS _http_send_etag(const char *etag, size_t etag_len TSRMLS_DC); + +#define http_send_cache_control(c, l) _http_send_cache_control((c), (l) TSRMLS_CC) +PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control, size_t cc_len TSRMLS_DC); + +#define http_send_content_type(c, l) _http_send_content_type((c), (l) TSRMLS_CC) +PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_len TSRMLS_DC); + +#define http_send_content_disposition(f, l, i) _http_send_content_disposition((f), (l), (i) TSRMLS_CC) +PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t f_len, zend_bool send_inline TSRMLS_DC); + +#define http_send_ranges(r, d, s, m) _http_send_ranges((r), (d), (s), (m) TSRMLS_CC) +PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_t size, http_send_mode mode TSRMLS_DC); + +#define http_send_data(d, l) http_send((d), (l), SEND_DATA) +#define http_send(d, s, m) _http_send((d), (s), (m) TSRMLS_CC) +PHP_HTTP_API STATUS _http_send(const void *data, size_t data_size, http_send_mode mode TSRMLS_DC); + +#define http_send_file(f) http_send_stream_ex(php_stream_open_wrapper(f, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL), 1) +#define http_send_stream(s) http_send_stream_ex((s), 0) +#define http_send_stream_ex(s, c) _http_send_stream_ex((s), (c) TSRMLS_CC) +PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *s, zend_bool close_stream TSRMLS_DC); + +#endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ + diff --git a/php_http_std_defs.h b/php_http_std_defs.h index 8854b92..a0f7ddf 100644 --- a/php_http_std_defs.h +++ b/php_http_std_defs.h @@ -18,9 +18,23 @@ #ifndef PHP_HTTP_STD_DEFS_H #define PHP_HTTP_STD_DEFS_H -#define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v)) -#define HASH_ORNULL(z) ((z) ? Z_ARRVAL_P(z) : NULL) -#define NO_ARGS if (ZEND_NUM_ARGS()) WRONG_PARAM_COUNT +#ifdef PHP_WIN32 +# define PHP_HTTP_API __declspec(dllexport) +#else +# define PHP_HTTP_API +#endif + +/* make functions that return SUCCESS|FAILURE more obvious */ +typedef int STATUS; + +/* lenof() */ +#define lenof(S) (sizeof(S) - 1) + +/* return bool (v == SUCCESS) */ +#define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v)) + +/* function accepts no args */ +#define NO_ARGS if (ZEND_NUM_ARGS()) WRONG_PARAM_COUNT /* CR LF */ #define HTTP_CRLF "\r\n" @@ -28,8 +42,13 @@ /* default cache control */ #define HTTP_DEFAULT_CACHECONTROL "private, must-revalidate, max-age=0" -/* max URI length */ -#define HTTP_URI_MAXLEN 2048 +/* max URL length */ +#define HTTP_URL_MAXLEN 2048 +#define HTTP_URI_MAXLEN HTTP_URL_MAXLEN + +/* def URL arg separator */ +#define HTTP_URL_ARGSEP "&" +#define HTTP_URI_ARGSEP HTTP_URL_ARGSEP /* send buffer size */ #define HTTP_SENDBUF_SIZE 2097152 @@ -40,24 +59,6 @@ /* server vars shorthand */ #define HTTP_SERVER_VARS Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]) - -/* {{{ HTTP_GSC(var, name, ret) */ -#define HTTP_GSC(var, name, ret) HTTP_GSP(var, name, return ret) -/* }}} */ - -/* {{{ HTTP_GSP(var, name, ret) */ -#define HTTP_GSP(var, name, ret) \ - if (!(var = _http_get_server_var_ex(name, strlen(name)+1, 1 TSRMLS_CC))) { \ - ret; \ - } -/* }}} */ - -/* override arg_separator.output to "&" for data used in outgoing requests */ -#include "zend_ini.h" -#define HTTP_URL_ARGSEP_DEFAULT "&" -#define HTTP_URL_ARGSEP_OVERRIDE zend_alter_ini_entry("arg_separator.output", sizeof("arg_separator.output") - 1, HTTP_URL_ARGSEP_DEFAULT, sizeof(HTTP_URL_ARGSEP_DEFAULT) - 1, ZEND_INI_ALL, ZEND_INI_STAGE_RUNTIME) -#define HTTP_URL_ARGSEP_RESTORE zend_restore_ini_entry("arg_separator.output", sizeof("arg_separator.output") - 1, ZEND_INI_STAGE_RUNTIME) - /* {{{ arrays */ #define FOREACH_VAL(array, val) FOREACH_HASH_VAL(Z_ARRVAL_P(array), val) #define FOREACH_HASH_VAL(hash, val) \ diff --git a/php_http_url_api.h b/php_http_url_api.h new file mode 100644 index 0000000..878afff --- /dev/null +++ b/php_http_url_api.h @@ -0,0 +1,55 @@ +/* + +----------------------------------------------------------------------+ + | PECL :: http | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.0 of the PHP license, that | + | is bundled with this package in the file LICENSE, and is available | + | through the world-wide-web at http://www.php.net/license/3_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Copyright (c) 2004-2005 Michael Wallner | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifndef PHP_HTTP_URL_API_H +#define PHP_HTTP_URL_API_H + +#include "php_http_std_defs.h" + +#define http_absolute_uri(url) http_absolute_url(url) +#define http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port) _http_absolute_url_ex((url), (url_len), (proto), (proto_len), (host), (host_len), (port) TSRMLS_CC) +#define http_absolute_url(url) http_absolute_url_ex((url), strlen(url), NULL, 0, NULL, 0, 0) +#define http_absolute_url_ex(url, url_len, proto, proto_len, host, host_len, port) _http_absolute_url_ex((url), (url_len), (proto), (proto_len), (host), (host_len), (port) TSRMLS_CC) +PHP_HTTP_API char *_http_absolute_url_ex(const char *url, size_t url_len, const char *proto, size_t proto_len, const char *host, size_t host_len, unsigned port TSRMLS_DC); + +#define http_urlencode_hash(h, q) _http_urlencode_hash_ex((h), 1, NULL, 0, (q), NULL TSRMLS_CC) +#define http_urlencode_hash_ex(h, o, p, pl, q, ql) _http_urlencode_hash_ex((h), (o), (p), (pl), (q), (ql) TSRMLS_CC) +PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, zend_bool override_argsep, char *pre_encoded_data, size_t pre_encoded_len, char **encoded_data, size_t *encoded_len TSRMLS_DC); + +#define http_urlencode_hash_implementation(ht, formstr, argsep) \ + http_urlencode_hash_implementation_ex((ht), (formstr), (argsep), NULL, 0, NULL, 0, NULL, 0, NULL) +#define http_urlencode_hash_implementation_ex(ht, formstr, argsep, np, npl, kp, kpl, ks, ksl, type) \ + _http_urlencode_hash_implementation_ex((ht), (formstr), (argsep), (np), (npl), (kp), (kpl), (ks), (ksl), (type) TSRMLS_CC) +PHP_HTTP_API STATUS _http_urlencode_hash_implementation_ex( + HashTable *ht, phpstr *formstr, char *arg_sep, + const char *num_prefix, int num_prefix_len, + const char *key_prefix, int key_prefix_len, + const char *key_suffix, int key_suffix_len, + zval *type TSRMLS_DC); + + +#endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ + diff --git a/phpstr/phpstr.c b/phpstr/phpstr.c index 7c9bad0..286a190 100644 --- a/phpstr/phpstr.c +++ b/phpstr/phpstr.c @@ -11,7 +11,7 @@ PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, zend_bool pre_alloc) { if (!buf) { - buf = ecalloc(1, sizeof(phpstr)); + buf = emalloc(sizeof(phpstr)); } buf->size = chunk_size > 0 ? chunk_size : PHPSTR_DEFAULT_SIZE; @@ -22,7 +22,7 @@ PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, zend_bool pre_ return buf; } -PHPSTR_API phpstr *phpstr_from_string_ex(phpstr *buf, char *string, size_t length) +PHPSTR_API phpstr *phpstr_from_string_ex(phpstr *buf, const char *string, size_t length) { buf = phpstr_init(buf); phpstr_append(buf, string, length); diff --git a/phpstr/phpstr.h b/phpstr/phpstr.h index c53d311..c9ede0a 100644 --- a/phpstr/phpstr.h +++ b/phpstr/phpstr.h @@ -4,12 +4,18 @@ #ifndef _PHPSTR_H_ #define _PHPSTR_H_ +#include "php.h" + #ifdef PHP_WIN32 # define PHPSTR_API __declspec(dllexport) #else # define PHPSTR_API #endif +#define PHPSTR(p) ((phpstr *) (p)) +#define PHPSTR_VAL(p) (PHPSTR(p))->data; +#define PHPSTR_LEN(p) (PHPSTR(p))->used; + #define FREE_PHPSTR_PTR(STR) efree(STR) #define FREE_PHPSTR_VAL(STR) phpstr_dtor(STR) #define FREE_PHPSTR_ALL(STR) phpstr_free(STR) @@ -64,7 +70,7 @@ PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, zend_bool pre_ #define phpstr_from_zval(z) phpstr_from_string(Z_STRVAL(z), Z_STRLEN(z)) #define phpstr_from_zval_ex(b, z) phpstr_from_string_ex(b, Z_STRVAL(z), Z_STRLEN(z)) #define phpstr_from_string(s, l) phpstr_from_string_ex(NULL, (s), (l)) -PHPSTR_API phpstr *phpstr_from_string_ex(phpstr *buf, char *string, size_t length); +PHPSTR_API phpstr *phpstr_from_string_ex(phpstr *buf, const char *string, size_t length); /* usually only called from within the internal functions */ #define phpstr_resize(b, s) phpstr_resize_ex((b), (s), 0) -- 2.30.2