/* $Id$ */
+#define _WINSOCKAPI_
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
#endif
+#include <ctype.h>
+
#include "php.h"
#include "php_version.h"
#include "php_streams.h"
-#include "main/snprintf.h"
+#include "snprintf.h"
#include "ext/standard/md5.h"
#include "ext/standard/url.h"
#include "ext/standard/base64.h"
#include "ext/standard/php_string.h"
+#include "ext/standard/php_smart_str.h"
#include "ext/standard/php_lcg.h"
#include "SAPI.h"
-#if (PHP_MAJOR_VERSION >= 5)
-#include "ext/standard/php_http.h"
+#ifdef ZEND_ENGINE_2
+# include "ext/standard/php_http.h"
#else
-#include "php_http_build_query.h"
-#include "http_build_query.c"
+ #include "http_build_query.c"
#endif
#include "php_http.h"
#include "php_http_api.h"
-#include <ctype.h>
+#ifdef HTTP_HAVE_CURL
+
+# ifdef PHP_WIN32
+# include <winsock2.h>
+# include <sys/types.h>
+# endif
+
+# include <curl/curl.h>
+# include <curl/easy.h>
-#if defined(HAVE_CURL) && HAVE_CURL
-#include <curl/curl.h>
-#include <curl/easy.h>
#endif
+
ZEND_DECLARE_MODULE_GLOBALS(http)
/* {{{ day/month names */
"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
};
static const char *weekdays[] = {
- "Monday", "Tuesday", "Wednesday",
+ "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday", "Sunday"
};
static const char *months[] = {
static int check_month(char *month);
static int check_tzone(char *tzone);
+static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen);
+
+static int http_ob_stack_get(php_ob_buffer *, php_ob_buffer **);
+
/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
#define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC)
static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC);
#define http_curl_freebuf(m) _http_curl_freebuf((m) TSRMLS_CC)
static size_t http_curl_body_callback(char *, size_t, size_t, void *);
static size_t http_curl_hdrs_callback(char *, size_t, size_t, void *);
+
+#define http_curl_getinfo(c, h) _http_curl_getinfo((c), (h) TSRMLS_CC)
+static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC);
+#define http_curl_getinfo_ex(c, i, a) _http_curl_getinfo_ex((c), (i), (a) TSRMLS_CC)
+static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC);
+#define http_curl_getinfoname(i) _http_curl_getinfoname((i) TSRMLS_CC)
+static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC);
+
#endif
/* }}} HAVE_CURL */
static inline char *_http_etag(char **new_etag, const void *data_ptr,
const size_t data_len, const http_send_mode data_mode TSRMLS_DC)
{
- char ssb_buf[127], digest[16];
+ char ssb_buf[127];
+ unsigned char digest[16];
PHP_MD5_CTX ctx;
PHP_MD5Init(&ctx);
break;
case SEND_DATA:
- return len == php_body_write(
- Z_STRVAL_P((zval *) data) + begin, len TSRMLS_CC)
+ return len == php_body_write(((char *)data) + begin, len TSRMLS_CC)
? SUCCESS : FAILURE;
break;
/* }}} */
/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
/* {{{ static inline void http_curl_initbuf(http_curlbuf_member) */
static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC)
curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1);
curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_body_callback);
curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, http_curl_hdrs_callback);
-#if defined(ZTS)
+#ifdef ZTS
curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
#endif
-#if defined(PHP_DEBUG)
- curl_easy_setopt(ch, CURLOPT_VERBOSE, 1);
-#endif
if ((!options) || (1 > zend_hash_num_elements(options))) {
return;
}
- /* redirects */
+ /* redirects, defaults to 0 */
if (zoption = http_curl_getopt1(options, "redirect", IS_LONG)) {
curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
curl_easy_setopt(ch, CURLOPT_MAXREDIRS, Z_LVAL_P(zoption));
curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption));
}
- /* compress */
+ /* compress, enabled by default (empty string enables deflate and gzip) */
if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) {
- /* empty string enables deflate and gzip */
+ if (Z_LVAL_P(zoption)) {
+ curl_easy_setopt(ch, CURLOPT_ENCODING, "");
+ }
+ } else {
curl_easy_setopt(ch, CURLOPT_ENCODING, "");
}
curl_easy_setopt(ch, CURLOPT_REFERER, Z_STRVAL_P(zoption));
}
- /* useragent */
+ /* useragent, default "PECL::HTTP/version (PHP/version)" */
if (zoption = http_curl_getopt1(options, "useragent", IS_STRING)) {
curl_easy_setopt(ch, CURLOPT_USERAGENT, Z_STRVAL_P(zoption));
+ } else {
+ curl_easy_setopt(ch, CURLOPT_USERAGENT,
+ "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
}
- /* cookies */
+ /* cookies, array('name' => 'value') */
if (zoption = http_curl_getopt1(options, "cookies", IS_ARRAY)) {
- zval cookies, glue;
- ZVAL_STRINGL(&glue, "; ", 2, 0);
- php_implode(&glue, zoption, &cookies);
- if (Z_STRVAL(cookies)) {
- curl_easy_setopt(ch, CURLOPT_COOKIE, Z_STRVAL(cookies));
+ char *cookie_key;
+ zval **cookie_val;
+ int key_type;
+ smart_str qstr = {0};
+
+ zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
+ while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) {
+ if (key_type == HASH_KEY_IS_STRING) {
+ zend_hash_get_current_key(Z_ARRVAL_P(zoption), &cookie_key, NULL, 0);
+ zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val);
+ smart_str_appends(&qstr, cookie_key);
+ smart_str_appendl(&qstr, "=", 1);
+ smart_str_appendl(&qstr, Z_STRVAL_PP(cookie_val), Z_STRLEN_PP(cookie_val));
+ smart_str_appendl(&qstr, "; ", 2);
+ zend_hash_move_forward(Z_ARRVAL_P(zoption));
+ }
+ }
+ smart_str_0(&qstr);
+
+ if (qstr.c) {
+ curl_easy_setopt(ch, CURLOPT_COOKIE, qstr.c);
}
}
curl_easy_setopt(ch, CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption));
}
- /* additional headers */
+ /* additional headers, array('name' => 'value') */
if (zoption = http_curl_getopt1(options, "headers", IS_ARRAY)) {
- zval **header;
+ int key_type;
+ char *header_key, header[1024] = {0};
+ zval **header_val;
struct curl_slist *headers = NULL;
+
zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
- while (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header)) {
- headers = curl_slist_append(headers, Z_STRVAL_PP(header));
- zend_hash_move_forward(Z_ARRVAL_P(zoption));
+ while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) {
+ if (key_type == HASH_KEY_IS_STRING) {
+ zend_hash_get_current_key(Z_ARRVAL_P(zoption), &header_key, NULL, 0);
+ zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val);
+ snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
+ headers = curl_slist_append(headers, header);
+ zend_hash_move_forward(Z_ARRVAL_P(zoption));
+ }
}
if (headers) {
curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers);
}
/* }}} */
+/* {{{ static inline char *http_curl_getinfoname(CURLINFO) */
+static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC)
+{
+#define CASE(I) case CURLINFO_ ##I : return pretty_key(estrdup( #I ), strlen(#I), 0, 0)
+ switch (i)
+ {
+ /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */
+ CASE(EFFECTIVE_URL);
+ /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */
+ CASE(RESPONSE_CODE);
+ /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */
+ CASE(TOTAL_TIME);
+ /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */
+ CASE(NAMELOOKUP_TIME);
+ /* CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE +5, */
+ CASE(CONNECT_TIME);
+ /* CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE +6, */
+ CASE(PRETRANSFER_TIME);
+ /* CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE +7, */
+ CASE(SIZE_UPLOAD);
+ /* CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE +8, */
+ CASE(SIZE_DOWNLOAD);
+ /* CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE +9, */
+ CASE(SPEED_DOWNLOAD);
+ /* CURLINFO_SPEED_UPLOAD = CURLINFO_DOUBLE +10, */
+ CASE(SPEED_UPLOAD);
+ /* CURLINFO_HEADER_SIZE = CURLINFO_LONG +11, */
+ CASE(HEADER_SIZE);
+ /* CURLINFO_REQUEST_SIZE = CURLINFO_LONG +12, */
+ CASE(REQUEST_SIZE);
+ /* CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG +13, */
+ CASE(SSL_VERIFYRESULT);
+ /* CURLINFO_FILETIME = CURLINFO_LONG +14, */
+ CASE(FILETIME);
+ /* CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE +15, */
+ CASE(CONTENT_LENGTH_DOWNLOAD);
+ /* CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE +16, */
+ CASE(CONTENT_LENGTH_UPLOAD);
+ /* CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE +17, */
+ CASE(STARTTRANSFER_TIME);
+ /* CURLINFO_CONTENT_TYPE = CURLINFO_STRING +18, */
+ CASE(CONTENT_TYPE);
+ /* CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE +19, */
+ CASE(REDIRECT_TIME);
+ /* CURLINFO_REDIRECT_COUNT = CURLINFO_LONG +20, */
+ CASE(REDIRECT_COUNT);
+ /* CURLINFO_PRIVATE = CURLINFO_STRING +21, */
+ CASE(PRIVATE);
+ /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */
+ CASE(HTTP_CONNECTCODE);
+ /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */
+ CASE(HTTPAUTH_AVAIL);
+ /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */
+ CASE(PROXYAUTH_AVAIL);
+ }
+#undef CASE
+ return NULL;
+}
+/* }}} */
+
+/* {{{ static inline void http_curl_getinfo_ex(CURL, CURLINFO, zval *) */
+static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC)
+{
+ char *key;
+ if (key = http_curl_getinfoname(i)) {
+ switch (i & ~CURLINFO_MASK)
+ {
+ case CURLINFO_STRING:
+ {
+ char *c;
+ if (CURLE_OK == curl_easy_getinfo(ch, i, &c)) {
+ add_assoc_string(array, key, c ? c : "", 1);
+ }
+ }
+ break;
+
+ case CURLINFO_DOUBLE:
+ {
+ double d;
+ if (CURLE_OK == curl_easy_getinfo(ch, i, &d)) {
+ add_assoc_double(array, key, d);
+ }
+ }
+ break;
+
+ case CURLINFO_LONG:
+ {
+ long l;
+ if (CURLE_OK == curl_easy_getinfo(ch, i, &l)) {
+ add_assoc_long(array, key, l);
+ }
+ }
+ break;
+ }
+ }
+}
+/* }}} */
+
+/* {{{ static inline http_curl_getinfo(CURL, HashTable *) */
+static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
+{
+ zval array;
+ Z_ARRVAL(array) = info;
+
+#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , &array)
+ /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */
+ INFO(EFFECTIVE_URL);
+ /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */
+ INFO(RESPONSE_CODE);
+ /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */
+ INFO(TOTAL_TIME);
+ /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */
+ INFO(NAMELOOKUP_TIME);
+ /* CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE +5, */
+ INFO(CONNECT_TIME);
+ /* CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE +6, */
+ INFO(PRETRANSFER_TIME);
+ /* CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE +7, */
+ INFO(SIZE_UPLOAD);
+ /* CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE +8, */
+ INFO(SIZE_DOWNLOAD);
+ /* CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE +9, */
+ INFO(SPEED_DOWNLOAD);
+ /* CURLINFO_SPEED_UPLOAD = CURLINFO_DOUBLE +10, */
+ INFO(SPEED_UPLOAD);
+ /* CURLINFO_HEADER_SIZE = CURLINFO_LONG +11, */
+ INFO(HEADER_SIZE);
+ /* CURLINFO_REQUEST_SIZE = CURLINFO_LONG +12, */
+ INFO(REQUEST_SIZE);
+ /* CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG +13, */
+ INFO(SSL_VERIFYRESULT);
+ /* CURLINFO_FILETIME = CURLINFO_LONG +14, */
+ INFO(FILETIME);
+ /* CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE +15, */
+ INFO(CONTENT_LENGTH_DOWNLOAD);
+ /* CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE +16, */
+ INFO(CONTENT_LENGTH_UPLOAD);
+ /* CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE +17, */
+ INFO(STARTTRANSFER_TIME);
+ /* CURLINFO_CONTENT_TYPE = CURLINFO_STRING +18, */
+ INFO(CONTENT_TYPE);
+ /* CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE +19, */
+ INFO(REDIRECT_TIME);
+ /* CURLINFO_REDIRECT_COUNT = CURLINFO_LONG +20, */
+ INFO(REDIRECT_COUNT);
+ /* CURLINFO_PRIVATE = CURLINFO_STRING +21, */
+ INFO(PRIVATE);
+ /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */
+ INFO(HTTP_CONNECTCODE);
+ /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */
+ INFO(HTTPAUTH_AVAIL);
+ /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */
+ INFO(PROXYAUTH_AVAIL);
+#undef INFO
+}
+/* }}} */
+
#endif
/* }}} HAVE_CURL */
+/* {{{ Day/Month/TZ checks for http_parse_date()
+ Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. */
static int check_day(char *day, size_t len)
{
int i;
}
return -1;
}
+/* }}} */
+
+/* static char *pretty_key(char *, int, int, int) */
+static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
+{
+ if (key && key_len) {
+ int i, wasalpha;
+ if (wasalpha = isalpha(key[0])) {
+ key[0] = uctitle ? toupper(key[0]) : tolower(key[0]);
+ }
+ for (i = 1; i < key_len; i++) {
+ if (isalpha(key[i])) {
+ key[i] = ((!wasalpha) && uctitle) ? toupper(key[i]) : tolower(key[i]);
+ wasalpha = 1;
+ } else {
+ if (xhyphen && (key[i] == '_')) {
+ key[i] = '-';
+ }
+ wasalpha = 0;
+ }
+ }
+ }
+ return key;
+}
+/* }}} */
+
+/* {{{ static STATUS http_ob_stack_get(php_ob_buffer *, php_ob_buffer **) */
+static STATUS http_ob_stack_get(php_ob_buffer *o, php_ob_buffer **s)
+{
+ static int i = 0;
+ php_ob_buffer *b = emalloc(sizeof(php_ob_buffer));
+ b->handler_name = estrdup(o->handler_name);
+ b->buffer = estrndup(o->buffer, o->text_length);
+ b->text_length = o->text_length;
+ b->chunk_size = o->chunk_size;
+ b->erase = o->erase;
+ s[i++] = b;
+ return SUCCESS;
+}
+/* }}} */
/* }}} internals */
PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC)
{
struct tm *gmtime, tmbuf;
- char *date = ecalloc(1, 30);
+ char *date = ecalloc(31, 1);
gmtime = php_gmtime_r(&t, &tmbuf);
snprintf(date, 30,
}
/* }}} */
-/* time_t http_parse_date(char *)
+/* {{{ time_t http_parse_date(char *)
Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. */
-PHP_HTTP_API time_t http_parse_date(const char *date)
+PHP_HTTP_API time_t _http_parse_date(const char *date)
{
time_t t = 0;
- int tz_offset = -1, year = -1, month = -1, monthday = -1, weekday = -1,
+ int tz_offset = -1, year = -1, month = -1, monthday = -1, weekday = -1,
hours = -1, minutes = -1, seconds = -1;
struct tm tm;
enum assume_next dignext = DATE_MDAY;
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);
found = 1;
}
}
-
+
if (!found) {
return -1; /* bad string */
}
if((delta > 0) && (t + delta < t)) {
return -1; /* time_t overflow */
}
-
+
t += delta;
}
{
zval **var;
if (SUCCESS == zend_hash_find(
- Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]),
+ HTTP_SERVER_VARS,
(char *) key, strlen(key) + 1, (void **) &var)) {
return *var;
}
if (mode & PHP_OUTPUT_HANDLER_END) {
PHP_MD5Final(digest, &HTTP_G(etag_md5));
- make_digest(etag, digest);
- if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
- http_send_status(304);
- } else {
- http_send_etag(etag, 32);
+ /* just do that if desired */
+ if (HTTP_G(etag_started)) {
+ make_digest(etag, digest);
+
+ if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+ http_send_status(304);
+ } else {
+ http_send_etag(etag, 32);
+ }
}
}
}
/* }}} */
+/* {{{ STATUS http_start_ob_handler(php_output_handler_func_t, char *, uint, zend_bool) */
+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)
+{
+ php_ob_buffer **stack;
+ int count, i;
+
+ if (count = OG(ob_nesting_level)) {
+ stack = ecalloc(sizeof(php_ob_buffer), count);
+
+ if (count > 1) {
+ zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP,
+ (int (*)(void *elem, void *)) http_ob_stack_get, stack);
+ }
+
+ if (count > 0) {
+ http_ob_stack_get(&OG(active_ob_buffer), stack);
+ }
+
+ while (OG(ob_nesting_level)) {
+ php_end_ob_buffer(0, 0 TSRMLS_CC);
+ }
+ }
+
+ php_ob_set_internal_handler(handler_func, chunk_size, handler_name, erase TSRMLS_CC);
+
+ for (i = 0; i < count; i++) {
+ php_ob_buffer *s = stack[i];
+ if (strcmp(s->handler_name, "default output handler")) {
+ php_start_ob_buffer_named(s->handler_name, s->chunk_size, s->erase TSRMLS_CC);
+ }
+ php_body_write(s->buffer, s->text_length TSRMLS_CC);
+ }
+
+ return SUCCESS;
+}
+/* }}} */
+
/* {{{ int http_modified_match(char *, int) */
PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_DC)
{
} else {
result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag));
}
-
efree(quoted_etag);
return result;
}
/* }}} */
/* {{{ STATUS http_send_last_modified(int) */
-PHP_HTTP_API STATUS _http_send_last_modified(const int t TSRMLS_DC)
+PHP_HTTP_API STATUS _http_send_last_modified(const time_t t TSRMLS_DC)
{
char modified[96] = "Last-Modified: ", *date;
date = http_date(t);
strcat(modified, date);
efree(date);
+
+ /* remember */
+ HTTP_G(lmod) = t;
+
return http_send_header(modified);
}
/* }}} */
int header_len;
char *etag_header;
- header_len = strlen("ETag: \"\"") + etag_len + 1;
- etag_header = (char *) emalloc(header_len);
- snprintf(etag_header, header_len, "ETag: \"%s\"", etag);
+ header_len = sizeof("ETag: \"\"") + etag_len + 1;
+ etag_header = ecalloc(header_len, 1);
+ sprintf(etag_header, "ETag: \"%s\"", etag);
ret = http_send_header(etag_header);
efree(etag_header);
+
+ if (!etag_len){
+ php_error_docref(NULL TSRMLS_CC,E_ERROR,
+ "Sending empty Etag (previous: %s)\n", HTTP_G(etag));
+ return FAILURE;
+ }
+ /* remember */
+ if (HTTP_G(etag)) {
+ efree(HTTP_G(etag));
+ }
+ HTTP_G(etag) = estrdup(etag);
+
return ret;
}
/* }}} */
if (NULL != (q_ptr = strrchr(Z_STRVAL_PP(zentry), ';'))) {
qual = strtod(q_ptr + 3, NULL);
} else {
- qual = 1000.0 - 1;
+ qual = 1000.0 - i;
}
/* walk through the supported array */
PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
const size_t length TSRMLS_DC)
{
- zval *zrange, *zentry, **zentries;
+ zval *zrange;
char *range, c;
long begin = -1, end = -1, *ptr;
if (strncmp(range, "bytes=", strlen("bytes="))) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes=");
- return RANGE_ERR;
+ return RANGE_NO;
}
ptr = &begin;
ptr = &end;
break;
+ case ' ':
+ /* IE - ignore for now */
+ break;
+
case 0:
case ',':
break;
}
}
-
- zentry = (zval *) zentries++;
- MAKE_STD_ZVAL(zentry);
- array_init(zentry);
- add_index_long(zentry, 0, begin);
- add_index_long(zentry, 1, end);
- add_next_index_zval(zranges, zentry);
-
- begin = -1;
- end = -1;
- ptr = &begin;
+ {
+ zval *zentry;
+ MAKE_STD_ZVAL(zentry);
+ array_init(zentry);
+ add_index_long(zentry, 0, begin);
+ add_index_long(zentry, 1, end);
+ add_next_index_zval(zranges, zentry);
+
+ begin = -1;
+ end = -1;
+ ptr = &begin;
+ }
break;
default:
- return RANGE_ERR;
+ return RANGE_NO;
break;
}
} while (c != 0);
/* {{{ STATUS http_send_ranges(zval *, void *, size_t, http_send_mode) */
PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const size_t size, const http_send_mode mode TSRMLS_DC)
{
+ int c;
+ long **begin, **end;
zval **zrange;
- long b, e, **begin, **end;
- char range_header[255], multi_header[68] = "Content-Type: multipart/byteranges; boundary=", bound[23], preface[1024];
- int i, c;
/* Send HTTP 206 Partial Content */
http_send_status(206);
/* single range */
if ((c = zend_hash_num_elements(Z_ARRVAL_P(zranges))) == 1) {
+ char range_header[256] = {0};
+
zend_hash_index_find(Z_ARRVAL_P(zranges), 0, (void **) &zrange);
zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin);
zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end);
- /* so zranges can be freed */
- b = **begin;
- e = **end;
-
- /* free zranges */
- zval_dtor(zranges);
- efree(zranges);
-
/* send content range header */
- snprintf(range_header, 255, "Content-Range: bytes %d-%d/%d", b, e, size);
+ snprintf(range_header, 255, "Content-Range: bytes %d-%d/%d", **begin, **end, size);
http_send_header(range_header);
/* send requested chunk */
- return http_send_chunk(data, b, e + 1, mode);
+ return http_send_chunk(data, **begin, **end + 1, mode);
}
/* multi range */
+ else {
+ int i;
+ char bound[23] = {0}, preface[1024] = {0},
+ multi_header[68] = "Content-Type: multipart/byteranges; boundary=";
+
+ snprintf(bound, 22, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
+ strncat(multi_header, bound + 2, 21);
+ http_send_header(multi_header);
+
+ /* send each requested chunk */
+ for ( i = 0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(zranges));
+ i < c;
+ i++, zend_hash_move_forward(Z_ARRVAL_P(zranges))) {
+ if ( HASH_KEY_NON_EXISTANT == zend_hash_get_current_data(
+ Z_ARRVAL_P(zranges), (void **) &zrange) ||
+ SUCCESS != zend_hash_index_find(
+ Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
+ SUCCESS != zend_hash_index_find(
+ Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
+ break;
+ }
- snprintf(bound, 23, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
- strncat(multi_header, bound + 2, 21);
- http_send_header(multi_header);
-
- /* send each requested chunk */
- for ( i = 0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(zranges));
- i < c;
- i++, zend_hash_move_forward(Z_ARRVAL_P(zranges))) {
- if ( HASH_KEY_NON_EXISTANT == zend_hash_get_current_data(
- Z_ARRVAL_P(zranges), (void **) &zrange) ||
- SUCCESS != zend_hash_index_find(
- Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
- SUCCESS != zend_hash_index_find(
- Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
- break;
+ snprintf(preface, 1023,
+ HTTP_CRLF "%s"
+ HTTP_CRLF "Content-Type: %s"
+ HTTP_CRLF "Content-Range: bytes %ld-%ld/%ld"
+ HTTP_CRLF
+ HTTP_CRLF,
+
+ bound,
+ HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
+ **begin,
+ **end,
+ size
+ );
+
+ php_body_write(preface, strlen(preface) TSRMLS_CC);
+ http_send_chunk(data, **begin, **end + 1, mode);
}
- snprintf(preface, 1024,
- "\r\n%s\r\nContent-Type: %s\r\nContent-Range: bytes %d-%d/%d\r\n\r\n", bound,
- HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
- **begin, **end, size);
- php_body_write(preface, strlen(preface) TSRMLS_CC);
- http_send_chunk(data, **begin, **end + 1, mode);
+ /* write boundary once more */
+ php_body_write(HTTP_CRLF, 2 TSRMLS_CC);
+ php_body_write(bound, strlen(bound) TSRMLS_CC);
+ return SUCCESS;
}
-
- /* free zranges */
- zval_dtor(zranges);
- efree(zranges);
-
- /* write boundary once more */
- php_body_write("\n", 1 TSRMLS_CC);
- php_body_write(bound, strlen(bound) TSRMLS_CC);
-
- return SUCCESS;
}
/* }}} */
PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
const http_send_mode data_mode TSRMLS_DC)
{
- zval *zranges = NULL;
+ int is_range_request = http_is_range_request();
if (!data_ptr) {
return FAILURE;
}
- /* never ever use the output to compute the ETag if http_send() is used */
+ /* etag handling */
if (HTTP_G(etag_started)) {
- char *new_etag = (char *) emalloc(33);
-
+ char *etag = ecalloc(33, 1);
+ /* interrupt */
+ HTTP_G(etag_started) = 0;
+ /* never ever use the output to compute the ETag if http_send() is used */
php_end_ob_buffer(0, 0 TSRMLS_CC);
- if (NULL == http_etag(&new_etag, data_ptr, data_size, data_mode)) {
- efree(new_etag);
+ if (NULL == http_etag(&etag, data_ptr, data_size, data_mode)) {
+ efree(etag);
return FAILURE;
}
/* send 304 Not Modified if etag matches */
- if (http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) {
- efree(new_etag);
+ if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+ efree(etag);
return http_send_status(304);
}
- http_send_etag(new_etag, 32);
- efree(new_etag);
+ http_send_etag(etag, 32);
+ efree(etag);
}
- if (http_is_range_request()) {
+ /* send 304 Not Modified if last-modified matches*/
+ if ((!is_range_request) && http_modified_match("HTTP_IF_MODIFIED_SINCE", HTTP_G(lmod))) {
+ return http_send_status(304);
+ }
- MAKE_STD_ZVAL(zranges);
- array_init(zranges);
+ if (is_range_request) {
- switch (http_get_request_ranges(zranges, data_size))
- {
- case RANGE_NO:
- zval_dtor(zranges);
- efree(zranges);
- /* go ahead and send all */
- break;
+ /* only send ranges if entity hasn't changed */
+ if (
+ ((!zend_hash_exists(HTTP_SERVER_VARS, "HTTP_IF_MATCH", 13)) ||
+ http_etag_match("HTTP_IF_MATCH", HTTP_G(etag)))
+ &&
+ ((!zend_hash_exists(HTTP_SERVER_VARS, "HTTP_IF_UNMODIFIED_SINCE", 25)) ||
+ http_modified_match("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(lmod)))
+ ) {
- case RANGE_OK:
- return http_send_ranges(zranges, data_ptr, data_size, data_mode);
- break;
+ STATUS result = FAILURE;
+ zval *zranges = NULL;
+ MAKE_STD_ZVAL(zranges);
+ array_init(zranges);
- case RANGE_ERR:
- zval_dtor(zranges);
- efree(zranges);
- http_send_status(416);
- return FAILURE;
- break;
+ switch (http_get_request_ranges(zranges, data_size))
+ {
+ case RANGE_NO:
+ zval_dtor(zranges);
+ efree(zranges);
+ /* go ahead and send all */
+ break;
- default:
- return FAILURE;
- break;
+ case RANGE_OK:
+ result = http_send_ranges(zranges, data_ptr, data_size, data_mode);
+ zval_dtor(zranges);
+ efree(zranges);
+ return result;
+ break;
+
+ case RANGE_ERR:
+ zval_dtor(zranges);
+ efree(zranges);
+ http_send_status(416);
+ return FAILURE;
+ break;
+
+ default:
+ return FAILURE;
+ break;
+ }
}
}
/* send all */
return FAILURE;
}
- return http_send((void *) zdata, Z_STRLEN_P(zdata), SEND_DATA);
+ return http_send(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), SEND_DATA);
}
/* }}} */
return FAILURE;
}
- return http_send((void *) file, HTTP_G(ssb).sb.st_size, SEND_RSRC);
+ return http_send(file, HTTP_G(ssb).sb.st_size, SEND_RSRC);
}
/* }}} */
char *d_ptr;
*decoded_len = 0;
- *decoded = (char *) ecalloc(1, encoded_len);
+ *decoded = (char *) ecalloc(encoded_len, 1);
d_ptr = *decoded;
e_ptr = encoded;
hex_len[i++] = *e_ptr++;
}
+ /* reached the end */
+ if (!strcmp(hex_len, "0")) {
+ break;
+ }
+
+ /* new line */
+ if (strncmp(e_ptr, HTTP_CRLF, 2)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ "Invalid character (expected 0x0D 0x0A; got: %x %x)",
+ *e_ptr, *(e_ptr + 1));
+ efree(*decoded);
+ return FAILURE;
+ }
+
/* hex to long */
- if (strcmp(hex_len, "0")) {
+ {
char *error = NULL;
chunk_len = strtol(hex_len, &error, 16);
if (error == hex_len) {
efree(*decoded);
return FAILURE;
}
- } else {
- break;
}
- /* new line */
- if (*e_ptr++ != '\r' || *e_ptr++ != '\n') {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
- "Invalid character (expected 0x0A, 0x0D; got: %x)",
- *(e_ptr - 1));
- efree(*decoded);
- return FAILURE;
- }
-
- memcpy(d_ptr, e_ptr, chunk_len);
+ memcpy(d_ptr, e_ptr += 2, chunk_len);
d_ptr += chunk_len;
e_ptr += chunk_len + 2;
*decoded_len += chunk_len;
}
/* }}} */
-/* {{{ proto void http_split_response(zval *, zval *, zval *) */
-PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders,
+/* {{{ proto STATUS http_split_response(zval *, zval *, zval *) */
+PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders,
zval *zbody TSRMLS_DC)
{
char *header, *response, *body = NULL;
Z_TYPE_P(zbody) = IS_NULL;
}
- /* check for HTTP status - FIXXME: strchr() */
+ return http_parse_headers(header, body - Z_STRVAL_P(zresponse), zheaders);
+}
+/* }}} */
+
+/* {{{ STATUS http_parse_headers(char *, long, zval *) */
+PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *array TSRMLS_DC)
+{
+ char *colon = NULL, *line = NULL, *begin = header;
+
+ if (header_len < 2) {
+ return FAILURE;
+ }
+
+ /* status code */
if (!strncmp(header, "HTTP/1.", 7)) {
- char *end = strchr(header, '\r');
- add_assoc_stringl(zheaders, "Status",
+ char *end = strstr(header, HTTP_CRLF);
+ add_assoc_stringl(array, "Status",
header + strlen("HTTP/1.x "),
end - (header + strlen("HTTP/1.x ")), 1);
header = end + 2;
}
- /* split headers */
- {
- char *colon = NULL, *line = header;
- while ( (line - Z_STRVAL_P(zresponse) + 3) <
- (body - Z_STRVAL_P(zresponse))) {
- switch (*line++)
- {
- case '\r':
- if (colon && (*line == '\n')) {
+ 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) {
char *key = estrndup(header, colon - header);
- add_assoc_stringl(zheaders, key,
- colon + 2, line - colon - 3, 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 < 1) {
+ /* hm, empty header? */
+ add_assoc_stringl(array, key, "", 0, 1);
+ } else {
+ add_assoc_stringl(array, key, colon, value_len, 1);
+ }
efree(key);
-
- colon = NULL;
- header += line - header + 1;
}
- break;
- case ':':
- if (!colon) {
- colon = line - 1;
- }
- break;
- }
+ colon = NULL;
+ value_len = 0;
+ header += line - header;
+ }
+ break;
+
+ case ':':
+ if (!colon) {
+ colon = line - 1;
+ }
+ break;
}
}
+ return SUCCESS;
+}
+/* }}} */
+
+/* {{{ void http_get_request_headers(zval *) */
+PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
+{
+ char *key;
+
+ for ( zend_hash_internal_pointer_reset(HTTP_SERVER_VARS);
+ zend_hash_get_current_key(HTTP_SERVER_VARS, &key, NULL, 0) != HASH_KEY_NON_EXISTANT;
+ zend_hash_move_forward(HTTP_SERVER_VARS)) {
+ if (!strncmp(key, "HTTP_", 5)) {
+ zval **header;
+ zend_hash_get_current_data(HTTP_SERVER_VARS, (void **) &header);
+ add_assoc_stringl(array, pretty_key(key + 5, strlen(key) - 5, 1, 1), Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
+ }
+ }
}
/* }}} */
/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
-/* {{{ STATUS http_get(char *, HashTable *, char **, size_t *) */
+/* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */
PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
- char **data, size_t *data_len TSRMLS_DC)
+ HashTable *info, char **data, size_t *data_len TSRMLS_DC)
{
+ STATUS rs;
CURL *ch = curl_easy_init();
if (!ch) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
return FAILURE;
}
+
+ rs = http_get_ex(ch, URL, options, info, data, data_len);
+ curl_easy_cleanup(ch);
+ return rs;
+}
+/* }}} */
+/* {{{ STATUS http_get_ex(CURL *, char *, HashTable *, HashTable *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options,
+ HashTable *info, char **data, size_t *data_len TSRMLS_DC)
+{
http_curl_initbuf(CURLBUF_EVRY);
http_curl_setopts(ch, URL, options);
+ curl_easy_setopt(ch, CURLOPT_NOBODY, 0);
+ curl_easy_setopt(ch, CURLOPT_POST, 0);
if (CURLE_OK != curl_easy_perform(ch)) {
- curl_easy_cleanup(ch);
http_curl_freebuf(CURLBUF_EVRY);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
return FAILURE;
}
- curl_easy_cleanup(ch);
-
+ if (info) {
+ http_curl_getinfo(ch, info);
+ }
http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
return SUCCESS;
}
-/* }}} */
-/* {{{ STATUS http_head(char *, HashTable *, char **data, size_t *) */
+/* {{{ STATUS http_head(char *, HashTable *, HashTable *, char **data, size_t *) */
PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
- char **data, size_t *data_len TSRMLS_DC)
+ HashTable *info, char **data, size_t *data_len TSRMLS_DC)
{
+ STATUS rs;
CURL *ch = curl_easy_init();
if (!ch) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
return FAILURE;
}
+
+ rs = http_head_ex(ch, URL, options, info, data, data_len);
+ curl_easy_cleanup(ch);
+ return rs;
+}
+/* }}} */
+/* {{{ STATUS http_head_ex(CURL *, char *, HashTable *, HashTable *, char **data, size_t *) */
+PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options,
+ HashTable *info, char **data, size_t *data_len TSRMLS_DC)
+{
http_curl_initbuf(CURLBUF_HDRS);
http_curl_setopts(ch, URL, options);
curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
+ curl_easy_setopt(ch, CURLOPT_POST, 0);
if (CURLE_OK != curl_easy_perform(ch)) {
- curl_easy_cleanup(ch);
http_curl_freebuf(CURLBUF_HDRS);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
return FAILURE;
}
- curl_easy_cleanup(ch);
-
+ if (info) {
+ http_curl_getinfo(ch, info);
+ }
http_curl_movebuf(CURLBUF_HDRS, data, data_len);
-
return SUCCESS;
}
-/* }}} */
-/* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, char **, size_t *) */
+/* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata,
- size_t postdata_len, HashTable *options, char **data,
+ size_t postdata_len, HashTable *options, HashTable *info, char **data,
size_t *data_len TSRMLS_DC)
{
+ STATUS rs;
CURL *ch = curl_easy_init();
if (!ch) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
return FAILURE;
}
+ rs = http_post_data_ex(ch, URL, postdata, postdata_len, options, info, data, data_len);
+ curl_easy_cleanup(ch);
+ return rs;
+}
+/* }}} */
+/* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata,
+ size_t postdata_len, HashTable *options, HashTable *info, char **data,
+ size_t *data_len TSRMLS_DC)
+{
http_curl_initbuf(CURLBUF_EVRY);
http_curl_setopts(ch, URL, options);
curl_easy_setopt(ch, CURLOPT_POST, 1);
curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len);
if (CURLE_OK != curl_easy_perform(ch)) {
- curl_easy_cleanup(ch);
http_curl_freebuf(CURLBUF_EVRY);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
return FAILURE;
}
- curl_easy_cleanup(ch);
-
+ if (info) {
+ http_curl_getinfo(ch, info);
+ }
http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
return SUCCESS;
}
/* }}} */
-/* {{{ STATUS http_post_array(char *, HashTable *, HashTable *, char **, size_t *) */
+/* {{{ STATUS http_post_array(char *, HashTable *, HashTable *, HashTable *, char **, size_t *) */
PHP_HTTP_API STATUS _http_post_array(const char *URL, HashTable *postarray,
- HashTable *options, char **data, size_t *data_len TSRMLS_DC)
+ HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC)
{
smart_str qstr = {0};
STATUS status;
}
smart_str_0(&qstr);
- status = http_post_data(URL, qstr.c, qstr.len, options, data, data_len);
+ status = http_post_data(URL, qstr.c, qstr.len, options, info, data, data_len);
if (qstr.c) {
efree(qstr.c);
}
#endif
/* }}} HAVE_CURL */
-/* {{{ void http_auth_header(char *, char*) */
-PHP_HTTP_API void _http_auth_header(const char *type, const char *realm TSRMLS_DC)
+/* {{{ STATUS http_auth_header(char *, char*) */
+PHP_HTTP_API STATUS _http_auth_header(const char *type, const char *realm TSRMLS_DC)
{
- char realm_header[1024];
- snprintf(realm_header, 1024, "WWW-Authenticate: %s realm=\"%s\"", type, realm);
- http_send_status_header(401, realm_header);
+ char realm_header[1024] = {0};
+ snprintf(realm_header, 1023, "WWW-Authenticate: %s realm=\"%s\"", type, realm);
+ return http_send_status_header(401, realm_header);
}
/* }}} */
projects / m6w6 / ext-http / blobdiff