/* $Id$ */
+#define _WINSOCKAPI_
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
#endif
#include <ctype.h>
#include "SAPI.h"
#ifdef ZEND_ENGINE_2
-#include "ext/standard/php_http.h"
-#else
-#include "http_build_query.c"
+# include "ext/standard/php_http.h"
#endif
#include "php_http.h"
#include "php_http_api.h"
-
-#ifdef HTTP_HAVE_CURL
-
-#ifdef PHP_WIN32
-#include <winsock2.h>
-#include <sys/types.h>
-#endif
-
-#include <curl/curl.h>
-#include <curl/easy.h>
-#endif
-
+#include "php_http_std_defs.h"
ZEND_DECLARE_MODULE_GLOBALS(http)
/* {{{ internals */
static int http_sort_q(const void *a, const void *b TSRMLS_DC);
-#define http_etag(e, p, l, m) _http_etag((e), (p), (l), (m) TSRMLS_CC)
-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);
-#define http_is_range_request() _http_is_range_request(TSRMLS_C)
-static inline int _http_is_range_request(TSRMLS_D);
#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, const size_t begin, const size_t end, const http_send_mode mode TSRMLS_DC);
static int check_month(char *month);
static int check_tzone(char *tzone);
-/* {{{ 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 inline void _http_curl_freebuf(http_curlbuf_member member TSRMLS_DC);
-#define http_curl_sizebuf(m, l) _http_curl_sizebuf((m), (l) TSRMLS_CC)
-static inline void _http_curl_sizebuf(http_curlbuf_member member, size_t len TSRMLS_DC);
-#define http_curl_movebuf(m, d, l) _http_curl_movebuf((m), (d), (l) TSRMLS_CC)
-static inline void _http_curl_movebuf(http_curlbuf_member member, char **data, size_t *data_len TSRMLS_DC);
-#define http_curl_copybuf(m, d, l) _http_curl_copybuf((m), (d), (l) TSRMLS_CC)
-static inline void _http_curl_copybuf(http_curlbuf_member member, char **data, size_t *data_len TSRMLS_DC);
-#define http_curl_setopts(c, u, o) _http_curl_setopts((c), (u), (o) TSRMLS_CC)
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC);
-
-#define http_curl_getopt(o, k) _http_curl_getopt((o), (k) TSRMLS_CC, 0)
-#define http_curl_getopt1(o, k, t1) _http_curl_getopt((o), (k) TSRMLS_CC, 1, (t1))
-#define http_curl_getopt2(o, k, t1, t2) _http_curl_getopt((o), (k) TSRMLS_CC, 2, (t1), (t2))
-static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...);
-
-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 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)
}
/* }}} */
-/* {{{ static inline char *http_etag(char **, void *, size_t, http_send_mode) */
-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];
- PHP_MD5_CTX ctx;
-
- PHP_MD5Init(&ctx);
-
- switch (data_mode)
- {
- case SEND_DATA:
- PHP_MD5Update(&ctx, data_ptr, data_len);
- break;
-
- case SEND_RSRC:
- snprintf(ssb_buf, 127, "%l=%l=%l",
- 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:
- return NULL;
- break;
- }
-
- PHP_MD5Final(digest, &ctx);
- make_digest(*new_etag, digest);
-
- return *new_etag;
-}
-/* }}} */
-
-/* {{{ static inline int http_is_range_request(void) */
-static inline int _http_is_range_request(TSRMLS_D)
-{
- return zend_hash_exists(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]),
- "HTTP_RANGE", strlen("HTTP_RANGE") + 1);
-}
-/* }}} */
-
/* {{{ static STATUS http_send_chunk(const void *, size_t, size_t,
http_send_mode) */
static STATUS _http_send_chunk(const void *data, const size_t begin,
if (php_stream_seek(s, begin, SEEK_SET)) {
return FAILURE;
}
- buf = (char *) ecalloc(1, HTTP_BUF_SIZE);
+ buf = (char *) ecalloc(1, HTTP_SENDBUF_SIZE);
/* read into buf and write out */
- while ((len -= HTTP_BUF_SIZE) >= 0) {
- if (!(read = php_stream_read(s, buf, HTTP_BUF_SIZE))) {
+ while ((len -= HTTP_SENDBUF_SIZE) >= 0) {
+ if (!(read = php_stream_read(s, buf, HTTP_SENDBUF_SIZE))) {
efree(buf);
return FAILURE;
}
/* read & write left over */
if (len) {
- if (read = php_stream_read(s, buf, HTTP_BUF_SIZE + 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;
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 */
-#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)
-{
- http_curl_freebuf(member);
-
- if (member & CURLBUF_HDRS) {
- HTTP_G(curlbuf).hdrs.data = emalloc(HTTP_CURLBUF_HDRSSIZE);
- HTTP_G(curlbuf).hdrs.free = HTTP_CURLBUF_HDRSSIZE;
- }
- if (member & CURLBUF_BODY) {
- HTTP_G(curlbuf).body.data = emalloc(HTTP_CURLBUF_BODYSIZE);
- HTTP_G(curlbuf).body.free = HTTP_CURLBUF_BODYSIZE;
- }
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_freebuf(http_curlbuf_member) */
-static inline void _http_curl_freebuf(http_curlbuf_member member TSRMLS_DC)
-{
- if (member & CURLBUF_HDRS) {
- if (HTTP_G(curlbuf).hdrs.data) {
- efree(HTTP_G(curlbuf).hdrs.data);
- HTTP_G(curlbuf).hdrs.data = NULL;
- }
- HTTP_G(curlbuf).hdrs.used = 0;
- HTTP_G(curlbuf).hdrs.free = 0;
- }
- if (member & CURLBUF_BODY) {
- if (HTTP_G(curlbuf).body.data) {
- efree(HTTP_G(curlbuf).body.data);
- HTTP_G(curlbuf).body.data = NULL;
- }
- HTTP_G(curlbuf).body.used = 0;
- HTTP_G(curlbuf).body.free = 0;
- }
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_copybuf(http_curlbuf_member, char **,
- size_t *) */
-static inline void _http_curl_copybuf(http_curlbuf_member member, char **data,
- size_t *data_len TSRMLS_DC)
-{
- *data = NULL;
- *data_len = 0;
-
- if ((member & CURLBUF_HDRS) && HTTP_G(curlbuf).hdrs.used) {
- if ((member & CURLBUF_BODY) && HTTP_G(curlbuf).body.used) {
- *data = emalloc(HTTP_G(curlbuf).hdrs.used + HTTP_G(curlbuf).body.used + 1);
- } else {
- *data = emalloc(HTTP_G(curlbuf).hdrs.used + 1);
- }
- memcpy(*data, HTTP_G(curlbuf).hdrs.data, HTTP_G(curlbuf).hdrs.used);
- *data_len = HTTP_G(curlbuf).hdrs.used;
- }
-
- if ((member & CURLBUF_BODY) && HTTP_G(curlbuf).body.used) {
- if (*data) {
- memcpy((*data) + HTTP_G(curlbuf).hdrs.used,
- HTTP_G(curlbuf).body.data, HTTP_G(curlbuf).body.used);
- *data_len = HTTP_G(curlbuf).hdrs.used + HTTP_G(curlbuf).body.used;
- } else {
- emalloc(HTTP_G(curlbuf).body.used + 1);
- memcpy(*data, HTTP_G(curlbuf).body.data, HTTP_G(curlbuf).body.used);
- *data_len = HTTP_G(curlbuf).body.used;
- }
- }
- if (*data) {
- (*data)[*data_len] = 0;
- } else {
- *data = "";
- }
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_movebuf(http_curlbuf_member, char **,
- size_t *) */
-static inline void _http_curl_movebuf(http_curlbuf_member member, char **data,
- size_t *data_len TSRMLS_DC)
-{
- http_curl_copybuf(member, data, data_len);
- http_curl_freebuf(member);
-}
-/* }}} */
-
-/* {{{ static size_t http_curl_body_callback(char *, size_t, size_t, void *) */
-static size_t http_curl_body_callback(char *buf, size_t len, size_t n, void *s)
-{
- TSRMLS_FETCH();
-
- if ((len *= n) > HTTP_G(curlbuf).body.free) {
- size_t bsize = HTTP_CURLBUF_BODYSIZE;
- while (bsize < len) {
- bsize *= 2;
- }
- HTTP_G(curlbuf).body.data = erealloc(HTTP_G(curlbuf).body.data,
- HTTP_G(curlbuf).body.used + bsize);
- HTTP_G(curlbuf).body.free += bsize;
- }
-
- memcpy(HTTP_G(curlbuf).body.data + HTTP_G(curlbuf).body.used, buf, len);
- HTTP_G(curlbuf).body.free -= len;
- HTTP_G(curlbuf).body.used += len;
-
- return len;
-}
-/* }}} */
-
-/* {{{ static size_t http_curl_hdrs_callback(char*, size_t, size_t, void *) */
-static size_t http_curl_hdrs_callback(char *buf, size_t len, size_t n, void *s)
-{
- TSRMLS_FETCH();
-
- /* discard previous headers */
- if ((HTTP_G(curlbuf).hdrs.used) && (!strncmp(buf, "HTTP/1.", strlen("HTTP/1.")))) {
- http_curl_initbuf(CURLBUF_HDRS);
- }
-
- if ((len *= n) > HTTP_G(curlbuf).hdrs.free) {
- size_t bsize = HTTP_CURLBUF_HDRSSIZE;
- while (bsize < len) {
- bsize *= 2;
- }
- HTTP_G(curlbuf).hdrs.data = erealloc(HTTP_G(curlbuf).hdrs.data,
- HTTP_G(curlbuf).hdrs.used + bsize);
- HTTP_G(curlbuf).hdrs.free += bsize;
- }
-
- memcpy(HTTP_G(curlbuf).hdrs.data + HTTP_G(curlbuf).hdrs.used, buf, len);
- HTTP_G(curlbuf).hdrs.free -= len;
- HTTP_G(curlbuf).hdrs.used += len;
-
- return len;
-}
-/* }}} */
-
-/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, int, ...) */
-static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...)
-{
- zval **zoption;
- va_list types;
- int i;
-
- if (SUCCESS != zend_hash_find(options, key, strlen(key) + 1, (void **) &zoption)) {
- return NULL;
- }
- if (checks < 1) {
- return *zoption;
- }
-
- va_start(types, checks);
- for (i = 0; i < checks; ++i) {
- if ((va_arg(types, int)) == (Z_TYPE_PP(zoption))) {
- va_end(types);
- return *zoption;
- }
- }
- va_end(types);
- return NULL;
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_setopts(CURL *, char *, HashTable *) */
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC)
-{
- zval *zoption;
-
- /* standard options */
- curl_easy_setopt(ch, CURLOPT_URL, url);
- curl_easy_setopt(ch, CURLOPT_HEADER, 0);
- curl_easy_setopt(ch, CURLOPT_NOPROGRESS, 1);
- 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);
-#ifdef ZTS
- curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
-#endif
-
- if ((!options) || (1 > zend_hash_num_elements(options))) {
- return;
- }
-
- /* 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));
- if (zoption = http_curl_getopt2(options, "unrestrictedauth", IS_LONG, IS_BOOL)) {
- curl_easy_setopt(ch, CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
- }
- } else {
- curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 0);
- }
-
- /* proxy */
- if (zoption = http_curl_getopt1(options, "proxyhost", IS_STRING)) {
- curl_easy_setopt(ch, CURLOPT_PROXY, Z_STRVAL_P(zoption));
- /* port */
- if (zoption = http_curl_getopt1(options, "proxyport", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_PROXYPORT, Z_LVAL_P(zoption));
- }
- /* user:pass */
- if (zoption = http_curl_getopt1(options, "proxyauth", IS_STRING)) {
- curl_easy_setopt(ch, CURLOPT_PROXYUSERPWD, Z_STRVAL_P(zoption));
- }
- /* auth method */
- if (zoption = http_curl_getopt1(options, "proxyauthtype", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_PROXYAUTH, Z_LVAL_P(zoption));
- }
- }
-
- /* auth */
- if (zoption = http_curl_getopt1(options, "httpauth", IS_STRING)) {
- curl_easy_setopt(ch, CURLOPT_USERPWD, Z_STRVAL_P(zoption));
- }
- if (zoption = http_curl_getopt1(options, "httpauthtype", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption));
- }
-
- /* compress, enabled by default (empty string enables deflate and gzip) */
- if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) {
- if (Z_LVAL_P(zoption)) {
- curl_easy_setopt(ch, CURLOPT_ENCODING, "");
- }
- } else {
- curl_easy_setopt(ch, CURLOPT_ENCODING, "");
- }
-
- /* another port */
- if (zoption = http_curl_getopt1(options, "port", IS_LONG)) {
- curl_easy_setopt(ch, CURLOPT_PORT, Z_LVAL_P(zoption));
- }
-
- /* referer */
- if (zoption = http_curl_getopt1(options, "referer", IS_STRING)) {
- curl_easy_setopt(ch, CURLOPT_REFERER, Z_STRVAL_P(zoption));
- }
-
- /* 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, array('name' => 'value') */
- if (zoption = http_curl_getopt1(options, "cookies", IS_ARRAY)) {
- 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);
- }
- }
-
- /* cookiestore */
- if (zoption = http_curl_getopt1(options, "cookiestore", IS_STRING)) {
- curl_easy_setopt(ch, CURLOPT_COOKIEFILE, Z_STRVAL_P(zoption));
- curl_easy_setopt(ch, CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption));
- }
-
- /* additional headers, array('name' => 'value') */
- if (zoption = http_curl_getopt1(options, "headers", IS_ARRAY)) {
- 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 (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) {
- if (key_type == HASH_KEY_IS_STRING) {
- zend_hash_get_current_key(Z_ARRVAL_P(zoption), &header_key, NULL, 0);
- zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val);
- snprintf(header, 1024, "%s: %s", header_key, Z_STRVAL_PP(header_val));
- headers = curl_slist_append(headers, header);
- zend_hash_move_forward(Z_ARRVAL_P(zoption));
- }
- }
- if (headers) {
- curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers);
- }
- }
-}
-/* }}} */
-
-/* {{{ static inline char *http_curl_getinfoname(CURLINFO) */
-static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC)
-{
-#define CASE(I) case CURLINFO_ ##I : return #I
- switch (i)
- {
- /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */
- CASE(EFFECTIVE_URL);
- /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */
- CASE(RESPONSE_CODE);
- /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */
- CASE(TOTAL_TIME);
- /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */
- CASE(NAMELOOKUP_TIME);
- /* CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE +5, */
- CASE(CONNECT_TIME);
- /* CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE +6, */
- CASE(PRETRANSFER_TIME);
- /* CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE +7, */
- CASE(SIZE_UPLOAD);
- /* CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE +8, */
- CASE(SIZE_DOWNLOAD);
- /* CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE +9, */
- CASE(SPEED_DOWNLOAD);
- /* CURLINFO_SPEED_UPLOAD = CURLINFO_DOUBLE +10, */
- CASE(SPEED_UPLOAD);
- /* CURLINFO_HEADER_SIZE = CURLINFO_LONG +11, */
- CASE(HEADER_SIZE);
- /* CURLINFO_REQUEST_SIZE = CURLINFO_LONG +12, */
- CASE(REQUEST_SIZE);
- /* CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG +13, */
- CASE(SSL_VERIFYRESULT);
- /* CURLINFO_FILETIME = CURLINFO_LONG +14, */
- CASE(FILETIME);
- /* CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE +15, */
- CASE(CONTENT_LENGTH_DOWNLOAD);
- /* CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE +16, */
- CASE(CONTENT_LENGTH_UPLOAD);
- /* CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE +17, */
- CASE(STARTTRANSFER_TIME);
- /* CURLINFO_CONTENT_TYPE = CURLINFO_STRING +18, */
- CASE(CONTENT_TYPE);
- /* CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE +19, */
- CASE(REDIRECT_TIME);
- /* CURLINFO_REDIRECT_COUNT = CURLINFO_LONG +20, */
- CASE(REDIRECT_COUNT);
- /* CURLINFO_PRIVATE = CURLINFO_STRING +21, */
- CASE(PRIVATE);
- /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */
- CASE(HTTP_CONNECTCODE);
- /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */
- CASE(HTTPAUTH_AVAIL);
- /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */
- CASE(PROXYAUTH_AVAIL);
- }
-#undef CASE
- return NULL;
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_getinfo_ex(CURL, CURLINFO, zval *) */
-static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC)
-{
- char *key;
- if (key = http_curl_getinfoname(i)) {
- switch (i & ~CURLINFO_MASK)
- {
- case CURLINFO_STRING:
- {
- char *c;
- if (CURLE_OK == curl_easy_getinfo(ch, i, &c)) {
- add_assoc_string(array, key, c ? c : "", 1);
- }
- }
- break;
-
- case CURLINFO_DOUBLE:
- {
- double d;
- if (CURLE_OK == curl_easy_getinfo(ch, i, &d)) {
- add_assoc_double(array, key, (double) d);
- }
- }
- break;
-
- case CURLINFO_LONG:
- {
- long l;
- if (CURLE_OK == curl_easy_getinfo(ch, i, &l)) {
- add_assoc_long(array, key, (long) l);
- }
- }
- break;
- }
- }
-}
-/* }}} */
-
-/* {{{ static inline http_curl_getinfo(CURL, HashTable *) */
-static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
-{
- zval *array;
-
- MAKE_STD_ZVAL(array);
- Z_ARRVAL_P(array) = info;
-
-#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , array)
- /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */
- INFO(EFFECTIVE_URL);
- /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */
- INFO(RESPONSE_CODE);
- /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */
- INFO(TOTAL_TIME);
- /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */
- INFO(NAMELOOKUP_TIME);
- /* CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE +5, */
- INFO(CONNECT_TIME);
- /* CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE +6, */
- INFO(PRETRANSFER_TIME);
- /* CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE +7, */
- INFO(SIZE_UPLOAD);
- /* CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE +8, */
- INFO(SIZE_DOWNLOAD);
- /* CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE +9, */
- INFO(SPEED_DOWNLOAD);
- /* CURLINFO_SPEED_UPLOAD = CURLINFO_DOUBLE +10, */
- INFO(SPEED_UPLOAD);
- /* CURLINFO_HEADER_SIZE = CURLINFO_LONG +11, */
- INFO(HEADER_SIZE);
- /* CURLINFO_REQUEST_SIZE = CURLINFO_LONG +12, */
- INFO(REQUEST_SIZE);
- /* CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG +13, */
- INFO(SSL_VERIFYRESULT);
- /* CURLINFO_FILETIME = CURLINFO_LONG +14, */
- INFO(FILETIME);
- /* CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE +15, */
- INFO(CONTENT_LENGTH_DOWNLOAD);
- /* CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE +16, */
- INFO(CONTENT_LENGTH_UPLOAD);
- /* CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE +17, */
- INFO(STARTTRANSFER_TIME);
- /* CURLINFO_CONTENT_TYPE = CURLINFO_STRING +18, */
- INFO(CONTENT_TYPE);
- /* CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE +19, */
- INFO(REDIRECT_TIME);
- /* CURLINFO_REDIRECT_COUNT = CURLINFO_LONG +20, */
- INFO(REDIRECT_COUNT);
- /* CURLINFO_PRIVATE = CURLINFO_STRING +21, */
- INFO(PRIVATE);
- /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */
- INFO(HTTP_CONNECTCODE);
- /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */
- INFO(HTTPAUTH_AVAIL);
- /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */
- INFO(PROXYAUTH_AVAIL);
-#undef INFO
- efree(array);
-}
-/* }}} */
-
/* {{{ Day/Month/TZ checks for http_parse_date()
Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. */
static int check_day(char *day, size_t len)
}
/* }}} */
-#endif
-/* }}} HAVE_CURL */
+/* char *pretty_key(char *, int, int, int) */
+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);
-
- gmtime = php_gmtime_r(&t, &tmbuf);
- 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;
+
+ 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;
}
/* }}} */
/* a digit */
int val;
char *end;
- if((seconds == -1) && (3 == sscanf(date, "%02d:%02d:%02d", &hours, &minutes, &seconds))) {
+ 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] == '-'))) {
+ 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;
}
/* }}} */
-/* {{{ inline STATUS http_send_status(int) */
-PHP_HTTP_API inline STATUS _http_send_status(const int status TSRMLS_DC)
+/* {{{ char *http_etag(void *, size_t, http_send_mode) */
+PHP_HTTP_API char *_http_etag(const void *data_ptr, const size_t data_len,
+ const http_send_mode data_mode TSRMLS_DC)
{
- int s = status;
- return sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) s TSRMLS_CC);
+ 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;
}
/* }}} */
-/* {{{ inline STATUS http_send_header(char *) */
-PHP_HTTP_API inline STATUS _http_send_header(const char *header TSRMLS_DC)
+/* {{{ time_t http_lmod(void *, http_send_mode) */
+PHP_HTTP_API time_t _http_lmod(const void *data_ptr, const http_send_mode data_mode TSRMLS_DC)
{
- return http_send_status_header(0, header);
+ 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;
+ }
+ }
}
/* }}} */
-/* {{{ inline STATUS http_send_status_header(int, char *) */
-PHP_HTTP_API inline STATUS _http_send_status_header(const int status, const char *header TSRMLS_DC)
+/* {{{ STATUS http_send_status_header(int, char *) */
+PHP_HTTP_API STATUS _http_send_status_header(const 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);
}
/* }}} */
-/* {{{ inline zval *http_get_server_var(char *) */
-PHP_HTTP_API inline zval *_http_get_server_var(const char *key TSRMLS_DC)
+/* {{{ zval *http_get_server_var(char *) */
+PHP_HTTP_API zval *_http_get_server_var(const char *key TSRMLS_DC)
{
zval **var;
if (SUCCESS == zend_hash_find(
}
/* }}} */
+/* {{{ 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(count, sizeof(php_ob_buffer *));
+
+ 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);
+ efree(s->handler_name);
+ efree(s->buffer);
+ efree(s);
+ }
+ if (count) {
+ efree(stack);
+ }
+
+ return SUCCESS;
+}
+/* }}} */
+
/* {{{ int http_modified_match(char *, int) */
PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_DC)
{
/* {{{ STATUS http_send_last_modified(int) */
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);
+ char *date = NULL;
+ if (date = http_date(t)) {
+ char modified[96] = "Last-Modified: ";
+ strcat(modified, date);
+ efree(date);
- /* remember */
- HTTP_G(lmod) = t;
+ /* remember */
+ HTTP_G(lmod) = t;
- return http_send_header(modified);
+ return http_send_header(modified);
+ }
+ return FAILURE;
}
/* }}} */
PHP_HTTP_API STATUS _http_send_etag(const char *etag,
const int etag_len TSRMLS_DC)
{
- STATUS ret;
- int header_len;
+ STATUS status;
char *etag_header;
- header_len = strlen("ETag: \"\"") + etag_len + 1;
- etag_header = (char *) emalloc(header_len);
- snprintf(etag_header, header_len, "ETag: \"%s\"", etag);
- ret = http_send_header(etag_header);
- efree(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)) {
}
HTTP_G(etag) = estrdup(etag);
- return ret;
+ 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,
+ const 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,
+ const 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,
+ const size_t f_len, const int 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(const time_t last_modified,
+ const time_t send_modified, const char *cache_control, const 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, const size_t etag_len,
+ const char *cache_control, const 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;
}
/* }}} */
PHP_HTTP_API char *_http_absolute_uri(const char *url,
const char *proto TSRMLS_DC)
{
- char URI[HTTP_URI_MAXLEN + 1], *PTR, *proto_ptr, *host, *path;
+ char *proto_ptr, *host, *path, *PTR, *URI = ecalloc(1, HTTP_URI_MAXLEN + 1);
zval *zhost;
if (!url || !strlen(url)) {
/* Mess around with already absolute URIs */
else if (proto_ptr = strstr(url, "://")) {
if (!proto || !strncmp(url, proto, strlen(proto))) {
- return estrdup(url);
+ strncpy(URI, url, HTTP_URI_MAXLEN);
+ return URI;
} else {
snprintf(URI, HTTP_URI_MAXLEN, "%s%s", proto, proto_ptr + 3);
- return estrdup(URI);
+ return URI;
}
}
}
/* strip everything after a new line */
- PTR = URI;
- while (*PTR != 0) {
- if (*PTR == '\n' || *PTR == '\r') {
- *PTR = 0;
- break;
- }
- PTR++;
+ if ((PTR = strchr(URI, '\r')) || (PTR = strchr(URI, '\n'))) {
+ PTR = 0;
}
- return estrdup(URI);
+ return URI;
}
/* }}} */
}
/* walk through the supported array */
- for ( zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported));
- SUCCESS == zend_hash_get_current_data(
- Z_ARRVAL_P(supported), (void **) &zsupp);
- zend_hash_move_forward(Z_ARRVAL_P(supported))) {
+ FOREACH_VAL(supported, zsupp) {
if (!strcasecmp(Z_STRVAL_PP(zsupp), Z_STRVAL_PP(zentry))) {
add_assoc_double(zentries, Z_STRVAL_PP(zsupp), qual);
break;
}
/* }}} */
-/* {{{ http_range_status http_get_request_ranges(zval *zranges, size_t) */
-PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
+/* {{{ http_range_status http_get_request_ranges(HashTable *ranges, size_t) */
+PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges,
const size_t length TSRMLS_DC)
{
zval *zrange;
HTTP_GSC(zrange, "HTTP_RANGE", RANGE_NO);
range = Z_STRVAL_P(zrange);
- if (strncmp(range, "bytes=", strlen("bytes="))) {
+ if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes=");
- return RANGE_ERR;
+ return RANGE_NO;
}
ptr = &begin;
- range += strlen("bytes=");
+ range += sizeof("bytes=") - 1;
do {
switch (c = *(range++))
array_init(zentry);
add_index_long(zentry, 0, begin);
add_index_long(zentry, 1, end);
- add_next_index_zval(zranges, zentry);
+ zend_hash_next_index_insert(ranges, &zentry, sizeof(zval *), NULL);
begin = -1;
end = -1;
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)
+/* {{{ STATUS http_send_ranges(HashTable *, void *, size_t, http_send_mode) */
+PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, const size_t size, const http_send_mode mode TSRMLS_DC)
{
- zval **zrange;
long **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);
+ zval **zrange;
/* single range */
- if ((c = zend_hash_num_elements(Z_ARRVAL_P(zranges))) == 1) {
- 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);
+ 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);
}
/* 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(bound, 23, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
- strncat(multi_header, bound + 2, 21);
- http_send_header(multi_header);
-
- /* send each requested chunk */
- for ( i = 0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(zranges));
- i < c;
- i++, zend_hash_move_forward(Z_ARRVAL_P(zranges))) {
- if ( HASH_KEY_NON_EXISTANT == zend_hash_get_current_data(
- Z_ARRVAL_P(zranges), (void **) &zrange) ||
- SUCCESS != zend_hash_index_find(
- Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
- SUCCESS != zend_hash_index_find(
- Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
- break;
- }
+ snprintf(preface, 1023,
+ HTTP_CRLF "%s"
+ HTTP_CRLF "Content-Type: %s"
+ HTTP_CRLF "Content-Range: bytes %ld-%ld/%ld"
+ HTTP_CRLF
+ HTTP_CRLF,
+
+ bound,
+ HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
+ **begin,
+ **end,
+ size
+ );
- snprintf(preface, 1024,
- "\r\n%s\r\nContent-Type: %s\r\nContent-Range: bytes %d-%d/%d\r\n\r\n", bound,
- HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
- **begin, **end, size);
- php_body_write(preface, strlen(preface) TSRMLS_CC);
- http_send_chunk(data, **begin, **end + 1, mode);
- }
+ php_body_write(preface, strlen(preface) TSRMLS_CC);
+ http_send_chunk(data, **begin, **end + 1, mode);
+ }
- /* write boundary once more */
- php_body_write(HTTP_CRLF, 1 TSRMLS_CC);
- php_body_write(bound, strlen(bound) TSRMLS_CC);
+ /* 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;
+ return SUCCESS;
+ }
}
/* }}} */
-/* {{{ STATUS http_send(void *, sizezo_t, http_send_mode) */
+/* {{{ STATUS http_send(void *, size_t, http_send_mode) */
PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
const http_send_mode data_mode TSRMLS_DC)
{
- char *new_etag = NULL;
int is_range_request = http_is_range_request();
if (!data_ptr) {
return FAILURE;
}
+ if (!data_size) {
+ return SUCCESS;
+ }
/* etag handling */
if (HTTP_G(etag_started)) {
- new_etag = (char *) emalloc(33);
-
- /* never ever use the output to compute the ETag if http_send() is used */
+ char *etag;
+ /* 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 (!(etag = http_etag(data_ptr, data_size, data_mode))) {
return FAILURE;
}
/* send 304 Not Modified if etag matches */
- if ((!is_range_request) && 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);
}
/* send 304 Not Modified if last-modified matches*/
) {
STATUS result = FAILURE;
- zval *zranges = NULL;
- MAKE_STD_ZVAL(zranges);
- array_init(zranges);
+ HashTable ranges;
+ zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0);
- switch (http_get_request_ranges(zranges, data_size))
+ switch (http_get_request_ranges(&ranges, data_size))
{
case RANGE_NO:
- zval_dtor(zranges);
- efree(zranges);
+ zend_hash_destroy(&ranges);
/* go ahead and send all */
break;
case RANGE_OK:
- result = http_send_ranges(zranges, data_ptr, data_size, data_mode);
- zval_dtor(zranges);
- efree(zranges);
+ result = http_send_ranges(&ranges, data_ptr, data_size, data_mode);
+ zend_hash_destroy(&ranges);
return result;
break;
case RANGE_ERR:
- zval_dtor(zranges);
- efree(zranges);
+ zend_hash_destroy(&ranges);
http_send_status(416);
return FAILURE;
break;
}
/* }}} */
-/* {{{ STATUS http_send_data(zval *) */
-PHP_HTTP_API STATUS _http_send_data(const zval *zdata TSRMLS_DC)
-{
- if (!Z_STRLEN_P(zdata)) {
- return SUCCESS;
- }
- if (!Z_STRVAL_P(zdata)) {
- return FAILURE;
- }
-
- return http_send(zdata, Z_STRLEN_P(zdata), SEND_DATA);
-}
-/* }}} */
-
/* {{{ STATUS http_send_stream(php_stream *) */
-PHP_HTTP_API STATUS _http_send_stream(const php_stream *file TSRMLS_DC)
-{
- if (php_stream_stat((php_stream *) file, &HTTP_G(ssb))) {
- return FAILURE;
- }
-
- return http_send(file, HTTP_G(ssb).sb.st_size, SEND_RSRC);
-}
-/* }}} */
-
-/* {{{ STATUS http_send_file(zval *) */
-PHP_HTTP_API STATUS _http_send_file(const zval *zfile TSRMLS_DC)
+PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file,
+ zend_bool close_stream TSRMLS_DC)
{
- php_stream *file;
- STATUS ret;
+ STATUS status;
- if (!Z_STRLEN_P(zfile)) {
+ if ((!file) || php_stream_stat(file, &HTTP_G(ssb))) {
return FAILURE;
}
- if (!(file = php_stream_open_wrapper(Z_STRVAL_P(zfile), "rb",
- REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL))) {
- return FAILURE;
+ status = http_send(file, HTTP_G(ssb).sb.st_size, SEND_RSRC);
+
+ if (close_stream) {
+ php_stream_close(file);
}
- ret = http_send_stream(file);
- php_stream_close(file);
- return ret;
+ return status;
}
/* }}} */
char *d_ptr;
*decoded_len = 0;
- *decoded = (char *) ecalloc(encoded_len, 1);
+ *decoded = ecalloc(1, encoded_len);
d_ptr = *decoded;
e_ptr = encoded;
}
/* }}} */
-/* {{{ proto STATUS http_split_response(zval *, zval *, zval *) */
-PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders,
- zval *zbody TSRMLS_DC)
+/* {{{ proto STATUS http_split_response_ex(char *, size_t, zval *, zval *) */
+PHP_HTTP_API STATUS _http_split_response_ex(char *response,
+ size_t response_len, zval *zheaders, zval *zbody TSRMLS_DC)
{
- char *header, *response, *body = NULL;
- long response_len = Z_STRLEN_P(zresponse);
- header = response = Z_STRVAL_P(zresponse);
+ char *body = NULL;
+ char *header = response;
- while ((response - Z_STRVAL_P(zresponse) + 3) < response_len) {
+ while (0 < (response_len - (response - header + 4))) {
if ( (*response++ == '\r') &&
(*response++ == '\n') &&
(*response++ == '\r') &&
Z_TYPE_P(zbody) = IS_NULL;
}
- return http_parse_headers(header, body - Z_STRVAL_P(zresponse), zheaders);
+ return http_parse_headers(header, body ? body - header : response_len, zheaders);
}
/* }}} */
{
char *colon = NULL, *line = NULL, *begin = header;
- if (header_len < 8) {
+ if (header_len < 2) {
return FAILURE;
}
if (!strncmp(header, "HTTP/1.", 7)) {
char *end = strstr(header, HTTP_CRLF);
add_assoc_stringl(array, "Status",
- header + strlen("HTTP/1.x "),
- end - (header + strlen("HTTP/1.x ")), 1);
+ header + sizeof("HTTP/1.x ") - 1,
+ end - (header + sizeof("HTTP/1.x ") - 1), 1);
header = end + 2;
}
-
+
line = header;
- while (header_len > (line - begin)) {
+ 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 != ' ') && (*line != '\t')) {
- char *key = estrndup(header, colon - header);
- add_assoc_stringl(array, key, colon + 2, line - colon - 4, 1);
- efree(key);
+ if (colon && ((!(*line - 1)) || ((*line != ' ') && (*line != '\t')))) {
+
+ /* skip empty key */
+ if (header != colon) {
+ char *key = estrndup(header, colon - header);
+ value_len += line - colon - 1;
+
+ /* skip leading ws */
+ while (isspace(*(++colon))) --value_len;
+ /* skip trailing ws */
+ while (isspace(colon[value_len - 1])) --value_len;
+
+ if (value_len < 1) {
+ /* hm, empty header? */
+ add_assoc_stringl(array, key, "", 0, 1);
+ } else {
+ add_assoc_stringl(array, key, colon, value_len, 1);
+ }
+ efree(key);
+ }
colon = NULL;
+ value_len = 0;
header += line - header;
}
break;
}
/* }}} */
-/* {{{ HAVE_CURL */
-#ifdef HTTP_HAVE_CURL
-
-/* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
- HashTable *info, char **data, size_t *data_len TSRMLS_DC)
+/* {{{ void http_get_request_headers(zval *) */
+PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
{
- CURL *ch = curl_easy_init();
-
- if (!ch) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
- return FAILURE;
- }
-
- http_curl_initbuf(CURLBUF_EVRY);
- http_curl_setopts(ch, URL, options);
-
- 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;
- }
- if (info) {
- http_curl_getinfo(ch, info);
- }
- curl_easy_cleanup(ch);
-
- http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
- return SUCCESS;
-}
-/* }}} */
-
-/* {{{ STATUS http_head(char *, HashTable *, HashTable *, char **data, size_t *) */
-PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
- HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
- CURL *ch = curl_easy_init();
-
- if (!ch) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
- return FAILURE;
- }
-
- http_curl_initbuf(CURLBUF_HDRS);
- http_curl_setopts(ch, URL, options);
- curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
-
- 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;
- }
- if (info) {
- http_curl_getinfo(ch, info);
- }
- curl_easy_cleanup(ch);
-
- http_curl_movebuf(CURLBUF_HDRS, data, data_len);
-
- return SUCCESS;
+ char *key = NULL;
+ long idx = 0;
+
+ FOREACH_HASH_KEY(HTTP_SERVER_VARS, key, idx) {
+ if (key && !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);
+ }
+ }
}
/* }}} */
-/* {{{ 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, HashTable *info, char **data,
- size_t *data_len TSRMLS_DC)
+/* {{{ STATUS http_urlencode_hash_ex(HashTable *, int, char **, size_t *) */
+PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, int override_argsep,
+ char *pre_encoded_data, size_t pre_encoded_len,
+ char **encoded_data, size_t *encoded_len TSRMLS_DC)
{
- CURL *ch = curl_easy_init();
+ smart_str qstr = {0};
- if (!ch) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
- return FAILURE;
+ if (override_argsep) {
+ HTTP_URL_ARGSEP_OVERRIDE;
}
- http_curl_initbuf(CURLBUF_EVRY);
- http_curl_setopts(ch, URL, options);
- curl_easy_setopt(ch, CURLOPT_POST, 1);
- curl_easy_setopt(ch, CURLOPT_POSTFIELDS, postdata);
- 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;
- }
- if (info) {
- http_curl_getinfo(ch, info);
+ if (pre_encoded_len && pre_encoded_data) {
+ smart_str_appendl(&qstr, pre_encoded_data, pre_encoded_len);
}
- curl_easy_cleanup(ch);
-
- http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
- return SUCCESS;
-}
-/* }}} */
-/* {{{ 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, HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
- smart_str qstr = {0};
- STATUS status;
-
- if (php_url_encode_hash_ex(postarray, &qstr, NULL,0,NULL,0,NULL,0,NULL TSRMLS_CC) != SUCCESS) {
+ if (SUCCESS != php_url_encode_hash_ex(hash, &qstr, NULL, 0, NULL, 0, NULL, 0, NULL TSRMLS_CC)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't encode query data");
if (qstr.c) {
efree(qstr.c);
}
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not encode post data");
+ if (override_argsep) {
+ HTTP_URL_ARGSEP_RESTORE;
+ }
return FAILURE;
}
+
+ if (override_argsep) {
+ HTTP_URL_ARGSEP_RESTORE;
+ }
+
smart_str_0(&qstr);
- status = http_post_data(URL, qstr.c, qstr.len, options, info, data, data_len);
- if (qstr.c) {
- efree(qstr.c);
+ *encoded_data = qstr.c;
+ if (encoded_len) {
+ *encoded_len = qstr.len;
}
- return status;
+
+ return SUCCESS;
}
/* }}} */
-#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);
}
/* }}} */
}
/* }}} */
+#ifndef ZEND_ENGINE_2
+/* {{{ php_url_encode_hash
+ Author: Sara Golemon <pollita@php.net> */
+PHP_HTTP_API STATUS php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
+ 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 *arg_sep = NULL, *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) {
+ return FAILURE;
+ }
+
+ if (ht->nApplyCount > 0) {
+ /* Prevent recursion */
+ return SUCCESS;
+ }
+
+ arg_sep = INI_STR("arg_separator.output");
+ 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++;
+ php_url_encode_hash_ex(HASH_OF(*zdata), formstr, NULL, 0, newprefix, newprefix_len, "]", 1, (Z_TYPE_PP(zdata) == IS_OBJECT ? *zdata : NULL) TSRMLS_CC);
+ 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->len) {
+ smart_str_appendl(formstr, arg_sep, arg_sep_len);
+ }
+ /* Simple key=value */
+ smart_str_appendl(formstr, key_prefix, key_prefix_len);
+ if (key_type == HASH_KEY_IS_STRING) {
+ ekey = php_url_encode(key, key_len, &ekey_len);
+ smart_str_appendl(formstr, ekey, ekey_len);
+ efree(ekey);
+ } else {
+ /* Numeric key */
+ if (num_prefix) {
+ smart_str_appendl(formstr, num_prefix, num_prefix_len);
+ }
+ ekey_len = spprintf(&ekey, 12, "%ld", idx);
+ smart_str_appendl(formstr, ekey, ekey_len);
+ efree(ekey);
+ }
+ smart_str_appendl(formstr, key_suffix, key_suffix_len);
+ smart_str_appendl(formstr, "=", 1);
+ 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);
+ }
+ smart_str_appendl(formstr, ekey, ekey_len);
+ efree(ekey);
+ }
+ }
+
+ return SUCCESS;
+}
+/* }}} */
+#endif /* !ZEND_ENDGINE_2 */
+
/* }}} public API */
/*
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
+
projects / m6w6 / ext-http / blobdiff