From: Michael Wallner Date: Tue, 29 Sep 2015 07:03:45 +0000 (+0200) Subject: Merge branch 'R_2_5' X-Git-Tag: RELEASE_3_0_0_RC1~11 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=a5e66b221dbf5a52cc770f4d7f46f05fe88784ba;hp=e4896f4169a9589db7131ff4b7d9ed37e0e0ace8 Merge branch 'R_2_5' --- diff --git a/.gitignore b/.gitignore index fc8d761..328656c 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,37 @@ tests/*.sh lcov_data *~ *.phar +!travis/*.phar vendor/ +/php_http_api.h +/php_http_buffer.h +/php_http_client.h +/php_http_client_curl.h +/php_http_client_request.h +/php_http_client_response.h +/php_http_cookie.h +/php_http_curl.h +/php_http_encoding.h +/php_http_env.h +/php_http_env_request.h +/php_http_env_response.h +/php_http_etag.h +/php_http_exception.h +/php_http_filter.h +/php_http_header.h +/php_http_header_parser.h +/php_http_info.h +/php_http_message.h +/php_http_message_body.h +/php_http_message_parser.h +/php_http_misc.h +/php_http_negotiate.h +/php_http_object.h +/php_http_options.h +/php_http_params.h +/php_http_querystring.h +/php_http_response_codes.h +/php_http_url.h +/php_http_utf8.h +/php_http_version.h +/tests/helper/server.log diff --git a/.travis.yml b/.travis.yml index ddaa28c..d92482e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,35 +12,18 @@ addons: - libevent-dev env: - - PHP=5.4 enable_debug=no enable_maintainer_zts=no enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.5 enable_debug=no enable_maintainer_zts=no enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.6 enable_debug=no enable_maintainer_zts=no enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.4 enable_debug=yes enable_maintainer_zts=no enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.5 enable_debug=yes enable_maintainer_zts=no enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.6 enable_debug=yes enable_maintainer_zts=no enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.4 enable_debug=no enable_maintainer_zts=yes enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.5 enable_debug=no enable_maintainer_zts=yes enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.6 enable_debug=no enable_maintainer_zts=yes enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.4 enable_debug=yes enable_maintainer_zts=yes enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.5 enable_debug=yes enable_maintainer_zts=yes enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.6 enable_debug=yes enable_maintainer_zts=yes enable_json=no enable_hash=yes enable_iconv=yes - - PHP=5.4 enable_debug=no enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.5 enable_debug=no enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.6 enable_debug=no enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.4 enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.5 enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.6 enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.4 enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.5 enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.6 enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.4 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.5 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes - - PHP=5.6 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=master enable_debug=no enable_maintainer_zts=no enable_json=no enable_hash=yes enable_iconv=yes enable_phar=yes enable_posix=yes + - PHP=master enable_debug=yes enable_maintainer_zts=no enable_json=no enable_hash=yes enable_iconv=yes enable_phar=yes enable_posix=yes + - PHP=master enable_debug=no enable_maintainer_zts=yes enable_json=no enable_hash=yes enable_iconv=yes enable_phar=yes enable_posix=yes + - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=no enable_hash=yes enable_iconv=yes enable_phar=yes enable_posix=yes + - PHP=master enable_debug=no enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes enable_phar=yes enable_posix=yes + - PHP=master enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes enable_phar=yes enable_posix=yes + - PHP=master enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes enable_phar=yes enable_posix=yes + - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes enable_phar=yes enable_posix=yes before_script: - make -f travis/pecl/Makefile php - - make -f travis/pecl/Makefile pecl PECL=raphf - - make -f travis/pecl/Makefile pecl PECL=propro + - make -f travis/pecl/Makefile pharext/raphf-master pharext/propro-master script: - make -f travis/pecl/Makefile ext PECL=http @@ -50,10 +33,3 @@ after_script: - test -e tests/helper/server.log && cat tests/helper/server.log sudo: false -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/28d35158ac7e385bd14d - on_success: change - on_failure: always - on_start: never diff --git a/config9.m4 b/config9.m4 index da682f7..dfad780 100644 --- a/config9.m4 +++ b/config9.m4 @@ -628,4 +628,7 @@ dnl ---- PHP_ADD_MAKEFILE_FRAGMENT AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support]) + if $HTTP_HAVE_A_REQUEST_LIB; then + AC_DEFINE([PHP_HTTP_HAVE_CLIENT], [1], [Have HTTP client support]) + fi fi diff --git a/package.xml b/package.xml index 95578ea..de2235d 100644 --- a/package.xml +++ b/package.xml @@ -37,17 +37,16 @@ http://dev.iworks.at/ext-http/lcov/ext/http/ 2015-09-25 - 2.5.3 - 2.5.0 + 3.0.0dev + 3.0.0 - stable - stable + beta + beta BSD-2-Clause @@ -346,9 +345,7 @@ http://dev.iworks.at/ext-http/lcov/ext/http/ - 5.3.0 - 7.0.0 - 7.0.0 + 7.0.0-dev 1.4.1 @@ -356,17 +353,13 @@ http://dev.iworks.at/ext-http/lcov/ext/http/ raphf pecl.php.net - 1.1.0 - 2.0.0dev - 2.0.0dev + 2.0.0dev raphf propro pecl.php.net - 1.0.0 - 2.0.0dev - 2.0.0dev + 2.0.0dev propro diff --git a/php_http.h b/php_http.h index bc30d43..13afc0f 100644 --- a/php_http.h +++ b/php_http.h @@ -13,7 +13,7 @@ #ifndef PHP_EXT_HTTP_H #define PHP_EXT_HTTP_H -#define PHP_PECL_HTTP_VERSION "2.5.3" +#define PHP_PECL_HTTP_VERSION "3.0.0dev" extern zend_module_entry http_module_entry; #define phpext_http_ptr &http_module_entry diff --git a/scripts/gen_curlinfo.php b/scripts/gen_curlinfo.php index 076a10d..2e2100f 100755 --- a/scripts/gen_curlinfo.php +++ b/scripts/gen_curlinfo.php @@ -1,6 +1,5 @@ #!/usr/bin/env php ' if (CURLE_OK == curl_easy_getinfo(ch, %s, &c)) { - add_assoc_string_ex(&array, "%s", sizeof("%2$s"), c ? c : "", 1); + ZVAL_STRING(&tmp, STR_PTR(c)); + zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp); } ', 'DOUBLE' => ' if (CURLE_OK == curl_easy_getinfo(ch, %s, &d)) { - add_assoc_double_ex(&array, "%s", sizeof("%2$s"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp); } ', 'LONG' => ' if (CURLE_OK == curl_easy_getinfo(ch, %s, &l)) { - add_assoc_long_ex(&array, "%s", sizeof("%2$s"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp); } ', 'SLIST' => ' if (CURLE_OK == curl_easy_getinfo(ch, %s, &s)) { - MAKE_STD_ZVAL(subarray); - array_init(subarray); + array_init(&tmp); for (p = s; p; p = p->next) { if (p->data) { - add_next_index_string(subarray, p->data, 1); + add_next_index_string(&tmp, p->data); } } - add_assoc_zval_ex(&array, "%s", sizeof("%2$s"), subarray); + zend_hash_str_update(info, "%s", lenof("%2$s"), &tmp); curl_slist_free_all(s); } ', diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php index 771ee8f..e42ec31 100755 --- a/scripts/gen_travis_yml.php +++ b/scripts/gen_travis_yml.php @@ -17,12 +17,14 @@ env: $gen = include "./travis/pecl/gen-matrix.php"; $env = $gen([ - "PHP" => ["5.4", "5.5", "5.6"], + "PHP" => ["master"], "enable_debug", "enable_maintainer_zts", "enable_json", "enable_hash" => ["yes"], - "enable_iconv" => ["yes"] + "enable_iconv" => ["yes"], + "enable_phar" => ["yes"], + "enable_posix" => ["yes"] ]); foreach ($env as $e) { printf(" - %s\n", $e); @@ -32,8 +34,7 @@ foreach ($env as $e) { before_script: - make -f travis/pecl/Makefile php - - make -f travis/pecl/Makefile pecl PECL=raphf - - make -f travis/pecl/Makefile pecl PECL=propro + - make -f travis/pecl/Makefile pharext/raphf-master pharext/propro-master script: - make -f travis/pecl/Makefile ext PECL=http diff --git a/src/php_http.c b/src/php_http.c index 2ff20f1..f9bb4d0 100644 --- a/src/php_http.c +++ b/src/php_http.c @@ -106,23 +106,15 @@ static void php_http_globals_init_once(zend_php_http_globals *G) } #if 0 -static inline void php_http_globals_init(zend_php_http_globals *G TSRMLS_DC) +static inline void php_http_globals_init(zend_php_http_globals *G) { } -static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC) +static inline void php_http_globals_free(zend_php_http_globals *G) { } #endif -#if ZTS && PHP_DEBUG && !HAVE_GCOV -zend_php_http_globals *php_http_globals(void) -{ - TSRMLS_FETCH(); - return PHP_HTTP_G; -} -#endif - PHP_INI_BEGIN() STD_PHP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode, zend_php_http_globals, php_http_globals) PHP_INI_END() @@ -134,6 +126,7 @@ PHP_MINIT_FUNCTION(http) REGISTER_INI_ENTRIES(); if (0 + || SUCCESS != PHP_MINIT_CALL(http_object) || SUCCESS != PHP_MINIT_CALL(http_exception) || SUCCESS != PHP_MINIT_CALL(http_cookie) || SUCCESS != PHP_MINIT_CALL(http_encoding) diff --git a/src/php_http_api.h b/src/php_http_api.h index 08b6ba8..e8c175f 100644 --- a/src/php_http_api.h +++ b/src/php_http_api.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -106,15 +106,22 @@ ZEND_BEGIN_MODULE_GLOBALS(php_http) struct php_http_env_globals env; +#ifdef PHP_HTTP_HAVE_CLIENT + struct { +#ifdef PHP_HTTP_HAVE_CURL + struct php_http_client_curl_globals curl; +#endif + } client; +#endif ZEND_END_MODULE_GLOBALS(php_http) ZEND_EXTERN_MODULE_GLOBALS(php_http); #ifdef ZTS # include "TSRM/TSRM.h" -# define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)]) +# define PHP_HTTP_G ((zend_php_http_globals *) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)]) # undef TSRMLS_FETCH_FROM_CTX -# define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = ((ctx)?(ctx):ts_resource_ex(0, NULL)) +# define TSRMLS_FETCH_FROM_CTX(ctx) ERROR #else # define PHP_HTTP_G (&php_http_globals) #endif diff --git a/src/php_http_buffer.c b/src/php_http_buffer.c index e24a4e1..b84bcd0 100644 --- a/src/php_http_buffer.c +++ b/src/php_http_buffer.c @@ -13,7 +13,8 @@ #include #include "php_http_buffer.h" -PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_init_ex(php_http_buffer_t *buf, size_t chunk_size, int flags) +PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_init_ex( + php_http_buffer_t *buf, size_t chunk_size, unsigned flags) { if (!buf) { buf = pemalloc(sizeof(*buf), flags & PHP_HTTP_BUFFER_INIT_PERSISTENT); @@ -22,7 +23,8 @@ PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_init_ex(php_http_buffer_t if (buf) { buf->size = (chunk_size) ? chunk_size : PHP_HTTP_BUFFER_DEFAULT_SIZE; buf->pmem = (flags & PHP_HTTP_BUFFER_INIT_PERSISTENT) ? 1 : 0; - buf->data = (flags & PHP_HTTP_BUFFER_INIT_PREALLOC) ? pemalloc(buf->size, buf->pmem) : NULL; + buf->data = (flags & PHP_HTTP_BUFFER_INIT_PREALLOC) ? + pemalloc(buf->size, buf->pmem) : NULL; buf->free = (flags & PHP_HTTP_BUFFER_INIT_PREALLOC) ? buf->size : 0; buf->used = 0; } @@ -30,10 +32,11 @@ PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_init_ex(php_http_buffer_t return buf; } -PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_from_string_ex(php_http_buffer_t *buf, const char *string, size_t length) +PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_from_string_ex( + php_http_buffer_t *buf, const char *str, size_t len) { if ((buf = php_http_buffer_init(buf))) { - if (PHP_HTTP_BUFFER_NOMEM == php_http_buffer_append(buf, string, length)) { + if (PHP_HTTP_BUFFER_NOMEM == php_http_buffer_append(buf, str, len)) { pefree(buf, buf->pmem); buf = NULL; } @@ -41,7 +44,9 @@ PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_from_string_ex(php_http_b return buf; } -PHP_HTTP_BUFFER_API size_t php_http_buffer_resize_ex(php_http_buffer_t *buf, size_t len, size_t override_size, int allow_error) +PHP_HTTP_BUFFER_API size_t php_http_buffer_resize_ex( + php_http_buffer_t *buf, size_t len, size_t override_size, + zend_bool allow_error) { char *ptr = NULL; #if 0 @@ -55,7 +60,8 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_resize_ex(php_http_buffer_t *buf, siz } if (allow_error) { - ptr = perealloc_recoverable(buf->data, buf->used + buf->free + size, buf->pmem); + ptr = perealloc_recoverable(buf->data, + buf->used + buf->free + size, buf->pmem); } else { ptr = perealloc(buf->data, buf->used + buf->free + size, buf->pmem); } @@ -72,7 +78,8 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_resize_ex(php_http_buffer_t *buf, siz return 0; } -PHP_HTTP_BUFFER_API char *php_http_buffer_account(php_http_buffer_t *buf, size_t to_account) +PHP_HTTP_BUFFER_API char *php_http_buffer_account( + php_http_buffer_t *buf, size_t to_account) { assert(to_account <= buf->free); @@ -98,9 +105,12 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_shrink(php_http_buffer_t *buf) return buf->used; } -PHP_HTTP_BUFFER_API size_t php_http_buffer_append(php_http_buffer_t *buf, const char *append, size_t append_len) +PHP_HTTP_BUFFER_API size_t php_http_buffer_append(php_http_buffer_t *buf, + const char *append, size_t append_len) { - if (buf->free < append_len && PHP_HTTP_BUFFER_NOMEM == php_http_buffer_resize(buf, append_len)) { + if ( buf->free < append_len && + PHP_HTTP_BUFFER_NOMEM == php_http_buffer_resize(buf, append_len) + ) { return PHP_HTTP_BUFFER_NOMEM; } memcpy(buf->data + buf->used, append, append_len); @@ -109,7 +119,8 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_append(php_http_buffer_t *buf, const return append_len; } -PHP_HTTP_BUFFER_API size_t php_http_buffer_appendf(php_http_buffer_t *buf, const char *format, ...) +PHP_HTTP_BUFFER_API size_t php_http_buffer_appendf(php_http_buffer_t *buf, + const char *format, ...) { va_list argv; char *append; @@ -128,7 +139,8 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_appendf(php_http_buffer_t *buf, const return append_len; } -PHP_HTTP_BUFFER_API char *php_http_buffer_data(const php_http_buffer_t *buf, char **into, size_t *len) +PHP_HTTP_BUFFER_API char *php_http_buffer_data(const php_http_buffer_t *buf, + char **into, size_t *len) { char *copy = ecalloc(1, buf->used + 1); memcpy(copy, buf->data, buf->used); @@ -141,7 +153,8 @@ PHP_HTTP_BUFFER_API char *php_http_buffer_data(const php_http_buffer_t *buf, cha return copy; } -PHP_HTTP_BUFFER_API size_t php_http_buffer_cut(php_http_buffer_t *buf, size_t offset, size_t length) +PHP_HTTP_BUFFER_API size_t php_http_buffer_cut(php_http_buffer_t *buf, + size_t offset, size_t length) { if (offset > buf->used) { return 0; @@ -149,15 +162,19 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_cut(php_http_buffer_t *buf, size_t of if (offset + length > buf->used) { length = buf->used - offset; } - memmove(buf->data + offset, buf->data + offset + length, buf->used - length - offset); + memmove(buf->data + offset, buf->data + offset + length, + buf->used - length - offset); buf->used -= length; buf->free += length; return length; } -PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_fix(php_http_buffer_t *buf) +PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_fix( + php_http_buffer_t *buf) { - if (buf->free < 1 && PHP_HTTP_BUFFER_NOMEM == php_http_buffer_resize_ex(buf, 1, 1, 0)) { + if ( buf->free < 1 && + PHP_HTTP_BUFFER_NOMEM == php_http_buffer_resize_ex(buf, 1, 1, 0) + ) { return NULL; } buf->data[buf->used] = '\0'; @@ -189,14 +206,16 @@ PHP_HTTP_BUFFER_API void php_http_buffer_free(php_http_buffer_t **buf) } } -PHP_HTTP_BUFFER_API size_t php_http_buffer_chunk_buffer(php_http_buffer_t **s, const char *data, size_t data_len, char **chunk, size_t chunk_size) +PHP_HTTP_BUFFER_API size_t php_http_buffer_chunk_buffer(php_http_buffer_t **s, + const char *data, size_t data_len, char **chunk, size_t chunk_size) { php_http_buffer_t *storage; *chunk = NULL; if (!*s) { - *s = php_http_buffer_init_ex(NULL, chunk_size << 1, chunk_size ? PHP_HTTP_BUFFER_INIT_PREALLOC : 0); + *s = php_http_buffer_init_ex(NULL, chunk_size << 1, + chunk_size ? PHP_HTTP_BUFFER_INIT_PREALLOC : 0); } storage = *s; @@ -219,13 +238,15 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_chunk_buffer(php_http_buffer_t **s, c return 0; } -PHP_HTTP_BUFFER_API size_t php_http_buffer_chunked_output(php_http_buffer_t **s, const char *data, size_t data_len, size_t chunk_len, php_http_buffer_pass_func_t passout, void *opaque TSRMLS_DC) +PHP_HTTP_BUFFER_API size_t php_http_buffer_chunked_output(php_http_buffer_t **s, + const char *data, size_t data_len, size_t chunk_len, + php_http_buffer_pass_func_t passout, void *opaque) { char *chunk = NULL; size_t passed = 0, got = 0; while ((got = php_http_buffer_chunk_buffer(s, data, data_len, &chunk, chunk_len))) { - if (PHP_HTTP_BUFFER_PASS0 == passout(opaque, chunk, got TSRMLS_CC)) { + if (PHP_HTTP_BUFFER_PASS0 == passout(opaque, chunk, got)) { PTR_SET(chunk, NULL); return PHP_HTTP_BUFFER_PASS0; } @@ -243,15 +264,19 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_chunked_output(php_http_buffer_t **s, return passed; } -PHP_HTTP_BUFFER_API ssize_t php_http_buffer_passthru(php_http_buffer_t **s, size_t chunk_size, php_http_buffer_pass_func_t passin, void *passin_arg, php_http_buffer_pass_func_t passon, void *passon_arg TSRMLS_DC) +PHP_HTTP_BUFFER_API ssize_t php_http_buffer_passthru(php_http_buffer_t **s, size_t chunk_size, + php_http_buffer_pass_func_t passin, void *passin_arg, + php_http_buffer_pass_func_t passon, void *passon_arg) { - size_t passed_on = 0, passed_in = php_http_buffer_chunked_input(s, chunk_size, passin, passin_arg TSRMLS_CC); + size_t passed_on = 0, passed_in; + + passed_in = php_http_buffer_chunked_input(s, chunk_size, passin, passin_arg); if (passed_in == PHP_HTTP_BUFFER_PASS0) { return passed_in; } if (passed_in || (*s)->used) { - passed_on = passon(passon_arg, (*s)->data, (*s)->used TSRMLS_CC); + passed_on = passon(passon_arg, (*s)->data, (*s)->used); if (passed_on == PHP_HTTP_BUFFER_PASS0) { return passed_on; @@ -265,18 +290,20 @@ PHP_HTTP_BUFFER_API ssize_t php_http_buffer_passthru(php_http_buffer_t **s, size return passed_on - passed_in; } -PHP_HTTP_BUFFER_API size_t php_http_buffer_chunked_input(php_http_buffer_t **s, size_t chunk_size, php_http_buffer_pass_func_t passin, void *opaque TSRMLS_DC) +PHP_HTTP_BUFFER_API size_t php_http_buffer_chunked_input(php_http_buffer_t **s, + size_t chunk_size, php_http_buffer_pass_func_t passin, void *opaque) { php_http_buffer_t *str; size_t passed; if (!*s) { - *s = php_http_buffer_init_ex(NULL, chunk_size, chunk_size ? PHP_HTTP_BUFFER_INIT_PREALLOC : 0); + *s = php_http_buffer_init_ex(NULL, chunk_size, + chunk_size ? PHP_HTTP_BUFFER_INIT_PREALLOC : 0); } str = *s; php_http_buffer_resize(str, chunk_size); - passed = passin(opaque, str->data + str->used, chunk_size TSRMLS_CC); + passed = passin(opaque, str->data + str->used, chunk_size); if (passed != PHP_HTTP_BUFFER_PASS0) { str->used += passed; @@ -290,7 +317,8 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_chunked_input(php_http_buffer_t **s, #ifdef PHP_HTTP_BUFFER_EXTENDED -PHP_HTTP_BUFFER_API int php_http_buffer_cmp(php_http_buffer_t *left, php_http_buffer_t *right) +PHP_HTTP_BUFFER_API int php_http_buffer_cmp(php_http_buffer_t *left, + php_http_buffer_t *right) { if (left->used > right->used) { return -1; @@ -301,7 +329,8 @@ PHP_HTTP_BUFFER_API int php_http_buffer_cmp(php_http_buffer_t *left, php_http_bu } } -PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_copy(const php_http_buffer_t *from, php_http_buffer_t *to) +PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_copy( + const php_http_buffer_t *from, php_http_buffer_t *to) { int free_to = !to; @@ -317,7 +346,8 @@ PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_copy(const php_http_buffe return to; } -PHP_HTTP_BUFFER_API size_t php_http_buffer_insert(php_http_buffer_t *buf, const char *insert, size_t insert_len, size_t offset) +PHP_HTTP_BUFFER_API size_t php_http_buffer_insert(php_http_buffer_t *buf, + const char *insert, size_t insert_len, size_t offset) { if (PHP_HTTP_BUFFER_NOMEM == php_http_buffer_resize(buf, insert_len)) { return PHP_HTTP_BUFFER_NOMEM; @@ -329,7 +359,8 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_insert(php_http_buffer_t *buf, const return insert_len; } -PHP_HTTP_BUFFER_API size_t php_http_buffer_insertf(php_http_buffer_t *buf, size_t offset, const char *format, ...) +PHP_HTTP_BUFFER_API size_t php_http_buffer_insertf(php_http_buffer_t *buf, + size_t offset, const char *format, ...) { va_list argv; char *insert; @@ -348,7 +379,8 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_insertf(php_http_buffer_t *buf, size_ return insert_len; } -PHP_HTTP_BUFFER_API size_t php_http_buffer_prepend(php_http_buffer_t *buf, const char *prepend, size_t prepend_len) +PHP_HTTP_BUFFER_API size_t php_http_buffer_prepend(php_http_buffer_t *buf, + const char *prepend, size_t prepend_len) { if (PHP_HTTP_BUFFER_NOMEM == php_http_buffer_resize(buf, prepend_len)) { return PHP_HTTP_BUFFER_NOMEM; @@ -360,7 +392,8 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_prepend(php_http_buffer_t *buf, const return prepend_len; } -PHP_HTTP_BUFFER_API size_t php_http_buffer_prependf(php_http_buffer_t *buf, const char *format, ...) +PHP_HTTP_BUFFER_API size_t php_http_buffer_prependf(php_http_buffer_t *buf, + const char *format, ...) { va_list argv; char *prepend; @@ -379,13 +412,20 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_prependf(php_http_buffer_t *buf, cons return prepend_len; } -PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_sub(const php_http_buffer_t *buf, size_t offset, size_t length) +PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_sub( + const php_http_buffer_t *buf, size_t offset, size_t length) { if (offset >= buf->used) { return NULL; } else { - size_t need = 1 + ((length + offset) > buf->used ? (buf->used - offset) : (length - offset)); - php_http_buffer_t *sub = php_http_buffer_init_ex(NULL, need, PHP_HTTP_BUFFER_INIT_PREALLOC | (buf->pmem ? PHP_HTTP_BUFFER_INIT_PERSISTENT:0)); + php_http_buffer_t *sub; + size_t need = 1 + ((length + offset) > buf->used ? + (buf->used - offset) : (length - offset)); + unsigned flags = buf->pmem ? PHP_HTTP_BUFFER_INIT_PERSISTENT : 0; + + sub = php_http_buffer_init_ex(NULL, need, + PHP_HTTP_BUFFER_INIT_PREALLOC | flags); + if (sub) { if (PHP_HTTP_BUFFER_NOMEM == php_http_buffer_append(sub, buf->data + offset, need)) { php_http_buffer_free(&sub); @@ -397,7 +437,8 @@ PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_sub(const php_http_buffer } } -PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_right(const php_http_buffer_t *buf, size_t length) +PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_right( + const php_http_buffer_t *buf, size_t length) { if (length < buf->used) { return php_http_buffer_sub(buf, buf->used - length, length); @@ -407,7 +448,8 @@ PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_right(const php_http_buff } -PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_merge_va(php_http_buffer_t *buf, unsigned argc, va_list argv) +PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_merge_va( + php_http_buffer_t *buf, unsigned argc, va_list argv) { unsigned i = 0; buf = php_http_buffer_init(buf); @@ -424,7 +466,8 @@ PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_merge_va(php_http_buffer_ return buf; } -PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_merge_ex(php_http_buffer_t *buf, unsigned argc, ...) +PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_merge_ex( + php_http_buffer_t *buf, unsigned argc, ...) { va_list argv; php_http_buffer_t *ret; diff --git a/src/php_http_buffer.h b/src/php_http_buffer.h index faf8992..818c443 100644 --- a/src/php_http_buffer.h +++ b/src/php_http_buffer.h @@ -36,12 +36,6 @@ PTR = SET; \ } #endif -#ifndef TSRMLS_D -# define TSRMLS_D -# define TSRMLS_DC -# define TSRMLS_CC -# define TSRMLS_C -#endif #ifdef PHP_ATTRIBUTE_FORMAT # define PHP_HTTP_BUFFER_ATTRIBUTE_FORMAT(f, a, b) PHP_ATTRIBUTE_FORMAT(f, a, b) #else @@ -84,7 +78,7 @@ static inline void *estrndup(void *p, size_t s) case PHP_HTTP_BUFFER_FREE_NOT: \ break; \ case PHP_HTTP_BUFFER_FREE_PTR: \ - pefree(STR, STR->pmem); break; \ + pefree(STR, STR->pmem); \ break; \ case PHP_HTTP_BUFFER_FREE_VAL: \ php_http_buffer_dtor(STR); \ @@ -142,7 +136,7 @@ typedef enum php_http_buffer_free { #define php_http_buffer_new() php_http_buffer_init(NULL) #define php_http_buffer_init(b) php_http_buffer_init_ex(b, PHP_HTTP_BUFFER_DEFAULT_SIZE, 0) #define php_http_buffer_clone(from, to) php_http_buffer_init_ex((to), (from)->size, (from)->pmem ? PHP_HTTP_BUFFER_INIT_PERSISTENT:0) -PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_init_ex(php_http_buffer_t *buf, size_t chunk_size, int flags); +PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_init_ex(php_http_buffer_t *buf, size_t chunk_size, unsigned flags); /* create a php_http_buffer_t from a zval or c-string */ #define php_http_buffer_from_zval(z) php_http_buffer_from_string(Z_STRVAL(z), Z_STRLEN(z)) @@ -152,7 +146,7 @@ PHP_HTTP_BUFFER_API php_http_buffer_t *php_http_buffer_from_string_ex(php_http_b /* usually only called from within the internal functions */ #define php_http_buffer_resize(b, s) php_http_buffer_resize_ex((b), (s), 0, 0) -PHP_HTTP_BUFFER_API size_t php_http_buffer_resize_ex(php_http_buffer_t *buf, size_t len, size_t override_size, int allow_error); +PHP_HTTP_BUFFER_API size_t php_http_buffer_resize_ex(php_http_buffer_t *buf, size_t len, size_t override_size, zend_bool allow_error); PHP_HTTP_BUFFER_API char *php_http_buffer_account(php_http_buffer_t *buf, size_t to_account); @@ -162,6 +156,7 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_shrink(php_http_buffer_t *buf); /* append data to the php_http_buffer_t */ #define php_http_buffer_appends(b, a) php_http_buffer_append((b), (a), sizeof(a)-1) #define php_http_buffer_appendl(b, a) php_http_buffer_append((b), (a), strlen(a)) +#define php_http_buffer_appendz(b, z) php_http_buffer_append((b), (z)->val, (z)->len) PHP_HTTP_BUFFER_API size_t php_http_buffer_append(php_http_buffer_t *buf, const char *append, size_t append_len); PHP_HTTP_BUFFER_API size_t php_http_buffer_appendf(php_http_buffer_t *buf, const char *format, ...) PHP_HTTP_BUFFER_ATTRIBUTE_FORMAT(printf, 2, 3); @@ -186,15 +181,15 @@ PHP_HTTP_BUFFER_API void php_http_buffer_free(php_http_buffer_t **buf); /* stores data in a php_http_buffer_t until it reaches chunk_size */ PHP_HTTP_BUFFER_API size_t php_http_buffer_chunk_buffer(php_http_buffer_t **s, const char *data, size_t data_len, char **chunk, size_t chunk_size); -typedef size_t (*php_http_buffer_pass_func_t)(void *opaque, char *, size_t TSRMLS_DC); +typedef size_t (*php_http_buffer_pass_func_t)(void *opaque, char *, size_t); -PHP_HTTP_BUFFER_API ssize_t php_http_buffer_passthru(php_http_buffer_t **s, size_t chunk_size, php_http_buffer_pass_func_t passin, void *passin_arg, php_http_buffer_pass_func_t passon, void *passon_arg TSRMLS_DC); +PHP_HTTP_BUFFER_API ssize_t php_http_buffer_passthru(php_http_buffer_t **s, size_t chunk_size, php_http_buffer_pass_func_t passin, void *passin_arg, php_http_buffer_pass_func_t passon, void *passon_arg); /* wrapper around php_http_buffer_chunk_buffer, which passes available chunks to passthru() */ -PHP_HTTP_BUFFER_API size_t php_http_buffer_chunked_output(php_http_buffer_t **s, const char *data, size_t data_len, size_t chunk_size, php_http_buffer_pass_func_t passout, void *opaque TSRMLS_DC); +PHP_HTTP_BUFFER_API size_t php_http_buffer_chunked_output(php_http_buffer_t **s, const char *data, size_t data_len, size_t chunk_size, php_http_buffer_pass_func_t passout, void *opaque); /* write chunks directly into php_http_buffer_t buffer */ -PHP_HTTP_BUFFER_API size_t php_http_buffer_chunked_input(php_http_buffer_t **s, size_t chunk_size, php_http_buffer_pass_func_t passin, void *opaque TSRMLS_DC); +PHP_HTTP_BUFFER_API size_t php_http_buffer_chunked_input(php_http_buffer_t **s, size_t chunk_size, php_http_buffer_pass_func_t passin, void *opaque); # ifdef PHP_HTTP_BUFFER_EXTENDED diff --git a/src/php_http_client.c b/src/php_http_client.c index 160e8bb..5d78803 100644 --- a/src/php_http_client.c +++ b/src/php_http_client.c @@ -20,131 +20,135 @@ */ static HashTable php_http_client_drivers; +static void php_http_client_driver_hash_dtor(zval *pData) +{ + pefree(Z_PTR_P(pData), 1); +} + ZEND_RESULT_CODE php_http_client_driver_add(php_http_client_driver_t *driver) { - return zend_hash_add(&php_http_client_drivers, driver->name_str, driver->name_len + 1, (void *) driver, sizeof(php_http_client_driver_t), NULL); + return zend_hash_add_mem(&php_http_client_drivers, driver->driver_name, (void *) driver, sizeof(php_http_client_driver_t)) + ? SUCCESS : FAILURE; } -ZEND_RESULT_CODE php_http_client_driver_get(const char *name_str, size_t name_len, php_http_client_driver_t *driver) +php_http_client_driver_t *php_http_client_driver_get(zend_string *name) { + zval *ztmp; php_http_client_driver_t *tmp; - if ((name_str && SUCCESS == zend_hash_find(&php_http_client_drivers, name_str, name_len + 1, (void *) &tmp)) - || (SUCCESS == zend_hash_get_current_data(&php_http_client_drivers, (void *) &tmp))) { - *driver = *tmp; - return SUCCESS; + if (name && (tmp = zend_hash_find_ptr(&php_http_client_drivers, name))) { + return tmp; } - return FAILURE; + if ((ztmp = zend_hash_get_current_data(&php_http_client_drivers))) { + return Z_PTR_P(ztmp); + } + return NULL; } -static int apply_driver_list(void *p, void *arg TSRMLS_DC) +static int apply_driver_list(zval *p, void *arg) { - php_http_client_driver_t *d = p; - zval *zname; + php_http_client_driver_t *d = Z_PTR_P(p); + zval zname; - MAKE_STD_ZVAL(zname); - ZVAL_STRINGL(zname, d->name_str, d->name_len, 1); + ZVAL_STR_COPY(&zname, d->driver_name); - zend_hash_next_index_insert(arg, &zname, sizeof(zval *), NULL); + zend_hash_next_index_insert(arg, &zname); return ZEND_HASH_APPLY_KEEP; } -void php_http_client_driver_list(HashTable *ht TSRMLS_DC) +void php_http_client_driver_list(HashTable *ht) { - zend_hash_apply_with_argument(&php_http_client_drivers, apply_driver_list, ht TSRMLS_CC); + zend_hash_apply_with_argument(&php_http_client_drivers, apply_driver_list, ht); } -void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zval *opts, int overwrite TSRMLS_DC) +void php_http_client_options_set_subr(zval *instance, char *key, size_t len, zval *opts, int overwrite) { if (overwrite || (opts && zend_hash_num_elements(Z_ARRVAL_P(opts)))) { - zend_class_entry *this_ce = Z_OBJCE_P(getThis()); - zval *old_opts, *new_opts, **entry = NULL; + zend_class_entry *this_ce = Z_OBJCE_P(instance); + zval old_opts_tmp, *old_opts, new_opts, *entry = NULL; - MAKE_STD_ZVAL(new_opts); - array_init(new_opts); - old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); + array_init(&new_opts); + old_opts = zend_read_property(this_ce, instance, ZEND_STRL("options"), 0, &old_opts_tmp); if (Z_TYPE_P(old_opts) == IS_ARRAY) { - array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); + array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL(new_opts)); } if (overwrite) { if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) { Z_ADDREF_P(opts); - zend_symtable_update(Z_ARRVAL_P(new_opts), key, len, (void *) &opts, sizeof(zval *), NULL); + zend_symtable_str_update(Z_ARRVAL(new_opts), key, len, opts); } else { - zend_symtable_del(Z_ARRVAL_P(new_opts), key, len); + zend_symtable_str_del(Z_ARRVAL(new_opts), key, len); } } else if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) { - if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) { - array_join(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry), 0, 0); + if ((entry = zend_symtable_str_find(Z_ARRVAL(new_opts), key, len))) { + array_join(Z_ARRVAL_P(opts), Z_ARRVAL_P(entry), 0, 0); } else { Z_ADDREF_P(opts); - zend_symtable_update(Z_ARRVAL_P(new_opts), key, len, (void *) &opts, sizeof(zval *), NULL); + zend_symtable_str_update(Z_ARRVAL(new_opts), key, len, opts); } } - zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC); + zend_update_property(this_ce, instance, ZEND_STRL("options"), &new_opts); zval_ptr_dtor(&new_opts); } } -void php_http_client_options_set(zval *this_ptr, zval *opts TSRMLS_DC) +void php_http_client_options_set(zval *instance, zval *opts) { - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - HashPosition pos; - zval *new_opts; - zend_class_entry *this_ce = Z_OBJCE_P(getThis()); - zend_bool is_client = instanceof_function(this_ce, php_http_client_class_entry TSRMLS_CC); + php_http_arrkey_t key; + zval new_opts; + zend_class_entry *this_ce = Z_OBJCE_P(instance); + zend_bool is_client = instanceof_function(this_ce, php_http_client_class_entry); - MAKE_STD_ZVAL(new_opts); - array_init(new_opts); + array_init(&new_opts); if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) { - zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC); + zend_update_property(this_ce, instance, ZEND_STRL("options"), &new_opts); zval_ptr_dtor(&new_opts); } else { - zval *old_opts, *add_opts, **opt; + zval old_opts_tmp, *old_opts, add_opts, *opt; - MAKE_STD_ZVAL(add_opts); - array_init(add_opts); + array_init(&add_opts); /* some options need extra attention -- thus cannot use array_merge() directly */ - FOREACH_KEYVAL(pos, opts, key, opt) { - if (key.type == HASH_KEY_IS_STRING) { -#define KEYMATCH(k, s) ((sizeof(s)==k.len) && !strcasecmp(k.str, s)) - if (Z_TYPE_PP(opt) == IS_ARRAY && (KEYMATCH(key, "ssl") || KEYMATCH(key, "cookies"))) { - php_http_client_options_set_subr(getThis(), key.str, key.len, *opt, 0 TSRMLS_CC); - } else if (is_client && (KEYMATCH(key, "recordHistory") || KEYMATCH(key, "responseMessageClass"))) { - zend_update_property(this_ce, getThis(), key.str, key.len-1, *opt TSRMLS_CC); - } else if (Z_TYPE_PP(opt) == IS_NULL) { - old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(opts), key.h, key.key, opt) + { + if (key.key) { + if (Z_TYPE_P(opt) == IS_ARRAY && (zend_string_equals_literal(key.key, "ssl") || zend_string_equals_literal(key.key, "cookies"))) { + php_http_client_options_set_subr(instance, key.key->val, key.key->len, opt, 0); + } else if (is_client && (zend_string_equals_literal(key.key, "recordHistory") || zend_string_equals_literal(key.key, "responseMessageClass"))) { + zend_update_property(this_ce, instance, key.key->val, key.key->len, opt); + } else if (Z_TYPE_P(opt) == IS_NULL) { + old_opts = zend_read_property(this_ce, instance, ZEND_STRL("options"), 0, &old_opts_tmp); if (Z_TYPE_P(old_opts) == IS_ARRAY) { - zend_symtable_del(Z_ARRVAL_P(old_opts), key.str, key.len); + zend_symtable_del(Z_ARRVAL_P(old_opts), key.key); } } else { - Z_ADDREF_P(*opt); - add_assoc_zval_ex(add_opts, key.str, key.len, *opt); + Z_TRY_ADDREF_P(opt); + add_assoc_zval_ex(&add_opts, key.key->val, key.key->len, opt); } } } + ZEND_HASH_FOREACH_END(); - old_opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); + old_opts = zend_read_property(this_ce, instance, ZEND_STRL("options"), 0, &old_opts_tmp); if (Z_TYPE_P(old_opts) == IS_ARRAY) { - array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); + array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL(new_opts)); } - array_join(Z_ARRVAL_P(add_opts), Z_ARRVAL_P(new_opts), 0, 0); - zend_update_property(this_ce, getThis(), ZEND_STRL("options"), new_opts TSRMLS_CC); + array_join(Z_ARRVAL(add_opts), Z_ARRVAL(new_opts), 0, 0); + zend_update_property(this_ce, instance, ZEND_STRL("options"), &new_opts); zval_ptr_dtor(&new_opts); zval_ptr_dtor(&add_opts); } } -void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value TSRMLS_DC) +void php_http_client_options_get_subr(zval *instance, char *key, size_t len, zval *return_value) { - zend_class_entry *this_ce = Z_OBJCE_P(getThis()); - zval **options, *opts = zend_read_property(this_ce, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); + zend_class_entry *this_ce = Z_OBJCE_P(instance); + zval *options, opts_tmp, *opts = zend_read_property(this_ce, instance, ZEND_STRL("options"), 0, &opts_tmp); - if ((Z_TYPE_P(opts) == IS_ARRAY) && (SUCCESS == zend_symtable_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) { - RETVAL_ZVAL(*options, 1, 0); + if ((Z_TYPE_P(opts) == IS_ARRAY) && (options = zend_symtable_str_find(Z_ARRVAL_P(opts), key, len))) { + RETVAL_ZVAL(options, 1, 0); } } @@ -157,7 +161,7 @@ static void queue_dtor(void *enqueued) } } -php_http_client_t *php_http_client_init(php_http_client_t *h, php_http_client_ops_t *ops, php_resource_factory_t *rf, void *init_arg TSRMLS_DC) +php_http_client_t *php_http_client_init(php_http_client_t *h, php_http_client_ops_t *ops, php_resource_factory_t *rf, void *init_arg) { php_http_client_t *free_h = NULL; @@ -174,14 +178,11 @@ php_http_client_t *php_http_client_init(php_http_client_t *h, php_http_client_op } zend_llist_init(&h->requests, sizeof(php_http_client_enqueue_t), queue_dtor, 0); zend_llist_init(&h->responses, sizeof(void *), NULL, 0); - TSRMLS_SET_CTX(h->ts); if (h->ops->init) { if (!(h = h->ops->init(h, init_arg))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize client"); - if (free_h) { - efree(free_h); - } + php_error_docref(NULL, E_WARNING, "Could not initialize client"); + PTR_FREE(free_h); } } @@ -218,11 +219,9 @@ void php_http_client_free(php_http_client_t **h) { ZEND_RESULT_CODE php_http_client_enqueue(php_http_client_t *h, php_http_client_enqueue_t *enqueue) { - TSRMLS_FETCH_FROM_CTX(h->ts); - if (h->ops->enqueue) { if (php_http_client_enqueued(h, enqueue->request, NULL)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to enqueue request; request already in queue"); + php_error_docref(NULL, E_WARNING, "Failed to enqueue request; request already in queue"); return FAILURE; } return h->ops->enqueue(h, enqueue); @@ -233,13 +232,11 @@ ZEND_RESULT_CODE php_http_client_enqueue(php_http_client_t *h, php_http_client_e ZEND_RESULT_CODE php_http_client_dequeue(php_http_client_t *h, php_http_message_t *request) { - TSRMLS_FETCH_FROM_CTX(h->ts); - if (h->ops->dequeue) { php_http_client_enqueue_t *enqueue = php_http_client_enqueued(h, request, NULL); if (!enqueue) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to dequeue request; request not in queue"); + php_error_docref(NULL, E_WARNING, "Failed to dequeue request; request not in queue"); return FAILURE; } return h->ops->dequeue(h, enqueue); @@ -324,56 +321,51 @@ ZEND_RESULT_CODE php_http_client_getopt(php_http_client_t *h, php_http_client_ge zend_class_entry *php_http_client_class_entry; static zend_object_handlers php_http_client_object_handlers; -void php_http_client_object_free(void *object TSRMLS_DC) +void php_http_client_object_free(zend_object *object) { - php_http_client_object_t *o = (php_http_client_object_t *) object; + php_http_client_object_t *o = PHP_HTTP_OBJ(object, NULL); php_http_client_free(&o->client); php_http_object_method_dtor(&o->notify); php_http_object_method_free(&o->update); - zend_object_std_dtor((zend_object *) o TSRMLS_CC); - efree(o); + zend_object_std_dtor(object); } -zend_object_value php_http_client_object_new_ex(zend_class_entry *ce, php_http_client_t *client, php_http_client_object_t **ptr TSRMLS_DC) +php_http_client_object_t *php_http_client_object_new_ex(zend_class_entry *ce, php_http_client_t *client) { php_http_client_object_t *o; - o = ecalloc(1, sizeof(php_http_client_object_t)); - zend_object_std_init((zend_object *) o, ce TSRMLS_CC); - object_properties_init((zend_object *) o, ce); + o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); + zend_object_std_init(&o->zo, ce); + object_properties_init(&o->zo, ce); o->client = client; - if (ptr) { - *ptr = o; - } + o->zo.handlers = &php_http_client_object_handlers; - o->zv.handle = zend_objects_store_put(o, NULL, php_http_client_object_free, NULL TSRMLS_CC); - o->zv.handlers = &php_http_client_object_handlers; - - return o->zv; + return o; } -zend_object_value php_http_client_object_new(zend_class_entry *ce TSRMLS_DC) +zend_object *php_http_client_object_new(zend_class_entry *ce) { - return php_http_client_object_new_ex(ce, NULL, NULL TSRMLS_CC); + return &php_http_client_object_new_ex(ce, NULL)->zo; } -static void handle_history(zval *zclient, php_http_message_t *request, php_http_message_t *response TSRMLS_DC) +static void handle_history(zval *zclient, php_http_message_t *request, php_http_message_t *response) { - zval *new_hist, *old_hist = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), 0 TSRMLS_CC); - php_http_message_t *zipped = php_http_message_zip(response, request); - zend_object_value ov = php_http_message_object_new_ex(php_http_message_class_entry, zipped, NULL TSRMLS_CC); + zval new_hist, old_hist_tmp, *old_hist = zend_read_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), 0, &old_hist_tmp); + php_http_message_t *req_copy = php_http_message_copy(request, NULL); + php_http_message_t *res_copy = php_http_message_copy(response, NULL); + php_http_message_t *zipped = php_http_message_zip(res_copy, req_copy); + php_http_message_object_t *obj = php_http_message_object_new_ex(php_http_message_class_entry, zipped); - MAKE_STD_ZVAL(new_hist); - ZVAL_OBJVAL(new_hist, ov, 0); + ZVAL_OBJ(&new_hist, &obj->zo); if (Z_TYPE_P(old_hist) == IS_OBJECT) { - php_http_message_object_prepend(new_hist, old_hist, 1 TSRMLS_CC); + php_http_message_object_prepend(&new_hist, old_hist, 1); } - zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), new_hist TSRMLS_CC); + zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("history"), &new_hist); zval_ptr_dtor(&new_hist); } @@ -383,61 +375,55 @@ static ZEND_RESULT_CODE handle_response(void *arg, php_http_client_t *client, ph zval zclient; php_http_message_t *msg; php_http_client_progress_state_t *progress; - TSRMLS_FETCH_FROM_CTX(client->ts); - INIT_PZVAL(&zclient); - ZVAL_OBJVAL(&zclient, ((php_http_client_object_t*) arg)->zv, 0); + ZVAL_OBJ(&zclient, &((php_http_client_object_t*) arg)->zo); if ((msg = *response)) { php_http_message_object_t *msg_obj; - zval *info, *zresponse, *zrequest; + zval info, zresponse, zrequest, rec_hist_tmp; HashTable *info_ht; /* ensure the message is of type response (could be uninitialized in case of early error, like DNS) */ php_http_message_set_type(msg, PHP_HTTP_RESPONSE); - if (z_is_true(zend_read_property(php_http_client_class_entry, &zclient, ZEND_STRL("recordHistory"), 0 TSRMLS_CC))) { - handle_history(&zclient, e->request, *response TSRMLS_CC); + if (zend_is_true(zend_read_property(php_http_client_class_entry, &zclient, ZEND_STRL("recordHistory"), 0, &rec_hist_tmp))) { + handle_history(&zclient, e->request, *response); } /* hard detach, redirects etc. are in the history */ php_http_message_free(&msg->parent); *response = NULL; - MAKE_STD_ZVAL(zresponse); - ZVAL_OBJVAL(zresponse, php_http_message_object_new_ex(php_http_client_response_class_entry, msg, &msg_obj TSRMLS_CC), 0); - - MAKE_STD_ZVAL(zrequest); - ZVAL_OBJVAL(zrequest, ((php_http_message_object_t *) e->opaque)->zv, 1); + msg_obj = php_http_message_object_new_ex(php_http_client_response_class_entry, msg); + ZVAL_OBJ(&zresponse, &msg_obj->zo); + ZVAL_OBJECT(&zrequest, &((php_http_message_object_t *) e->opaque)->zo, 1); - php_http_message_object_prepend(zresponse, zrequest, 1 TSRMLS_CC); + php_http_message_object_prepend(&zresponse, &zrequest, 1); - MAKE_STD_ZVAL(info); - object_init(info); - info_ht = HASH_OF(info); + object_init(&info); + info_ht = HASH_OF(&info); php_http_client_getopt(client, PHP_HTTP_CLIENT_OPT_TRANSFER_INFO, e->request, &info_ht); - zend_update_property(php_http_client_response_class_entry, zresponse, ZEND_STRL("transferInfo"), info TSRMLS_CC); + zend_update_property(php_http_client_response_class_entry, &zresponse, ZEND_STRL("transferInfo"), &info); zval_ptr_dtor(&info); - zend_objects_store_add_ref_by_handle(msg_obj->zv.handle TSRMLS_CC); + Z_ADDREF(zresponse); zend_llist_add_element(&client->responses, &msg_obj); if (e->closure.fci.size) { - zval *retval = NULL; + zval retval; zend_error_handling zeh; - zend_fcall_info_argn(&e->closure.fci TSRMLS_CC, 1, &zresponse); - zend_replace_error_handling(EH_NORMAL, NULL, &zeh TSRMLS_CC); - zend_fcall_info_call(&e->closure.fci, &e->closure.fcc, &retval, NULL TSRMLS_CC); - zend_restore_error_handling(&zeh TSRMLS_CC); - zend_fcall_info_argn(&e->closure.fci TSRMLS_CC, 0); + ZVAL_UNDEF(&retval); + zend_fcall_info_argn(&e->closure.fci, 1, &zresponse); + zend_replace_error_handling(EH_NORMAL, NULL, &zeh); + zend_fcall_info_call(&e->closure.fci, &e->closure.fcc, &retval, NULL); + zend_restore_error_handling(&zeh); + zend_fcall_info_argn(&e->closure.fci, 0); - if (retval) { - if (Z_TYPE_P(retval) == IS_BOOL) { - dequeue = Z_BVAL_P(retval); - } - zval_ptr_dtor(&retval); + if (Z_TYPE(retval) == IS_TRUE) { + dequeue = 1; } + zval_ptr_dtor(&retval); } zval_ptr_dtor(&zresponse); @@ -459,44 +445,35 @@ static ZEND_RESULT_CODE handle_response(void *arg, php_http_client_t *client, ph static void handle_progress(void *arg, php_http_client_t *client, php_http_client_enqueue_t *e, php_http_client_progress_state_t *progress) { - zval *zrequest, *zprogress, *zclient, **args[2]; + zval zclient, args[2]; php_http_client_object_t *client_obj = arg; zend_error_handling zeh; - TSRMLS_FETCH_FROM_CTX(client->ts); - - MAKE_STD_ZVAL(zclient); - ZVAL_OBJVAL(zclient, client_obj->zv, 1); - - MAKE_STD_ZVAL(zrequest); - ZVAL_OBJVAL(zrequest, ((php_http_message_object_t *) e->opaque)->zv, 1); - args[0] = &zrequest; - - MAKE_STD_ZVAL(zprogress); - object_init(zprogress); - add_property_bool(zprogress, "started", progress->started); - add_property_bool(zprogress, "finished", progress->finished); - add_property_string(zprogress, "info", STR_PTR(progress->info), 1); - add_property_double(zprogress, "dltotal", progress->dl.total); - add_property_double(zprogress, "dlnow", progress->dl.now); - add_property_double(zprogress, "ultotal", progress->ul.total); - add_property_double(zprogress, "ulnow", progress->ul.now); - args[1] = &zprogress; - - zend_replace_error_handling(EH_NORMAL, NULL, &zeh TSRMLS_CC); - php_http_object_method_call(&client_obj->notify, zclient, NULL, 2, args TSRMLS_CC); - zend_restore_error_handling(&zeh TSRMLS_CC); + + ZVAL_OBJECT(&zclient, &client_obj->zo, 1); + ZVAL_OBJECT(&args[0], &((php_http_message_object_t *) e->opaque)->zo, 1); + object_init(&args[1]); + add_property_bool(&args[1], "started", progress->started); + add_property_bool(&args[1], "finished", progress->finished); + add_property_string(&args[1], "info", STR_PTR(progress->info)); + add_property_double(&args[1], "dltotal", progress->dl.total); + add_property_double(&args[1], "dlnow", progress->dl.now); + add_property_double(&args[1], "ultotal", progress->ul.total); + add_property_double(&args[1], "ulnow", progress->ul.now); + + zend_replace_error_handling(EH_NORMAL, NULL, &zeh); + php_http_object_method_call(&client_obj->notify, &zclient, NULL, 2, args); + zend_restore_error_handling(&zeh); zval_ptr_dtor(&zclient); - zval_ptr_dtor(&zrequest); - zval_ptr_dtor(&zprogress); + zval_ptr_dtor(&args[0]); + zval_ptr_dtor(&args[1]); } static void response_dtor(void *data) { php_http_message_object_t *msg_obj = *(php_http_message_object_t **) data; - TSRMLS_FETCH_FROM_CTX(msg_obj->message->ts); - zend_objects_store_del_ref_by_handle_ex(msg_obj->zv.handle, msg_obj->zv.handlers TSRMLS_CC); + zend_objects_store_del(&msg_obj->zo); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_construct, 0, 0, 0) @@ -505,45 +482,40 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_construct, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, __construct) { - char *driver_str = NULL, *persistent_handle_str = NULL; - int driver_len = 0, persistent_handle_len = 0; - php_http_client_driver_t driver; + zend_string *driver_name = NULL, *persistent_handle_name = NULL; + php_http_client_driver_t *driver; php_resource_factory_t *rf = NULL; php_http_client_object_t *obj; - zval *os; + zval os; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ss", &driver_str, &driver_len, &persistent_handle_str, &persistent_handle_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|S!S!", &driver_name, &persistent_handle_name), invalid_arg, return); - if (SUCCESS != php_http_client_driver_get(driver_str, driver_len, &driver)) { - php_http_throw(unexpected_val, "Failed to locate \"%s\" client request handler", driver_str); + if (!zend_hash_num_elements(&php_http_client_drivers)) { + php_http_throw(unexpected_val, "No http\\Client drivers available", NULL); + return; + } + if (!(driver = php_http_client_driver_get(driver_name))) { + php_http_throw(unexpected_val, "Failed to locate \"%s\" client request handler", driver_name ? driver_name->val : "default"); return; } - MAKE_STD_ZVAL(os); - object_init_ex(os, spl_ce_SplObjectStorage); - zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), os TSRMLS_CC); + object_init_ex(&os, spl_ce_SplObjectStorage); + zend_update_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), &os); zval_ptr_dtor(&os); - if (persistent_handle_len) { - char *name_str; - size_t name_len; + if (persistent_handle_name) { php_persistent_handle_factory_t *pf; - name_len = spprintf(&name_str, 0, "http\\Client\\%s", driver.name_str); - php_http_pretty_key(name_str + sizeof("http\\Client"), driver.name_len, 1, 1); - - if ((pf = php_persistent_handle_concede(NULL , name_str, name_len, persistent_handle_str, persistent_handle_len, NULL, NULL TSRMLS_CC))) { + if ((pf = php_persistent_handle_concede(NULL, driver->client_name, persistent_handle_name, NULL, NULL))) { rf = php_persistent_handle_resource_factory_init(NULL, pf); } - - efree(name_str); } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); - php_http_expect(obj->client = php_http_client_init(NULL, driver.client_ops, rf, NULL TSRMLS_CC), runtime, return); + php_http_expect(obj->client = php_http_client_init(NULL, driver->client_ops, rf, NULL), runtime, return); - php_http_object_method_init(&obj->notify, getThis(), ZEND_STRL("notify") TSRMLS_CC); + php_http_object_method_init(&obj->notify, getThis(), ZEND_STRL("notify")); obj->client->callback.response.func = handle_response; obj->client->callback.response.arg = obj; @@ -560,7 +532,7 @@ static PHP_METHOD(HttpClient, reset) php_http_client_object_t *obj; php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); obj->iterator = 0; php_http_client_reset(obj->client); @@ -568,18 +540,19 @@ static PHP_METHOD(HttpClient, reset) RETVAL_ZVAL(getThis(), 1, 0); } -static HashTable *combined_options(zval *client, zval *request TSRMLS_DC) +static HashTable *combined_options(zval *client, zval *request) { HashTable *options; - int num_options = 0; - zval *z_roptions = NULL, *z_coptions = zend_read_property(php_http_client_class_entry, client, ZEND_STRL("options"), 0 TSRMLS_CC); + unsigned num_options = 0; + zval z_roptions, z_options_tmp, *z_coptions = zend_read_property(php_http_client_class_entry, client, ZEND_STRL("options"), 0, &z_options_tmp); if (Z_TYPE_P(z_coptions) == IS_ARRAY) { num_options = zend_hash_num_elements(Z_ARRVAL_P(z_coptions)); } - zend_call_method_with_0_params(&request, NULL, NULL, "getOptions", &z_roptions); - if (z_roptions && Z_TYPE_P(z_roptions) == IS_ARRAY) { - int num = zend_hash_num_elements(Z_ARRVAL_P(z_roptions)); + ZVAL_UNDEF(&z_roptions); + zend_call_method_with_0_params(request, NULL, NULL, "getOptions", &z_roptions); + if (Z_TYPE(z_roptions) == IS_ARRAY) { + unsigned num = zend_hash_num_elements(Z_ARRVAL(z_roptions)); if (num > num_options) { num_options = num; } @@ -589,28 +562,26 @@ static HashTable *combined_options(zval *client, zval *request TSRMLS_DC) if (Z_TYPE_P(z_coptions) == IS_ARRAY) { array_copy(Z_ARRVAL_P(z_coptions), options); } - if (z_roptions) { - if (Z_TYPE_P(z_roptions) == IS_ARRAY) { - array_join(Z_ARRVAL_P(z_roptions), options, 0, 0); - } - zval_ptr_dtor(&z_roptions); + if (Z_TYPE(z_roptions) == IS_ARRAY) { + array_join(Z_ARRVAL(z_roptions), options, 0, 0); } + zval_ptr_dtor(&z_roptions); + return options; } static void msg_queue_dtor(php_http_client_enqueue_t *e) { php_http_message_object_t *msg_obj = e->opaque; - TSRMLS_FETCH_FROM_CTX(msg_obj->message->ts); - zend_objects_store_del_ref_by_handle_ex(msg_obj->zv.handle, msg_obj->zv.handlers TSRMLS_CC); + zend_objects_store_del(&msg_obj->zo); zend_hash_destroy(e->options); FREE_HASHTABLE(e->options); if (e->closure.fci.size) { zval_ptr_dtor(&e->closure.fci.function_name); - if (e->closure.fci.object_ptr) { - zval_ptr_dtor(&e->closure.fci.object_ptr); + if (e->closure.fci.object) { + zend_objects_store_del(e->closure.fci.object); } } } @@ -628,10 +599,10 @@ static PHP_METHOD(HttpClient, enqueue) php_http_message_object_t *msg_obj; php_http_client_enqueue_t q; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|f", &request, php_http_client_request_class_entry, &fci, &fcc), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O|f", &request, php_http_client_request_class_entry, &fci, &fcc), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - msg_obj = zend_object_store_get_object(request TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); + msg_obj = PHP_HTTP_OBJ(NULL, request); if (php_http_client_enqueued(obj->client, msg_obj->message, NULL)) { php_http_throw(bad_method_call, "Failed to enqueue request; request already in queue", NULL); @@ -639,20 +610,20 @@ static PHP_METHOD(HttpClient, enqueue) } q.request = msg_obj->message; - q.options = combined_options(getThis(), request TSRMLS_CC); + q.options = combined_options(getThis(), request); q.dtor = msg_queue_dtor; q.opaque = msg_obj; q.closure.fci = fci; q.closure.fcc = fcc; if (fci.size) { - Z_ADDREF_P(fci.function_name); - if (fci.object_ptr) { - Z_ADDREF_P(fci.object_ptr); + Z_TRY_ADDREF(fci.function_name); + if (fci.object) { + ++GC_REFCOUNT(fci.object); } } - zend_objects_store_add_ref_by_handle(msg_obj->zv.handle TSRMLS_CC); + Z_ADDREF_P(request); php_http_expect(SUCCESS == php_http_client_enqueue(obj->client, &q), runtime, msg_queue_dtor(&q); @@ -671,10 +642,10 @@ static PHP_METHOD(HttpClient, dequeue) php_http_client_object_t *obj; php_http_message_object_t *msg_obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, php_http_client_request_class_entry), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &request, php_http_client_request_class_entry), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - msg_obj = zend_object_store_get_object(request TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); + msg_obj = PHP_HTTP_OBJ(NULL, request); if (!php_http_client_enqueued(obj->client, msg_obj->message, NULL)) { php_http_throw(bad_method_call, "Failed to dequeue request; request not in queue", NULL); @@ -699,30 +670,30 @@ static PHP_METHOD(HttpClient, requeue) php_http_message_object_t *msg_obj; php_http_client_enqueue_t q; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|f", &request, php_http_client_request_class_entry, &fci, &fcc), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O|f", &request, php_http_client_request_class_entry, &fci, &fcc), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - msg_obj = zend_object_store_get_object(request TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); + msg_obj = PHP_HTTP_OBJ(NULL, request); if (php_http_client_enqueued(obj->client, msg_obj->message, NULL)) { php_http_expect(SUCCESS == php_http_client_dequeue(obj->client, msg_obj->message), runtime, return); } q.request = msg_obj->message; - q.options = combined_options(getThis(), request TSRMLS_CC); + q.options = combined_options(getThis(), request); q.dtor = msg_queue_dtor; q.opaque = msg_obj; q.closure.fci = fci; q.closure.fcc = fcc; if (fci.size) { - Z_ADDREF_P(fci.function_name); - if (fci.object_ptr) { - Z_ADDREF_P(fci.object_ptr); + Z_TRY_ADDREF(fci.function_name); + if (fci.object) { + ++GC_REFCOUNT(fci.object); } } - zend_objects_store_add_ref_by_handle(msg_obj->zv.handle TSRMLS_CC); + Z_ADDREF_P(request); php_http_expect(SUCCESS == php_http_client_enqueue(obj->client, &q), runtime, msg_queue_dtor(&q); @@ -736,10 +707,10 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_count, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, count) { - long count_mode = -1; + zend_long count_mode = -1; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &count_mode)) { - php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &count_mode)) { + php_http_client_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); RETVAL_LONG(zend_llist_count(&obj->client->requests)); } @@ -753,20 +724,20 @@ static PHP_METHOD(HttpClient, getResponse) zval *zrequest = NULL; php_http_client_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O", &zrequest, php_http_client_request_class_entry), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|O", &zrequest, php_http_client_request_class_entry), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); if (zrequest) { /* lookup the response with the request */ zend_llist_element *el = NULL; - php_http_message_object_t *req_obj = zend_object_store_get_object(zrequest TSRMLS_CC); + php_http_message_object_t *req_obj = PHP_HTTP_OBJ(NULL, zrequest); for (el = obj->client->responses.head; el; el = el->next) { php_http_message_object_t *response_obj = *(php_http_message_object_t **) el->data; if (response_obj->message->parent == req_obj->message) { - RETURN_OBJVAL(response_obj->zv, 1); + RETURN_OBJECT(&response_obj->zo, 1); } } @@ -781,7 +752,7 @@ static PHP_METHOD(HttpClient, getResponse) /* pop off and go */ if (response_obj) { - RETVAL_OBJVAL(response_obj->zv, 1); + RETVAL_OBJECT(&response_obj->zo, 1); zend_llist_remove_tail(&obj->client->responses); } } @@ -791,11 +762,11 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getHistory, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, getHistory) { - zval *zhistory; + zval zhistory_tmp, *zhistory; php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - zhistory = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("history"), 0 TSRMLS_CC); + zhistory = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("history"), 0, &zhistory_tmp); RETVAL_ZVAL(zhistory, 1, 0); } @@ -807,7 +778,7 @@ static PHP_METHOD(HttpClient, send) php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); php_http_expect(SUCCESS == php_http_client_exec(obj->client), runtime, return); @@ -819,7 +790,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, once) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_client_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); RETURN_BOOL(0 < php_http_client_once(obj->client)); } @@ -832,9 +803,9 @@ static PHP_METHOD(HttpClient, wait) { double timeout = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|d", &timeout)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|d", &timeout)) { struct timeval timeout_val; - php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_client_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); timeout_val.tv_sec = (time_t) timeout; timeout_val.tv_usec = PHP_HTTP_USEC(timeout) % PHP_HTTP_MCROSEC; @@ -851,8 +822,8 @@ static PHP_METHOD(HttpClient, configure) HashTable *settings = NULL; php_http_client_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H!", &settings), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|H!", &settings), invalid_arg, return); + obj = PHP_HTTP_OBJ(NULL, getThis()); php_http_expect(SUCCESS == php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_CONFIGURATION, settings), unexpected_val, return); @@ -867,9 +838,9 @@ static PHP_METHOD(HttpClient, enablePipelining) zend_bool enable = 1; php_http_client_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &enable), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); php_http_expect(SUCCESS == php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_ENABLE_PIPELINING, &enable), unexpected_val, return); @@ -884,9 +855,9 @@ static PHP_METHOD(HttpClient, enableEvents) zend_bool enable = 1; php_http_client_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &enable), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); php_http_expect(SUCCESS == php_http_client_setopt(obj->client, PHP_HTTP_CLIENT_OPT_USE_EVENTS, &enable), unexpected_val, return); @@ -895,20 +866,21 @@ static PHP_METHOD(HttpClient, enableEvents) struct notify_arg { php_http_object_method_t *cb; - zval **args[3]; + zval args[3]; int argc; }; -static int notify(zend_object_iterator *iter, void *puser TSRMLS_DC) +static int notify(zend_object_iterator *iter, void *puser) { - zval **observer = NULL; + zval *observer; struct notify_arg *arg = puser; - iter->funcs->get_current_data(iter, &observer TSRMLS_CC); - if (observer) { - return php_http_object_method_call(arg->cb, *observer, NULL, arg->argc, arg->args TSRMLS_CC); + if ((observer = iter->funcs->get_current_data(iter))) { + if (SUCCESS == php_http_object_method_call(arg->cb, observer, NULL, arg->argc, arg->args)) { + return ZEND_HASH_APPLY_KEEP; + } } - return FAILURE; + return ZEND_HASH_APPLY_STOP; } ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_notify, 0, 0, 0) @@ -916,14 +888,14 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_notify, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, notify) { - zval *request = NULL, *zprogress = NULL, *observers; + zval *request = NULL, *zprogress = NULL, observers_tmp, *observers; php_http_client_object_t *client_obj; struct notify_arg arg = {NULL}; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O!o!", &request, php_http_client_request_class_entry, &zprogress), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|O!o!", &request, php_http_client_request_class_entry, &zprogress), invalid_arg, return); - client_obj = zend_object_store_get_object(getThis() TSRMLS_CC); - observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC); + client_obj = PHP_HTTP_OBJ(NULL, getThis()); + observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp); if (Z_TYPE_P(observers) != IS_OBJECT) { php_http_throw(unexpected_val, "Observer storage is corrupted", NULL); @@ -932,31 +904,26 @@ static PHP_METHOD(HttpClient, notify) if (client_obj->update) { arg.cb = client_obj->update; - - Z_ADDREF_P(getThis()); - arg.args[0] = &getThis(); + ZVAL_COPY(&arg.args[0], getThis()); arg.argc = 1; if (request) { - Z_ADDREF_P(request); - arg.args[1] = &request; + ZVAL_COPY(&arg.args[1], request); arg.argc += 1; } - if (zprogress) { - Z_ADDREF_P(zprogress); - arg.args[2] = &zprogress; + ZVAL_COPY(&arg.args[2], zprogress); arg.argc += 1; } - spl_iterator_apply(observers, notify, &arg TSRMLS_CC); + spl_iterator_apply(observers, notify, &arg); - zval_ptr_dtor(&getThis()); + zval_ptr_dtor(getThis()); if (request) { - zval_ptr_dtor(&request); + zval_ptr_dtor(request); } if (zprogress) { - zval_ptr_dtor(&zprogress); + zval_ptr_dtor(zprogress); } } @@ -968,13 +935,13 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_attach, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, attach) { - zval *observers, *observer, *retval = NULL; + zval observers_tmp, *observers, *observer, retval; php_http_client_object_t *client_obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &observer, spl_ce_SplObserver), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &observer, spl_ce_SplObserver), invalid_arg, return); - client_obj = zend_object_store_get_object(getThis() TSRMLS_CC); - observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC); + client_obj = PHP_HTTP_OBJ(NULL, getThis()); + observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp); if (Z_TYPE_P(observers) != IS_OBJECT) { php_http_throw(unexpected_val, "Observer storage is corrupted", NULL); @@ -982,13 +949,12 @@ static PHP_METHOD(HttpClient, attach) } if (!client_obj->update) { - client_obj->update = php_http_object_method_init(NULL, observer, ZEND_STRL("update") TSRMLS_CC); + client_obj->update = php_http_object_method_init(NULL, observer, ZEND_STRL("update")); } - zend_call_method_with_1_params(&observers, NULL, NULL, "attach", &retval, observer); - if (retval) { - zval_ptr_dtor(&retval); - } + ZVAL_UNDEF(&retval); + zend_call_method_with_1_params(observers, NULL, NULL, "attach", &retval, observer); + zval_ptr_dtor(&retval); RETVAL_ZVAL(getThis(), 1, 0); } @@ -998,21 +964,20 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_detach, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, detach) { - zval *observers, *observer, *retval = NULL; + zval observers_tmp, *observers, *observer, retval; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &observer, spl_ce_SplObserver), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &observer, spl_ce_SplObserver), invalid_arg, return); - observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC); + observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp); if (Z_TYPE_P(observers) != IS_OBJECT) { php_http_throw(unexpected_val, "Observer storage is corrupted", NULL); return; } - zend_call_method_with_1_params(&observers, NULL, NULL, "detach", &retval, observer); - if (retval) { - zval_ptr_dtor(&retval); - } + ZVAL_UNDEF(&retval); + zend_call_method_with_1_params(observers, NULL, NULL, "detach", &retval, observer); + zval_ptr_dtor(&retval); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1021,11 +986,11 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getObservers, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, getObservers) { - zval *observers; + zval observers_tmp, *observers; php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0 TSRMLS_CC); + observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp); if (Z_TYPE_P(observers) != IS_OBJECT) { php_http_throw(unexpected_val, "Observer storage is corrupted", NULL); @@ -1045,17 +1010,17 @@ static PHP_METHOD(HttpClient, getProgressInfo) php_http_message_object_t *req_obj; php_http_client_progress_state_t *progress; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, php_http_client_request_class_entry), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &request, php_http_client_request_class_entry), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - req_obj = zend_object_store_get_object(request TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); + req_obj = PHP_HTTP_OBJ(NULL, request); php_http_expect(SUCCESS == php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, req_obj->message, &progress), unexpected_val, return); object_init(return_value); add_property_bool(return_value, "started", progress->started); add_property_bool(return_value, "finished", progress->finished); - add_property_string(return_value, "info", STR_PTR(progress->info), 1); + add_property_string(return_value, "info", STR_PTR(progress->info)); add_property_double(return_value, "dltotal", progress->dl.total); add_property_double(return_value, "dlnow", progress->dl.now); add_property_double(return_value, "ultotal", progress->ul.total); @@ -1072,10 +1037,10 @@ static PHP_METHOD(HttpClient, getTransferInfo) php_http_client_object_t *obj; php_http_message_object_t *req_obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, php_http_client_request_class_entry), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &request, php_http_client_request_class_entry), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - req_obj = zend_object_store_get_object(request TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); + req_obj = PHP_HTTP_OBJ(NULL, request); object_init(return_value); info = HASH_OF(return_value); @@ -1089,9 +1054,9 @@ static PHP_METHOD(HttpClient, setOptions) { zval *opts = NULL; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|a!/", &opts), invalid_arg, return); - php_http_client_options_set(getThis(), opts TSRMLS_CC); + php_http_client_options_set(getThis(), opts); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1101,7 +1066,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, getOptions) { if (SUCCESS == zend_parse_parameters_none()) { - zval *options = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); + zval options_tmp, *options = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("options"), 0, &options_tmp); RETVAL_ZVAL(options, 1, 0); } } @@ -1113,9 +1078,9 @@ static PHP_METHOD(HttpClient, setSslOptions) { zval *opts = NULL; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|a!/", &opts), invalid_arg, return); - php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 1 TSRMLS_CC); + php_http_client_options_set_subr(getThis(), ZEND_STRL("ssl"), opts, 1); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1127,9 +1092,9 @@ static PHP_METHOD(HttpClient, addSslOptions) { zval *opts = NULL; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|a!/", &opts), invalid_arg, return); - php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 0 TSRMLS_CC); + php_http_client_options_set_subr(getThis(), ZEND_STRL("ssl"), opts, 0); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1139,7 +1104,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, getSslOptions) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_client_options_get_subr(getThis(), ZEND_STRS("ssl"), return_value TSRMLS_CC); + php_http_client_options_get_subr(getThis(), ZEND_STRL("ssl"), return_value); } } @@ -1150,9 +1115,9 @@ static PHP_METHOD(HttpClient, setCookies) { zval *opts = NULL; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|a!/", &opts), invalid_arg, return); - php_http_client_options_set_subr(getThis(), ZEND_STRS("cookies"), opts, 1 TSRMLS_CC); + php_http_client_options_set_subr(getThis(), ZEND_STRL("cookies"), opts, 1); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1164,9 +1129,9 @@ static PHP_METHOD(HttpClient, addCookies) { zval *opts = NULL; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|a!/", &opts), invalid_arg, return); - php_http_client_options_set_subr(getThis(), ZEND_STRS("cookies"), opts, 0 TSRMLS_CC); + php_http_client_options_set_subr(getThis(), ZEND_STRL("cookies"), opts, 0); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1176,16 +1141,17 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, getCookies) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_client_options_get_subr(getThis(), ZEND_STRS("cookies"), return_value TSRMLS_CC); + php_http_client_options_get_subr(getThis(), ZEND_STRL("cookies"), return_value); } } ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getAvailableDrivers, 0, 0, 0) ZEND_END_ARG_INFO(); -static PHP_METHOD(HttpClient, getAvailableDrivers) { +static PHP_METHOD(HttpClient, getAvailableDrivers) +{ if (SUCCESS == zend_parse_parameters_none()) { array_init(return_value); - php_http_client_driver_list(Z_ARRVAL_P(return_value) TSRMLS_CC); + php_http_client_driver_list(Z_ARRVAL_P(return_value)); } } @@ -1194,7 +1160,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, getAvailableOptions) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_client_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); array_init(return_value); php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_AVAILABLE_OPTIONS, NULL, &Z_ARRVAL_P(return_value)); @@ -1206,7 +1172,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClient, getAvailableConfiguration) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_client_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); array_init(return_value); php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_AVAILABLE_CONFIGURATION, NULL, &Z_ARRVAL_P(return_value)); @@ -1253,17 +1219,19 @@ PHP_MINIT_FUNCTION(http_client) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http", "Client", php_http_client_methods); - php_http_client_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); + php_http_client_class_entry = zend_register_internal_class_ex(&ce, NULL); php_http_client_class_entry->create_object = php_http_client_object_new; - zend_class_implements(php_http_client_class_entry TSRMLS_CC, 2, spl_ce_SplSubject, spl_ce_Countable); + zend_class_implements(php_http_client_class_entry, 2, spl_ce_SplSubject, spl_ce_Countable); memcpy(&php_http_client_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_http_client_object_handlers.offset = XtOffsetOf(php_http_client_object_t, zo); + php_http_client_object_handlers.free_obj = php_http_client_object_free; php_http_client_object_handlers.clone_obj = NULL; - zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("observers"), ZEND_ACC_PRIVATE TSRMLS_CC); - zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("history"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_bool(php_http_client_class_entry, ZEND_STRL("recordHistory"), 0, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("observers"), ZEND_ACC_PRIVATE); + zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_client_class_entry, ZEND_STRL("history"), ZEND_ACC_PROTECTED); + zend_declare_property_bool(php_http_client_class_entry, ZEND_STRL("recordHistory"), 0, ZEND_ACC_PUBLIC); - zend_hash_init(&php_http_client_drivers, 2, NULL, NULL, 1); + zend_hash_init(&php_http_client_drivers, 2, NULL, php_http_client_driver_hash_dtor, 1); return SUCCESS; } diff --git a/src/php_http_client.h b/src/php_http_client.h index f4a5b59..792581a 100644 --- a/src/php_http_client.h +++ b/src/php_http_client.h @@ -65,13 +65,14 @@ typedef struct php_http_client_ops { } php_http_client_ops_t; typedef struct php_http_client_driver { - const char *name_str; - size_t name_len; + zend_string *driver_name; + zend_string *client_name; + zend_string *request_name; php_http_client_ops_t *client_ops; } php_http_client_driver_t; PHP_HTTP_API ZEND_RESULT_CODE php_http_client_driver_add(php_http_client_driver_t *driver); -PHP_HTTP_API ZEND_RESULT_CODE php_http_client_driver_get(const char *name_str, size_t name_len, php_http_client_driver_t *driver); +PHP_HTTP_API php_http_client_driver_t *php_http_client_driver_get(zend_string *name); typedef struct php_http_client_progress_state { struct { @@ -108,24 +109,19 @@ typedef struct php_http_client { zend_llist requests; zend_llist responses; - -#ifdef ZTS - void ***ts; -#endif } php_http_client_t; PHP_HTTP_API zend_class_entry *php_http_client_class_entry; typedef struct php_http_client_object { - zend_object zo; - zend_object_value zv; php_http_client_t *client; - long iterator; php_http_object_method_t *update; php_http_object_method_t notify; + long iterator; + zend_object zo; } php_http_client_object_t; -PHP_HTTP_API php_http_client_t *php_http_client_init(php_http_client_t *h, php_http_client_ops_t *ops, php_resource_factory_t *rf, void *init_arg TSRMLS_DC); +PHP_HTTP_API php_http_client_t *php_http_client_init(php_http_client_t *h, php_http_client_ops_t *ops, php_resource_factory_t *rf, void *init_arg); PHP_HTTP_API php_http_client_t *php_http_client_copy(php_http_client_t *from, php_http_client_t *to); PHP_HTTP_API void php_http_client_dtor(php_http_client_t *h); PHP_HTTP_API void php_http_client_free(php_http_client_t **h); diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c index fed92fc..e79ef15 100644 --- a/src/php_http_client_curl.c +++ b/src/php_http_client_curl.c @@ -76,15 +76,15 @@ typedef struct php_http_client_curl_handler { php_http_buffer_t cookies; php_http_buffer_t ranges; - long redirects; - unsigned range_request:1; - unsigned encode_cookies:1; - struct { uint count; double delay; } retry; + long redirects; + unsigned range_request:1; + unsigned encode_cookies:1; + } options; } php_http_client_curl_handler_t; @@ -110,7 +110,7 @@ static inline php_http_curle_storage_t *php_http_curle_get_storage(CURL *ch) { return st; } -static void *php_http_curle_ctor(void *opaque, void *init_arg TSRMLS_DC) +static void *php_http_curle_ctor(void *opaque, void *init_arg) { void *ch; @@ -121,7 +121,7 @@ static void *php_http_curle_ctor(void *opaque, void *init_arg TSRMLS_DC) return NULL; } -static void *php_http_curle_copy(void *opaque, void *handle TSRMLS_DC) +static void *php_http_curle_copy(void *opaque, void *handle) { void *ch; @@ -133,7 +133,7 @@ static void *php_http_curle_copy(void *opaque, void *handle TSRMLS_DC) return NULL; } -static void php_http_curle_dtor(void *opaque, void *handle TSRMLS_DC) +static void php_http_curle_dtor(void *opaque, void *handle) { php_http_curle_storage_t *st = php_http_curle_get_storage(handle); @@ -156,12 +156,12 @@ static php_resource_factory_ops_t php_http_curle_resource_factory_ops = { php_http_curle_dtor }; -static void *php_http_curlm_ctor(void *opaque, void *init_arg TSRMLS_DC) +static void *php_http_curlm_ctor(void *opaque, void *init_arg) { return curl_multi_init(); } -static void php_http_curlm_dtor(void *opaque, void *handle TSRMLS_DC) +static void php_http_curlm_dtor(void *opaque, void *handle) { curl_multi_cleanup(handle); } @@ -178,11 +178,10 @@ static size_t php_http_curle_read_callback(void *data, size_t len, size_t n, voi { php_http_message_body_t *body = ctx; - if (body && body->stream_id) { + if (body && body->res) { php_stream *s = php_http_message_body_stream(body); if (s) { - TSRMLS_FETCH_FROM_CTX(body->ts); return php_stream_read(s, data, len * n); } else abort(); } @@ -221,7 +220,6 @@ static int php_http_curle_progress_callback(void *ctx, double dltotal, double dl static int php_http_curle_seek_callback(void *userdata, curl_off_t offset, int origin) { php_http_message_body_t *body = userdata; - TSRMLS_FETCH_FROM_CTX(body->ts); if (!body) { return 1; @@ -316,131 +314,161 @@ static int php_http_curle_body_callback(char *data, size_t n, size_t l, void *ar static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info) { - char *c; - long l; - double d; - struct curl_slist *s, *p; - zval *subarray, array; - INIT_PZVAL_ARRAY(&array, info); + char *c = NULL; + long l = 0; + double d = 0; + struct curl_slist *s = NULL, *p = NULL; + zval tmp = {{0}}; /* BEGIN::CURLINFO */ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_EFFECTIVE_URL, &c)) { - add_assoc_string_ex(&array, "effective_url", sizeof("effective_url"), c ? c : "", 1); + ZVAL_STRING(&tmp, STR_PTR(c)); + zend_hash_str_update(info, "effective_url", lenof("effective_url"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_RESPONSE_CODE, &l)) { - add_assoc_long_ex(&array, "response_code", sizeof("response_code"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "response_code", lenof("response_code"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_TOTAL_TIME, &d)) { - add_assoc_double_ex(&array, "total_time", sizeof("total_time"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "total_time", lenof("total_time"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_NAMELOOKUP_TIME, &d)) { - add_assoc_double_ex(&array, "namelookup_time", sizeof("namelookup_time"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "namelookup_time", lenof("namelookup_time"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CONNECT_TIME, &d)) { - add_assoc_double_ex(&array, "connect_time", sizeof("connect_time"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "connect_time", lenof("connect_time"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PRETRANSFER_TIME, &d)) { - add_assoc_double_ex(&array, "pretransfer_time", sizeof("pretransfer_time"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "pretransfer_time", lenof("pretransfer_time"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SIZE_UPLOAD, &d)) { - add_assoc_double_ex(&array, "size_upload", sizeof("size_upload"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "size_upload", lenof("size_upload"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SIZE_DOWNLOAD, &d)) { - add_assoc_double_ex(&array, "size_download", sizeof("size_download"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "size_download", lenof("size_download"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SPEED_DOWNLOAD, &d)) { - add_assoc_double_ex(&array, "speed_download", sizeof("speed_download"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "speed_download", lenof("speed_download"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SPEED_UPLOAD, &d)) { - add_assoc_double_ex(&array, "speed_upload", sizeof("speed_upload"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "speed_upload", lenof("speed_upload"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_HEADER_SIZE, &l)) { - add_assoc_long_ex(&array, "header_size", sizeof("header_size"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "header_size", lenof("header_size"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_REQUEST_SIZE, &l)) { - add_assoc_long_ex(&array, "request_size", sizeof("request_size"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "request_size", lenof("request_size"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SSL_VERIFYRESULT, &l)) { - add_assoc_long_ex(&array, "ssl_verifyresult", sizeof("ssl_verifyresult"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "ssl_verifyresult", lenof("ssl_verifyresult"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_FILETIME, &l)) { - add_assoc_long_ex(&array, "filetime", sizeof("filetime"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "filetime", lenof("filetime"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d)) { - add_assoc_double_ex(&array, "content_length_download", sizeof("content_length_download"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "content_length_download", lenof("content_length_download"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CONTENT_LENGTH_UPLOAD, &d)) { - add_assoc_double_ex(&array, "content_length_upload", sizeof("content_length_upload"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "content_length_upload", lenof("content_length_upload"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_STARTTRANSFER_TIME, &d)) { - add_assoc_double_ex(&array, "starttransfer_time", sizeof("starttransfer_time"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "starttransfer_time", lenof("starttransfer_time"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CONTENT_TYPE, &c)) { - add_assoc_string_ex(&array, "content_type", sizeof("content_type"), c ? c : "", 1); + ZVAL_STRING(&tmp, STR_PTR(c)); + zend_hash_str_update(info, "content_type", lenof("content_type"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_REDIRECT_TIME, &d)) { - add_assoc_double_ex(&array, "redirect_time", sizeof("redirect_time"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "redirect_time", lenof("redirect_time"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_REDIRECT_COUNT, &l)) { - add_assoc_long_ex(&array, "redirect_count", sizeof("redirect_count"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "redirect_count", lenof("redirect_count"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_HTTP_CONNECTCODE, &l)) { - add_assoc_long_ex(&array, "connect_code", sizeof("connect_code"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "connect_code", lenof("connect_code"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_HTTPAUTH_AVAIL, &l)) { - add_assoc_long_ex(&array, "httpauth_avail", sizeof("httpauth_avail"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "httpauth_avail", lenof("httpauth_avail"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PROXYAUTH_AVAIL, &l)) { - add_assoc_long_ex(&array, "proxyauth_avail", sizeof("proxyauth_avail"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "proxyauth_avail", lenof("proxyauth_avail"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_OS_ERRNO, &l)) { - add_assoc_long_ex(&array, "os_errno", sizeof("os_errno"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "os_errno", lenof("os_errno"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_NUM_CONNECTS, &l)) { - add_assoc_long_ex(&array, "num_connects", sizeof("num_connects"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "num_connects", lenof("num_connects"), &tmp); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SSL_ENGINES, &s)) { - MAKE_STD_ZVAL(subarray); - array_init(subarray); + array_init(&tmp); for (p = s; p; p = p->next) { if (p->data) { - add_next_index_string(subarray, p->data, 1); + add_next_index_string(&tmp, p->data); } } - add_assoc_zval_ex(&array, "ssl_engines", sizeof("ssl_engines"), subarray); + zend_hash_str_update(info, "ssl_engines", lenof("ssl_engines"), &tmp); curl_slist_free_all(s); } if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_REDIRECT_URL, &c)) { - add_assoc_string_ex(&array, "redirect_url", sizeof("redirect_url"), c ? c : "", 1); + ZVAL_STRING(&tmp, STR_PTR(c)); + zend_hash_str_update(info, "redirect_url", lenof("redirect_url"), &tmp); } #if PHP_HTTP_CURL_VERSION(7,19,0) if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PRIMARY_IP, &c)) { - add_assoc_string_ex(&array, "primary_ip", sizeof("primary_ip"), c ? c : "", 1); + ZVAL_STRING(&tmp, STR_PTR(c)); + zend_hash_str_update(info, "primary_ip", lenof("primary_ip"), &tmp); } #endif #if PHP_HTTP_CURL_VERSION(7,19,0) if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_APPCONNECT_TIME, &d)) { - add_assoc_double_ex(&array, "appconnect_time", sizeof("appconnect_time"), d); + ZVAL_DOUBLE(&tmp, d); + zend_hash_str_update(info, "appconnect_time", lenof("appconnect_time"), &tmp); } #endif #if PHP_HTTP_CURL_VERSION(7,19,4) if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CONDITION_UNMET, &l)) { - add_assoc_long_ex(&array, "condition_unmet", sizeof("condition_unmet"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "condition_unmet", lenof("condition_unmet"), &tmp); } #endif #if PHP_HTTP_CURL_VERSION(7,21,0) if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PRIMARY_PORT, &l)) { - add_assoc_long_ex(&array, "primary_port", sizeof("primary_port"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "primary_port", lenof("primary_port"), &tmp); } #endif #if PHP_HTTP_CURL_VERSION(7,21,0) if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_LOCAL_IP, &c)) { - add_assoc_string_ex(&array, "local_ip", sizeof("local_ip"), c ? c : "", 1); + ZVAL_STRING(&tmp, STR_PTR(c)); + zend_hash_str_update(info, "local_ip", lenof("local_ip"), &tmp); } #endif #if PHP_HTTP_CURL_VERSION(7,21,0) if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_LOCAL_PORT, &l)) { - add_assoc_long_ex(&array, "local_port", sizeof("local_port"), l); + ZVAL_LONG(&tmp, l); + zend_hash_str_update(info, "local_port", lenof("local_port"), &tmp); } #endif @@ -448,16 +476,14 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info) #if PHP_HTTP_CURL_VERSION(7,34,0) { - zval *ti_array; + zval ti_array, subarray; struct curl_tlssessioninfo *ti; if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_TLS_SESSION, &ti)) { - const char *backend; + char *backend; - MAKE_STD_ZVAL(subarray); - ZVAL_NULL(subarray); - MAKE_STD_ZVAL(ti_array); - array_init(ti_array); + ZVAL_NULL(&subarray); + array_init(&ti_array); switch (ti->backend) { case CURLSSLBACKEND_NONE: @@ -469,13 +495,13 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info) { SSL_CTX *ctx = ti->internals; - array_init(subarray); - add_assoc_long_ex(subarray, ZEND_STRS("number"), SSL_CTX_sess_number(ctx)); - add_assoc_long_ex(subarray, ZEND_STRS("connect"), SSL_CTX_sess_connect(ctx)); - add_assoc_long_ex(subarray, ZEND_STRS("connect_good"), SSL_CTX_sess_connect_good(ctx)); - add_assoc_long_ex(subarray, ZEND_STRS("connect_renegotiate"), SSL_CTX_sess_connect_renegotiate(ctx)); - add_assoc_long_ex(subarray, ZEND_STRS("hits"), SSL_CTX_sess_hits(ctx)); - add_assoc_long_ex(subarray, ZEND_STRS("cache_full"), SSL_CTX_sess_cache_full(ctx)); + array_init(&subarray); + add_assoc_long_ex(&subarray, ZEND_STRL("number"), SSL_CTX_sess_number(ctx)); + add_assoc_long_ex(&subarray, ZEND_STRL("connect"), SSL_CTX_sess_connect(ctx)); + add_assoc_long_ex(&subarray, ZEND_STRL("connect_good"), SSL_CTX_sess_connect_good(ctx)); + add_assoc_long_ex(&subarray, ZEND_STRL("connect_renegotiate"), SSL_CTX_sess_connect_renegotiate(ctx)); + add_assoc_long_ex(&subarray, ZEND_STRL("hits"), SSL_CTX_sess_hits(ctx)); + add_assoc_long_ex(&subarray, ZEND_STRL("cache_full"), SSL_CTX_sess_cache_full(ctx)); } #endif break; @@ -486,12 +512,12 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info) gnutls_session_t sess = ti->internals; char *desc; - array_init(subarray); + array_init(&subarray); if ((desc = gnutls_session_get_desc(sess))) { - add_assoc_string_ex(subarray, ZEND_STRS("desc"), desc, 1); + add_assoc_string_ex(&subarray, ZEND_STRL("desc"), desc); gnutls_free(desc); } - add_assoc_bool_ex(subarray, ZEND_STRS("resumed"), gnutls_session_is_resumed(sess)); + add_assoc_bool_ex(&subarray, ZEND_STRL("resumed"), gnutls_session_is_resumed(sess)); } #endif break; @@ -522,9 +548,9 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info) default: backend = "unknown"; } - add_assoc_string_ex(ti_array, ZEND_STRS("backend"), estrdup(backend), 0); - add_assoc_zval_ex(ti_array, ZEND_STRS("internals"), subarray); - add_assoc_zval_ex(&array, "tls_session", sizeof("tls_session"), ti_array); + add_assoc_string_ex(&ti_array, ZEND_STRL("backend"), backend); + add_assoc_zval_ex(&ti_array, ZEND_STRL("internals"), &subarray); + zend_hash_str_update(info, "tls_session", lenof("tls_session"), &ti_array); } } #endif @@ -532,41 +558,41 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info) #if (PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)) || (PHP_HTTP_CURL_VERSION(7,34,0) && defined(PHP_HTTP_HAVE_NSS)) || (PHP_HTTP_CURL_VERSION(7,42,0) && defined(PHP_HTTP_HAVE_GNUTLS)) || (PHP_HTTP_CURL_VERSION(7,39,0) && defined(PHP_HTTP_HAVE_GSKIT)) { int i; - zval *ci_array; + zval ci_array, subarray; struct curl_certinfo *ci; char *colon, *keyname; if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CERTINFO, &ci)) { - MAKE_STD_ZVAL(ci_array); - array_init(ci_array); + array_init(&ci_array); for (i = 0; i < ci->num_of_certs; ++i) { s = ci->certinfo[i]; - MAKE_STD_ZVAL(subarray); - array_init(subarray); + array_init(&subarray); for (p = s; p; p = p->next) { if (p->data) { if ((colon = strchr(p->data, ':'))) { keyname = estrndup(p->data, colon - p->data); - add_assoc_string_ex(subarray, keyname, colon - p->data + 1, colon + 1, 1); + add_assoc_string_ex(&subarray, keyname, colon - p->data, colon + 1); efree(keyname); } else { - add_next_index_string(subarray, p->data, 1); + add_next_index_string(&subarray, p->data); } } } - add_next_index_zval(ci_array, subarray); + add_next_index_zval(&ci_array, &subarray); } - add_assoc_zval_ex(&array, "certinfo", sizeof("certinfo"), ci_array); + zend_hash_str_update(info, "certinfo", lenof("certinfo"), &ci_array); } } #endif { php_http_curle_storage_t *st = php_http_curle_get_storage(ch); - add_assoc_long_ex(&array, "curlcode", sizeof("curlcode"), st->errorcode); - add_assoc_string_ex(&array, "error", sizeof("error"), st->errorbuffer, 1); + ZVAL_LONG(&tmp, st->errorcode); + zend_hash_str_update(info, "curlcode", lenof("curlcode"), &tmp); + ZVAL_STRING(&tmp, st->errorbuffer); + zend_hash_str_update(info, "error", lenof("error"), &tmp); } return SUCCESS; @@ -577,14 +603,14 @@ static int compare_queue(php_http_client_enqueue_t *e, void *handle) return handle == ((php_http_client_curl_handler_t *) e->opaque)->handle; } -static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_handler_t *h TSRMLS_DC) +static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_handler_t *h) { php_http_message_t *response; php_http_header_parser_t parser; zval *zh; - response = php_http_message_init(NULL, 0, h->response.body TSRMLS_CC); - php_http_header_parser_init(&parser TSRMLS_CC); + response = php_http_message_init(NULL, 0, h->response.body); + php_http_header_parser_init(&parser); while (h->response.headers.used) { php_http_header_parser_state_t st = php_http_header_parser_parse(&parser, &h->response.headers, PHP_HTTP_HEADER_PARSER_CLEANUP, &response->hdrs, @@ -609,20 +635,24 @@ static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_ha php_http_message_body_addref(h->response.body); /* let's update the response headers */ - if ((zh = php_http_message_header(response, ZEND_STRL("Content-Length"), 1))) { - zend_hash_update(&response->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), &zh, sizeof(zval *), NULL); + if ((zh = php_http_message_header(response, ZEND_STRL("Content-Length")))) { + Z_TRY_ADDREF_P(zh); + zend_hash_str_update(&response->hdrs, "X-Original-Content-Length", lenof("X-Original-Content-Length"), zh); } - if ((zh = php_http_message_header(response, ZEND_STRL("Transfer-Encoding"), 0))) { - zend_hash_update(&response->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &zh, sizeof(zval *), NULL); - zend_hash_del(&response->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding")); + if ((zh = php_http_message_header(response, ZEND_STRL("Transfer-Encoding")))) { + Z_TRY_ADDREF_P(zh); + zend_hash_str_update(&response->hdrs, "X-Original-Transfer-Encoding", lenof("X-Original-Transfer-Encoding"), zh); + zend_hash_str_del(&response->hdrs, "Transfer-Encoding", lenof("Transfer-Encoding")); } - if ((zh = php_http_message_header(response, ZEND_STRL("Content-Range"), 0))) { - zend_hash_update(&response->hdrs, "X-Original-Content-Range", sizeof("X-Original-Content-Range"), &zh, sizeof(zval *), NULL); - zend_hash_del(&response->hdrs, "Content-Range", sizeof("Content-Range")); + if ((zh = php_http_message_header(response, ZEND_STRL("Content-Range")))) { + Z_TRY_ADDREF_P(zh); + zend_hash_str_update(&response->hdrs, "X-Original-Content-Range", lenof("X-Original-Content-Range"), zh); + zend_hash_str_del(&response->hdrs, "Content-Range", lenof("Content-Range")); } - if ((zh = php_http_message_header(response, ZEND_STRL("Content-Encoding"), 0))) { - zend_hash_update(&response->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), &zh, sizeof(zval *), NULL); - zend_hash_del(&response->hdrs, "Content-Encoding", sizeof("Content-Encoding")); + if ((zh = php_http_message_header(response, ZEND_STRL("Content-Encoding")))) { + Z_TRY_ADDREF_P(zh); + zend_hash_str_update(&response->hdrs, "X-Original-Content-Encoding", lenof("X-Original-Content-Encoding"), zh); + zend_hash_str_del(&response->hdrs, "Content-Encoding", lenof("Content-Encoding")); } php_http_message_update_headers(response); @@ -635,7 +665,6 @@ static void php_http_curlm_responsehandler(php_http_client_t *context) php_http_curle_storage_t *st, *err = NULL; php_http_client_enqueue_t *enqueue; php_http_client_curl_t *curl = context->ctx; - TSRMLS_FETCH_FROM_CTX(context->ts); do { CURLMsg *msg = curl_multi_info_read(curl->handle, &remaining); @@ -658,7 +687,7 @@ static void php_http_curlm_responsehandler(php_http_client_t *context) if ((enqueue = php_http_client_enqueued(context, msg->easy_handle, compare_queue))) { php_http_client_curl_handler_t *handler = enqueue->opaque; - php_http_message_t *response = php_http_curlm_responseparser(handler TSRMLS_CC); + php_http_message_t *response = php_http_curlm_responseparser(handler); if (response) { context->callback.response.func(context->callback.response.arg, context, &handler->queue, &response); @@ -672,7 +701,7 @@ static void php_http_curlm_responsehandler(php_http_client_t *context) int i = 0; do { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s; %s (%s)", curl_easy_strerror(err[i].errorcode), err[i].errorbuffer, STR_PTR(err[i].url)); + php_error_docref(NULL, E_WARNING, "%s; %s (%s)", curl_easy_strerror(err[i].errorcode), err[i].errorbuffer, STR_PTR(err[i].url)); if (err[i].url) { efree(err[i].url); } @@ -715,7 +744,6 @@ static void php_http_curlm_timeout_callback(int socket, short action, void *even #endif if (curl->useevents) { CURLMcode rc; - TSRMLS_FETCH_FROM_CTX(context->ts); /* ignore and use -1,0 on timeout */ (void) socket; @@ -724,7 +752,7 @@ static void php_http_curlm_timeout_callback(int socket, short action, void *even while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket_action(curl->handle, CURL_SOCKET_TIMEOUT, 0, &curl->unfinished))); if (CURLM_OK != rc) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", curl_multi_strerror(rc)); + php_error_docref(NULL, E_WARNING, "%s", curl_multi_strerror(rc)); } php_http_curlm_responsehandler(context); @@ -741,12 +769,11 @@ static void php_http_curlm_event_callback(int socket, short action, void *event_ #endif if (curl->useevents) { CURLMcode rc = CURLM_OK; - TSRMLS_FETCH_FROM_CTX(context->ts); while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket_action(curl->handle, socket, etoca(action), &curl->unfinished))); if (CURLM_OK != rc) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", curl_multi_strerror(rc)); + php_error_docref(NULL, E_WARNING, "%s", curl_multi_strerror(rc)); } php_http_curlm_responsehandler(context); @@ -769,7 +796,6 @@ static int php_http_curlm_socket_callback(CURL *easy, curl_socket_t sock, int ac if (curl->useevents) { int events = EV_PERSIST; php_http_curlm_event_t *ev = assign_data; - TSRMLS_FETCH_FROM_CTX(context->ts); if (!ev) { ev = ecalloc(1, sizeof(php_http_curlm_event_t)); @@ -797,7 +823,7 @@ static int php_http_curlm_socket_callback(CURL *easy, curl_socket_t sock, int ac return 0; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown socket action %d", action); + php_error_docref(NULL, E_WARNING, "Unknown socket action %d", action); return -1; } @@ -850,7 +876,7 @@ static ZEND_RESULT_CODE php_http_curle_option_set_ssl_verifyhost(php_http_option php_http_client_curl_handler_t *curl = userdata; CURL *ch = curl->handle; - if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_SSL_VERIFYHOST, Z_BVAL_P(val) ? 2 : 0)) { + if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_SSL_VERIFYHOST, Z_TYPE_P(val) == IS_TRUE ? 2 : 0)) { return FAILURE; } return SUCCESS; @@ -865,7 +891,7 @@ static ZEND_RESULT_CODE php_http_curle_option_set_cookiestore(php_http_option_t if (storage->cookiestore) { pefree(storage->cookiestore, 1); } - if (val && Z_STRLEN_P(val)) { + if (val && Z_TYPE_P(val) == IS_STRING && Z_STRLEN_P(val)) { storage->cookiestore = pestrndup(Z_STRVAL_P(val), Z_STRLEN_P(val), 1); } else { storage->cookiestore = NULL; @@ -882,11 +908,12 @@ static ZEND_RESULT_CODE php_http_curle_option_set_cookies(php_http_option_t *opt { php_http_client_curl_handler_t *curl = userdata; CURL *ch = curl->handle; - TSRMLS_FETCH_FROM_CTX(curl->client->ts); if (val && Z_TYPE_P(val) != IS_NULL) { + HashTable *ht = HASH_OF(val); + if (curl->options.encode_cookies) { - if (SUCCESS == php_http_url_encode_hash_ex(HASH_OF(val), &curl->options.cookies, ZEND_STRL(";"), ZEND_STRL("="), NULL, 0 TSRMLS_CC)) { + if (SUCCESS == php_http_url_encode_hash_ex(ht, &curl->options.cookies, ZEND_STRL(";"), ZEND_STRL("="), NULL, 0)) { php_http_buffer_fix(&curl->options.cookies); if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIE, curl->options.cookies.data)) { return FAILURE; @@ -895,19 +922,20 @@ static ZEND_RESULT_CODE php_http_curle_option_set_cookies(php_http_option_t *opt return FAILURE; } } else { - HashPosition pos; - php_http_array_hashkey_t cookie_key = php_http_array_hashkey_init(0); - zval **cookie_val; + php_http_arrkey_t cookie_key; + zval *cookie_val; - FOREACH_KEYVAL(pos, val, cookie_key, cookie_val) { - zval *zv = php_http_ztyp(IS_STRING, *cookie_val); + ZEND_HASH_FOREACH_KEY_VAL(ht, cookie_key.h, cookie_key.key, cookie_val) + { + zend_string *zs = zval_get_string(cookie_val); - php_http_array_hashkey_stringify(&cookie_key); - php_http_buffer_appendf(&curl->options.cookies, "%s=%s; ", cookie_key.str, Z_STRVAL_P(zv)); - php_http_array_hashkey_stringfree(&cookie_key); + php_http_arrkey_stringify(&cookie_key, NULL); + php_http_buffer_appendf(&curl->options.cookies, "%s=%s; ", cookie_key.key->val, zs->val); + php_http_arrkey_dtor(&cookie_key); - zval_ptr_dtor(&zv); + zend_string_release(zs); } + ZEND_HASH_FOREACH_END(); php_http_buffer_fix(&curl->options.cookies); if (curl->options.cookies.used) { @@ -929,7 +957,7 @@ static ZEND_RESULT_CODE php_http_curle_option_set_encodecookies(php_http_option_ { php_http_client_curl_handler_t *curl = userdata; - curl->options.encode_cookies = Z_BVAL_P(val); + curl->options.encode_cookies = Z_TYPE_P(val) == IS_TRUE; return SUCCESS; } @@ -937,7 +965,6 @@ static ZEND_RESULT_CODE php_http_curle_option_set_lastmodified(php_http_option_t { php_http_client_curl_handler_t *curl = userdata; CURL *ch = curl->handle; - TSRMLS_FETCH_FROM_CTX(curl->client->ts); if (Z_LVAL_P(val)) { if (Z_LVAL_P(val) > 0) { @@ -945,7 +972,7 @@ static ZEND_RESULT_CODE php_http_curle_option_set_lastmodified(php_http_option_t return FAILURE; } } else { - if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMEVALUE, (long) sapi_get_request_time(TSRMLS_C) + Z_LVAL_P(val))) { + if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMEVALUE, (long) sapi_get_request_time() + Z_LVAL_P(val))) { return FAILURE; } } @@ -970,7 +997,7 @@ static ZEND_RESULT_CODE php_http_curle_option_set_compress(php_http_option_t *op #if !PHP_HTTP_CURL_VERSION(7,21,6) # define CURLOPT_ACCEPT_ENCODING CURLOPT_ENCODING #endif - if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_ACCEPT_ENCODING, Z_BVAL_P(val) ? "" : NULL)) { + if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_ACCEPT_ENCODING, Z_TYPE_P(val) == IS_TRUE ? "" : NULL)) { return FAILURE; } return SUCCESS; @@ -981,7 +1008,7 @@ static ZEND_RESULT_CODE php_http_curle_option_set_etag(php_http_option_t *opt, z php_http_client_curl_handler_t *curl = userdata; php_http_buffer_t header; - if (Z_STRLEN_P(val)) { + if (val && Z_TYPE_P(val) == IS_STRING && Z_STRLEN_P(val)) { zend_bool is_quoted = !((Z_STRVAL_P(val)[0] != '"') || (Z_STRVAL_P(val)[Z_STRLEN_P(val)-1] != '"')); php_http_buffer_init(&header); php_http_buffer_appendf(&header, is_quoted?"%s: %s":"%s: \"%s\"", curl->options.range_request?"If-Match":"If-None-Match", Z_STRVAL_P(val)); @@ -996,32 +1023,29 @@ static ZEND_RESULT_CODE php_http_curle_option_set_range(php_http_option_t *opt, { php_http_client_curl_handler_t *curl = userdata; CURL *ch = curl->handle; - TSRMLS_FETCH_FROM_CTX(curl->client->ts); php_http_buffer_reset(&curl->options.ranges); if (val && Z_TYPE_P(val) != IS_NULL) { - HashPosition pos; - zval **rr, **rb, **re; - - FOREACH_VAL(pos, val, rr) { - if (Z_TYPE_PP(rr) == IS_ARRAY) { - if (2 == php_http_array_list(Z_ARRVAL_PP(rr) TSRMLS_CC, 2, &rb, &re)) { - if ( ((Z_TYPE_PP(rb) == IS_LONG) || ((Z_TYPE_PP(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(rb), Z_STRLEN_PP(rb), NULL, NULL, 1))) && - ((Z_TYPE_PP(re) == IS_LONG) || ((Z_TYPE_PP(re) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(re), Z_STRLEN_PP(re), NULL, NULL, 1)))) { - zval *rbl = php_http_ztyp(IS_LONG, *rb); - zval *rel = php_http_ztyp(IS_LONG, *re); - - if ((Z_LVAL_P(rbl) >= 0) && (Z_LVAL_P(rel) >= 0)) { - php_http_buffer_appendf(&curl->options.ranges, "%ld-%ld,", Z_LVAL_P(rbl), Z_LVAL_P(rel)); + zval *rr, *rb, *re; + zend_long rbl, rel; + HashTable *ht = HASH_OF(val); + + ZEND_HASH_FOREACH_VAL(ht, rr) + { + if (Z_TYPE_P(rr) == IS_ARRAY) { + if (2 == php_http_array_list(Z_ARRVAL_P(rr), 2, &rb, &re)) { + if ( ((Z_TYPE_P(rb) == IS_LONG) || ((Z_TYPE_P(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_P(rb), Z_STRLEN_P(rb), &rbl, NULL, 1))) && + ((Z_TYPE_P(re) == IS_LONG) || ((Z_TYPE_P(re) == IS_STRING) && is_numeric_string(Z_STRVAL_P(re), Z_STRLEN_P(re), &rel, NULL, 1)))) { + if ((rbl >= 0) && (rel >= 0)) { + php_http_buffer_appendf(&curl->options.ranges, "%ld-%ld,", rbl, rel); } - zval_ptr_dtor(&rbl); - zval_ptr_dtor(&rel); } } } } + ZEND_HASH_FOREACH_END(); if (curl->options.ranges.used) { curl->options.range_request = 1; @@ -1084,26 +1108,16 @@ static ZEND_RESULT_CODE php_http_curle_option_set_portrange(php_http_option_t *o php_http_client_curl_handler_t *curl = userdata; CURL *ch = curl->handle; long localport = 0, localportrange = 0; - TSRMLS_FETCH_FROM_CTX(curl->client->ts); if (val && Z_TYPE_P(val) != IS_NULL) { - zval **z_port_start, *zps_copy = NULL, **z_port_end, *zpe_copy = NULL; + zval *zps, *zpe; - switch (php_http_array_list(Z_ARRVAL_P(val) TSRMLS_CC, 2, &z_port_start, &z_port_end)) { + switch (php_http_array_list(Z_ARRVAL_P(val), 2, &zps, &zpe)) { case 2: - zps_copy = php_http_ztyp(IS_LONG, *z_port_start); - zpe_copy = php_http_ztyp(IS_LONG, *z_port_end); - localportrange = labs(Z_LVAL_P(zps_copy)-Z_LVAL_P(zpe_copy))+1L; + localportrange = labs(zval_get_long(zps)-zval_get_long(zpe))+1L; /* no break */ case 1: - if (!zps_copy) { - zps_copy = php_http_ztyp(IS_LONG, *z_port_start); - } - localport = (zpe_copy && Z_LVAL_P(zpe_copy) > 0) ? MIN(Z_LVAL_P(zps_copy), Z_LVAL_P(zpe_copy)) : Z_LVAL_P(zps_copy); - zval_ptr_dtor(&zps_copy); - if (zpe_copy) { - zval_ptr_dtor(&zpe_copy); - } + localport = (zval_get_long(zpe) > 0) ? MIN(zval_get_long(zps), zval_get_long(zpe)) : zval_get_long(zps); break; default: break; @@ -1121,26 +1135,28 @@ static ZEND_RESULT_CODE php_http_curle_option_set_portrange(php_http_option_t *o static ZEND_RESULT_CODE php_http_curle_option_set_proxyheader(php_http_option_t *opt, zval *val, void *userdata) { php_http_client_curl_handler_t *curl = userdata; - TSRMLS_FETCH_FROM_CTX(curl->client->ts); if (val && Z_TYPE_P(val) != IS_NULL) { - php_http_array_hashkey_t header_key = php_http_array_hashkey_init(0); - zval **header_val, *header_cpy; - HashPosition pos; + php_http_arrkey_t header_key; + zval *header_val; php_http_buffer_t header; php_http_buffer_init(&header); - FOREACH_KEYVAL(pos, val, header_key, header_val) { - if (header_key.type == HASH_KEY_IS_STRING) { - header_cpy = php_http_ztyp(IS_STRING, *header_val); - php_http_buffer_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy)); + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(val), header_key.h, header_key.key, header_val) + { + if (header_key.key) { + zend_string *zs = zval_get_string(header_val); + + php_http_buffer_appendf(&header, "%s: %s", header_key.key->val, zs->val); + zend_string_release(zs); + php_http_buffer_fix(&header); curl->options.proxyheaders = curl_slist_append(curl->options.proxyheaders, header.data); php_http_buffer_reset(&header); - zval_ptr_dtor(&header_cpy); } } + ZEND_HASH_FOREACH_END(); php_http_buffer_dtor(&header); } if (CURLE_OK != curl_easy_setopt(curl->handle, CURLOPT_PROXYHEADER, curl->options.proxyheaders)) { @@ -1159,18 +1175,18 @@ static ZEND_RESULT_CODE php_http_curle_option_set_resolve(php_http_option_t *opt { php_http_client_curl_handler_t *curl = userdata; CURL *ch = curl->handle; - TSRMLS_FETCH_FROM_CTX(curl->client->ts); if (val && Z_TYPE_P(val) != IS_NULL) { - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - HashPosition pos; - zval **data; + HashTable *ht = HASH_OF(val); + zval *data; - FOREACH_KEYVAL(pos, val, key, data) { - zval *cpy = php_http_ztyp(IS_STRING, *data); - curl->options.resolve = curl_slist_append(curl->options.resolve, Z_STRVAL_P(cpy)); - zval_ptr_dtor(&cpy); + ZEND_HASH_FOREACH_VAL(ht, data) + { + zend_string *zs = zval_get_string(data); + curl->options.resolve = curl_slist_append(curl->options.resolve, zs->val); + zend_string_release(zs); } + ZEND_HASH_FOREACH_END(); if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_RESOLVE, curl->options.resolve)) { return FAILURE; @@ -1208,13 +1224,13 @@ static ZEND_RESULT_CODE php_http_curle_option_set_ssl_tlsauthtype(php_http_optio } #endif -static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) +static void php_http_curle_options_init(php_http_options_t *registry) { php_http_option_t *opt; /* url options */ #if PHP_HTTP_CURL_VERSION(7,42,0) - php_http_option_register(registry, ZEND_STRL("path_as_is"), CURLOPT_PATH_AS_IS, IS_BOOL); + php_http_option_register(registry, ZEND_STRL("path_as_is"), CURLOPT_PATH_AS_IS, _IS_BOOL); #endif /* proxy */ @@ -1229,7 +1245,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) if ((opt = php_http_option_register(registry, ZEND_STRL("proxyauthtype"), CURLOPT_PROXYAUTH, IS_LONG))) { Z_LVAL(opt->defval) = CURLAUTH_ANYSAFE; } - php_http_option_register(registry, ZEND_STRL("proxytunnel"), CURLOPT_HTTPPROXYTUNNEL, IS_BOOL); + php_http_option_register(registry, ZEND_STRL("proxytunnel"), CURLOPT_HTTPPROXYTUNNEL, _IS_BOOL); #if PHP_HTTP_CURL_VERSION(7,19,4) php_http_option_register(registry, ZEND_STRL("noproxy"), CURLOPT_NOPROXY, IS_STRING); #endif @@ -1296,8 +1312,8 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) Z_LVAL(opt->defval) = 5; } */ - php_http_option_register(registry, ZEND_STRL("fresh_connect"), CURLOPT_FRESH_CONNECT, IS_BOOL); - php_http_option_register(registry, ZEND_STRL("forbid_reuse"), CURLOPT_FORBID_REUSE, IS_BOOL); + php_http_option_register(registry, ZEND_STRL("fresh_connect"), CURLOPT_FRESH_CONNECT, _IS_BOOL); + php_http_option_register(registry, ZEND_STRL("forbid_reuse"), CURLOPT_FORBID_REUSE, _IS_BOOL); /* outgoing interface */ php_http_option_register(registry, ZEND_STRL("interface"), CURLOPT_INTERFACE, IS_STRING); @@ -1330,7 +1346,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) if ((opt = php_http_option_register(registry, ZEND_STRL("redirect"), CURLOPT_FOLLOWLOCATION, IS_LONG))) { opt->setter = php_http_curle_option_set_redirect; } - php_http_option_register(registry, ZEND_STRL("unrestricted_auth"), CURLOPT_UNRESTRICTED_AUTH, IS_BOOL); + php_http_option_register(registry, ZEND_STRL("unrestricted_auth"), CURLOPT_UNRESTRICTED_AUTH, _IS_BOOL); #if PHP_HTTP_CURL_VERSION(7,19,1) php_http_option_register(registry, ZEND_STRL("postredir"), CURLOPT_POSTREDIR, IS_LONG); #endif @@ -1347,18 +1363,17 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) if ((opt = php_http_option_register(registry, ZEND_STRL("referer"), CURLOPT_REFERER, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; } - if ((opt = php_http_option_register(registry, ZEND_STRL("autoreferer"), CURLOPT_AUTOREFERER, IS_BOOL))) { + if ((opt = php_http_option_register(registry, ZEND_STRL("autoreferer"), CURLOPT_AUTOREFERER, _IS_BOOL))) { ZVAL_BOOL(&opt->defval, 1); } /* useragent */ if ((opt = php_http_option_register(registry, ZEND_STRL("useragent"), CURLOPT_USERAGENT, IS_STRING))) { /* don't check strlen, to allow sending no useragent at all */ - ZVAL_STRING(&opt->defval, + ZVAL_PSTRING(&opt->defval, "PECL_HTTP/" PHP_PECL_HTTP_VERSION " " "PHP/" PHP_VERSION " " - "libcurl/" LIBCURL_VERSION - , 0); + "libcurl/" LIBCURL_VERSION); } /* resume */ @@ -1377,7 +1392,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) } /* compression */ - if ((opt = php_http_option_register(registry, ZEND_STRL("compress"), 0, IS_BOOL))) { + if ((opt = php_http_option_register(registry, ZEND_STRL("compress"), 0, _IS_BOOL))) { opt->setter = php_http_curle_option_set_compress; } @@ -1387,7 +1402,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) } /* cookies */ - if ((opt = php_http_option_register(registry, ZEND_STRL("encodecookies"), 0, IS_BOOL))) { + if ((opt = php_http_option_register(registry, ZEND_STRL("encodecookies"), 0, _IS_BOOL))) { opt->setter = php_http_curle_option_set_encodecookies; ZVAL_BOOL(&opt->defval, 1); } @@ -1396,7 +1411,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) } /* cookiesession, don't load session cookies from cookiestore */ - php_http_option_register(registry, ZEND_STRL("cookiesession"), CURLOPT_COOKIESESSION, IS_BOOL); + php_http_option_register(registry, ZEND_STRL("cookiesession"), CURLOPT_COOKIESESSION, _IS_BOOL); /* cookiestore, read initial cookies from that file and store cookies back into that file */ if ((opt = php_http_option_register(registry, ZEND_STRL("cookiestore"), 0, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; @@ -1426,9 +1441,9 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) #endif /* tcp */ - php_http_option_register(registry, ZEND_STRL("tcp_nodelay"), CURLOPT_TCP_NODELAY, IS_BOOL); + php_http_option_register(registry, ZEND_STRL("tcp_nodelay"), CURLOPT_TCP_NODELAY, _IS_BOOL); #if PHP_HTTP_CURL_VERSION(7,25,0) - php_http_option_register(registry, ZEND_STRL("tcp_keepalive"), CURLOPT_TCP_KEEPALIVE, IS_BOOL); + php_http_option_register(registry, ZEND_STRL("tcp_keepalive"), CURLOPT_TCP_KEEPALIVE, _IS_BOOL); if ((opt = php_http_option_register(registry, ZEND_STRL("tcp_keepidle"), CURLOPT_TCP_KEEPIDLE, IS_LONG))) { Z_LVAL(opt->defval) = 60; } @@ -1447,7 +1462,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) } if ((opt = php_http_option_register(registry, ZEND_STRL("certtype"), CURLOPT_SSLCERTTYPE, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; - ZVAL_STRING(&opt->defval, "PEM", 0); + ZVAL_PSTRING(&opt->defval, "PEM"); } if ((opt = php_http_option_register(registry, ZEND_STRL("key"), CURLOPT_SSLKEY, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; @@ -1455,29 +1470,29 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) } if ((opt = php_http_option_register(registry, ZEND_STRL("keytype"), CURLOPT_SSLKEYTYPE, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; - ZVAL_STRING(&opt->defval, "PEM", 0); + ZVAL_PSTRING(&opt->defval, "PEM"); } if ((opt = php_http_option_register(registry, ZEND_STRL("keypasswd"), CURLOPT_SSLKEYPASSWD, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; } php_http_option_register(registry, ZEND_STRL("engine"), CURLOPT_SSLENGINE, IS_STRING); php_http_option_register(registry, ZEND_STRL("version"), CURLOPT_SSLVERSION, IS_LONG); - if ((opt = php_http_option_register(registry, ZEND_STRL("verifypeer"), CURLOPT_SSL_VERIFYPEER, IS_BOOL))) { + if ((opt = php_http_option_register(registry, ZEND_STRL("verifypeer"), CURLOPT_SSL_VERIFYPEER, _IS_BOOL))) { ZVAL_BOOL(&opt->defval, 1); } - if ((opt = php_http_option_register(registry, ZEND_STRL("verifyhost"), CURLOPT_SSL_VERIFYHOST, IS_BOOL))) { + if ((opt = php_http_option_register(registry, ZEND_STRL("verifyhost"), CURLOPT_SSL_VERIFYHOST, _IS_BOOL))) { ZVAL_BOOL(&opt->defval, 1); opt->setter = php_http_curle_option_set_ssl_verifyhost; } #if PHP_HTTP_CURL_VERSION(7,41,0) - php_http_option_register(registry, ZEND_STRL("verifystatus"), CURLOPT_SSL_VERIFYSTATUS, IS_BOOL); + php_http_option_register(registry, ZEND_STRL("verifystatus"), CURLOPT_SSL_VERIFYSTATUS, _IS_BOOL); #endif php_http_option_register(registry, ZEND_STRL("cipher_list"), CURLOPT_SSL_CIPHER_LIST, IS_STRING); if ((opt = php_http_option_register(registry, ZEND_STRL("cainfo"), CURLOPT_CAINFO, IS_STRING))) { opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN; opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR; #ifdef PHP_HTTP_CURL_CAINFO - ZVAL_STRING(&opt->defval, PHP_HTTP_CURL_CAINFO, 0); + ZVAL_PSTRING(&opt->defval, PHP_HTTP_CURL_CAINFO); #endif } if ((opt = php_http_option_register(registry, ZEND_STRL("capath"), CURLOPT_CAPATH, IS_STRING))) { @@ -1505,13 +1520,15 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) # endif #endif #if (PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)) || (PHP_HTTP_CURL_VERSION(7,34,0) && defined(PHP_HTTP_HAVE_NSS)) || (PHP_HTTP_CURL_VERSION(7,42,0) && defined(PHP_HTTP_HAVE_GNUTLS)) || (PHP_HTTP_CURL_VERSION(7,39,0) && defined(PHP_HTTP_HAVE_GSKIT)) - php_http_option_register(registry, ZEND_STRL("certinfo"), CURLOPT_CERTINFO, IS_BOOL); + if ((opt = php_http_option_register(registry, ZEND_STRL("certinfo"), CURLOPT_CERTINFO, _IS_BOOL))) { + ZVAL_FALSE(&opt->defval); + } #endif #if PHP_HTTP_CURL_VERSION(7,36,0) - if ((opt = php_http_option_register(registry, ZEND_STRL("enable_npn"), CURLOPT_SSL_ENABLE_NPN, IS_BOOL))) { + if ((opt = php_http_option_register(registry, ZEND_STRL("enable_npn"), CURLOPT_SSL_ENABLE_NPN, _IS_BOOL))) { ZVAL_BOOL(&opt->defval, 1); } - if ((opt = php_http_option_register(registry, ZEND_STRL("enable_alpn"), CURLOPT_SSL_ENABLE_ALPN, IS_BOOL))) { + if ((opt = php_http_option_register(registry, ZEND_STRL("enable_alpn"), CURLOPT_SSL_ENABLE_ALPN, _IS_BOOL))) { ZVAL_BOOL(&opt->defval, 1); } #endif @@ -1534,7 +1551,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC) } #endif #if PHP_HTTP_CURL_VERSION(7,42,0) && (defined(PHP_HTTP_HAVE_NSS) || defined(PHP_HTTP_HAVE_DARWINSSL)) - php_http_option_register(registry, ZEND_STRL("falsestart"), CURLOPT_SSL_FALSESTART, IS_BOOL); + php_http_option_register(registry, ZEND_STRL("falsestart"), CURLOPT_SSL_FALSESTART, _IS_BOOL); #endif } } @@ -1545,8 +1562,12 @@ static zval *php_http_curle_get_option(php_http_option_t *opt, HashTable *option zval *option; if ((option = php_http_option_get(opt, options, NULL))) { - option = php_http_ztyp(opt->type, option); - zend_hash_quick_update(&curl->options.cache, opt->name.s, opt->name.l, opt->name.h, &option, sizeof(zval *), NULL); + zval zopt; + + ZVAL_DUP(&zopt, option); + convert_to_explicit_type(&zopt, opt->type); + zend_hash_update(&curl->options.cache, opt->name, &zopt); + return zend_hash_find(&curl->options.cache, opt->name); } return option; } @@ -1558,17 +1579,16 @@ static ZEND_RESULT_CODE php_http_curle_set_option(php_http_option_t *opt, zval * zval tmp; CURLcode rc = CURLE_OK; ZEND_RESULT_CODE rv = SUCCESS; - TSRMLS_FETCH_FROM_CTX(curl->client->ts); if (!val) { val = &opt->defval; } switch (opt->type) { - case IS_BOOL: + case _IS_BOOL: if (opt->setter) { rv = opt->setter(opt, val, curl); - } else if (CURLE_OK != curl_easy_setopt(ch, opt->option, (long) Z_BVAL_P(val))) { + } else if (CURLE_OK != curl_easy_setopt(ch, opt->option, (long) (Z_TYPE_P(val) == IS_TRUE))) { rv = FAILURE; } break; @@ -1584,11 +1604,15 @@ static ZEND_RESULT_CODE php_http_curle_set_option(php_http_option_t *opt, zval * case IS_STRING: if (opt->setter) { rv = opt->setter(opt, val, curl); + } else if (!val || Z_TYPE_P(val) == IS_NULL) { + if (CURLE_OK != (rc = curl_easy_setopt(ch, opt->option, NULL))) { + rv = FAILURE; + } } else if ((opt->flags & PHP_HTTP_CURLE_OPTION_CHECK_STRLEN) && !Z_STRLEN_P(val)) { if (CURLE_OK != (rc = curl_easy_setopt(ch, opt->option, NULL))) { rv = FAILURE; } - } else if ((opt->flags & PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR) && Z_STRVAL_P(val) && SUCCESS != php_check_open_basedir(Z_STRVAL_P(val) TSRMLS_CC)) { + } else if ((opt->flags & PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR) && Z_STRVAL_P(val) && SUCCESS != php_check_open_basedir(Z_STRVAL_P(val))) { if (CURLE_OK != (rc = curl_easy_setopt(ch, opt->option, NULL))) { rv = FAILURE; } @@ -1627,7 +1651,7 @@ static ZEND_RESULT_CODE php_http_curle_set_option(php_http_option_t *opt, zval * break; } if (rv != SUCCESS) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_easy_strerror(rc)); + php_error_docref(NULL, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_easy_strerror(rc)); } return rv; } @@ -1640,12 +1664,10 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_pipelining_bl(php_http_option_ CURLM *ch = curl->handle; HashTable tmp_ht; char **bl = NULL; - TSRMLS_FETCH_FROM_CTX(client->ts); /* array of char *, ending with a NULL */ if (value && Z_TYPE_P(value) != IS_NULL) { - zval **entry; - HashPosition pos; + zval *entry; HashTable *ht = HASH_OF(value); int c = zend_hash_num_elements(ht); char **ptr = ecalloc(c + 1, sizeof(char *)); @@ -1655,9 +1677,11 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_pipelining_bl(php_http_option_ zend_hash_init(&tmp_ht, c, NULL, ZVAL_PTR_DTOR, 0); array_join(ht, &tmp_ht, 0, ARRAY_JOIN_STRINGIFY); - FOREACH_HASH_VAL(pos, &tmp_ht, entry) { - *ptr++ = Z_STRVAL_PP(entry); + ZEND_HASH_FOREACH_VAL(&tmp_ht, entry) + { + *ptr++ = Z_STRVAL_P(entry); } + ZEND_HASH_FOREACH_END(); } if (CURLM_OK != curl_multi_setopt(ch, opt->option, bl)) { @@ -1706,11 +1730,11 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_use_eventloop(php_http_option_ { php_http_client_t *client = userdata; - return php_http_curlm_use_eventloop(client, value && Z_BVAL_P(value)); + return php_http_curlm_use_eventloop(client, value && Z_TYPE_P(value) == IS_TRUE); } #endif -static void php_http_curlm_options_init(php_http_options_t *registry TSRMLS_DC) +static void php_http_curlm_options_init(php_http_options_t *registry) { php_http_option_t *opt; @@ -1734,7 +1758,7 @@ static void php_http_curlm_options_init(php_http_options_t *registry TSRMLS_DC) php_http_option_register(registry, ZEND_STRL("max_total_connections"), CURLMOPT_MAX_TOTAL_CONNECTIONS, IS_LONG); #endif /* enable/disable HTTP pipelining */ - php_http_option_register(registry, ZEND_STRL("pipelining"), CURLMOPT_PIPELINING, IS_BOOL); + php_http_option_register(registry, ZEND_STRL("pipelining"), CURLMOPT_PIPELINING, _IS_BOOL); /* chunk length threshold for pipelining */ #if PHP_HTTP_CURL_VERSION(7,30,0) php_http_option_register(registry, ZEND_STRL("chunk_length_penalty_size"), CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE, IS_LONG); @@ -1757,7 +1781,7 @@ static void php_http_curlm_options_init(php_http_options_t *registry TSRMLS_DC) #endif /* events */ #if PHP_HTTP_HAVE_EVENT - if ((opt = php_http_option_register(registry, ZEND_STRL("use_eventloop"), 0, IS_BOOL))) { + if ((opt = php_http_option_register(registry, ZEND_STRL("use_eventloop"), 0, _IS_BOOL))) { opt->setter = php_http_curlm_option_set_use_eventloop; } #endif @@ -1771,20 +1795,24 @@ static ZEND_RESULT_CODE php_http_curlm_set_option(php_http_option_t *opt, zval * zval *orig = val; CURLMcode rc = CURLM_UNKNOWN_OPTION; ZEND_RESULT_CODE rv = SUCCESS; - TSRMLS_FETCH_FROM_CTX(client->ts); if (!val) { val = &opt->defval; } else if (opt->type && Z_TYPE_P(val) != opt->type && !(Z_TYPE_P(val) == IS_NULL && opt->type == IS_ARRAY)) { - val = php_http_ztyp(opt->type, val); + zval zopt; + + ZVAL_DUP(&zopt, val); + convert_to_explicit_type(&zopt, opt->type); + + val = &zopt; } if (opt->setter) { rv = opt->setter(opt, val, client); } else { switch (opt->type) { - case IS_BOOL: - if (CURLM_OK != (rc = curl_multi_setopt(ch, opt->option, (long) Z_BVAL_P(val)))) { + case _IS_BOOL: + if (CURLM_OK != (rc = curl_multi_setopt(ch, opt->option, (long) zend_is_true(val)))) { rv = FAILURE; } break; @@ -1800,11 +1828,11 @@ static ZEND_RESULT_CODE php_http_curlm_set_option(php_http_option_t *opt, zval * } if (val && val != orig && val != &opt->defval) { - zval_ptr_dtor(&val); + zval_ptr_dtor(val); } if (rv != SUCCESS) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_easy_strerror(rc)); + php_error_docref(NULL, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_easy_strerror(rc)); } return rv; } @@ -1870,10 +1898,9 @@ static php_http_client_curl_handler_t *php_http_client_curl_handler_init(php_htt { void *handle; php_http_client_curl_handler_t *handler; - TSRMLS_FETCH_FROM_CTX(h->ts); - if (!(handle = php_resource_factory_handle_ctor(rf, NULL TSRMLS_CC))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to initialize curl handle"); + if (!(handle = php_resource_factory_handle_ctor(rf, NULL))) { + php_error_docref(NULL, E_WARNING, "Failed to initialize curl handle"); return NULL; } @@ -1881,7 +1908,7 @@ static php_http_client_curl_handler_t *php_http_client_curl_handler_init(php_htt handler->rf = rf; handler->client = h; handler->handle = handle; - handler->response.body = php_http_message_body_init(NULL, NULL TSRMLS_CC); + handler->response.body = php_http_message_body_init(NULL, NULL); php_http_buffer_init(&handler->response.headers); php_http_buffer_init(&handler->options.cookies); php_http_buffer_init(&handler->options.ranges); @@ -1922,11 +1949,10 @@ static ZEND_RESULT_CODE php_http_client_curl_handler_prepare(php_http_client_cur size_t body_size; php_http_message_t *msg = enqueue->request; php_http_curle_storage_t *storage = php_http_curle_get_storage(curl->handle); - TSRMLS_FETCH_FROM_CTX(curl->client->ts); /* request url */ if (!PHP_HTTP_INFO(msg).request.url) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot request empty URL"); + php_error_docref(NULL, E_WARNING, "Cannot request empty URL"); return FAILURE; } storage->errorbuffer[0] = '\0'; @@ -1942,34 +1968,33 @@ static ZEND_RESULT_CODE php_http_client_curl_handler_prepare(php_http_client_cur /* request headers */ php_http_message_update_headers(msg); if (zend_hash_num_elements(&msg->hdrs)) { - php_http_array_hashkey_t header_key = php_http_array_hashkey_init(0); - zval **header_val, *header_cpy; - HashPosition pos; + php_http_arrkey_t header_key; + zval *header_val; + zend_string *header_str; php_http_buffer_t header; #if !PHP_HTTP_CURL_VERSION(7,23,0) - zval **ct = NULL; - - zend_hash_find(&msg->hdrs, ZEND_STRS("Content-Length"), (void *) &ct); + zval *ct = zend_hash_str_find(&msg->hdrs, ZEND_STRL("Content-Length")); #endif php_http_buffer_init(&header); - FOREACH_HASH_KEYVAL(pos, &msg->hdrs, header_key, header_val) { - if (header_key.type == HASH_KEY_IS_STRING) { + ZEND_HASH_FOREACH_KEY_VAL(&msg->hdrs, header_key.h, header_key.key, header_val) + { + if (header_key.key) { #if !PHP_HTTP_CURL_VERSION(7,23,0) /* avoid duplicate content-length header */ - if (ct && *ct == *header_val) { + if (ct && ct == header_val) { continue; } #endif - header_cpy = php_http_ztyp(IS_STRING, *header_val); - php_http_buffer_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy)); + header_str = zval_get_string(header_val); + php_http_buffer_appendf(&header, "%s: %s", header_key.key->val, header_str->val); php_http_buffer_fix(&header); curl->options.headers = curl_slist_append(curl->options.headers, header.data); php_http_buffer_reset(&header); - - zval_ptr_dtor(&header_cpy); + zend_string_release(header_str); } } + ZEND_HASH_FOREACH_END(); php_http_buffer_dtor(&header); } curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, curl->options.headers); @@ -2019,7 +2044,7 @@ static ZEND_RESULT_CODE php_http_client_curl_handler_prepare(php_http_client_cur curl_easy_setopt(curl->handle, CURLOPT_CUSTOMREQUEST, PHP_HTTP_INFO(msg).request.method); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot use empty request method"); + php_error_docref(NULL, E_WARNING, "Cannot use empty request method"); return FAILURE; } @@ -2040,11 +2065,9 @@ static void php_http_client_curl_handler_clear(php_http_client_curl_handler_t *h static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *handler) { - TSRMLS_FETCH_FROM_CTX(handler->client->ts); - php_http_client_curl_handler_clear(handler); - php_resource_factory_handle_dtor(handler->rf, handler->handle TSRMLS_CC); + php_resource_factory_handle_dtor(handler->rf, handler->handle); php_resource_factory_free(&handler->rf); php_http_message_body_free(&handler->response.body); @@ -2053,21 +2076,32 @@ static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *ha php_http_buffer_dtor(&handler->options.cookies); zend_hash_destroy(&handler->options.cache); +#if PHP_HTTP_CURL_VERSION(7,21,3) + if (handler->options.resolve) { + curl_slist_free_all(handler->options.resolve); + handler->options.resolve = NULL; + } +#endif + if (handler->options.headers) { curl_slist_free_all(handler->options.headers); handler->options.headers = NULL; } + if (handler->options.proxyheaders) { + curl_slist_free_all(handler->options.proxyheaders); + handler->options.proxyheaders = NULL; + } + efree(handler); } static php_http_client_t *php_http_client_curl_init(php_http_client_t *h, void *handle) { php_http_client_curl_t *curl; - TSRMLS_FETCH_FROM_CTX(h->ts); - if (!handle && !(handle = php_resource_factory_handle_ctor(h->rf, NULL TSRMLS_CC))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to initialize curl handle"); + if (!handle && !(handle = php_resource_factory_handle_ctor(h->rf, NULL))) { + php_error_docref(NULL, E_WARNING, "Failed to initialize curl handle"); return NULL; } @@ -2082,7 +2116,6 @@ static php_http_client_t *php_http_client_curl_init(php_http_client_t *h, void * static void php_http_client_curl_dtor(php_http_client_t *h) { php_http_client_curl_t *curl = h->ctx; - TSRMLS_FETCH_FROM_CTX(h->ts); #if PHP_HTTP_HAVE_EVENT if (curl->timeout) { @@ -2099,7 +2132,7 @@ static void php_http_client_curl_dtor(php_http_client_t *h) #endif curl->unfinished = 0; - php_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC); + php_resource_factory_handle_dtor(h->rf, curl->handle); efree(curl); h->ctx = NULL; @@ -2116,36 +2149,37 @@ static void queue_dtor(php_http_client_enqueue_t *e) php_http_client_curl_handler_dtor(handler); } -static php_resource_factory_t *create_rf(php_http_client_t *h, php_http_client_enqueue_t *enqueue TSRMLS_DC) +static php_resource_factory_t *create_rf(php_http_client_t *h, php_http_client_enqueue_t *enqueue) { php_persistent_handle_factory_t *pf = NULL; php_resource_factory_t *rf = NULL; php_http_url_t *url = enqueue->request->http.info.request.url; if (!url || (!url->host && !url->path)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot request empty URL"); + php_error_docref(NULL, E_WARNING, "Cannot request empty URL"); return NULL; } /* only if the client itself is setup for persistence */ if (php_resource_factory_is_persistent(h->rf)) { + zend_string *id; char *id_str = NULL; size_t id_len; int port = url->port ? url->port : 80; - zval **zport; + zval *zport; - if (SUCCESS == zend_hash_find(enqueue->options, ZEND_STRS("port"), (void *) &zport)) { - zval *zcpy = php_http_ztyp(IS_LONG, *zport); + if ((zport = zend_hash_str_find(enqueue->options, ZEND_STRL("port")))) { + zend_long lport = zval_get_long(zport); - if (Z_LVAL_P(zcpy)) { - port = Z_LVAL_P(zcpy); + if (lport > 0) { + port = lport; } - zval_ptr_dtor(&zcpy); } id_len = spprintf(&id_str, 0, "%s:%d", STR_PTR(url->host), port); - pf = php_persistent_handle_concede(NULL, ZEND_STRL("http\\Client\\Curl\\Request"), id_str, id_len, NULL, NULL TSRMLS_CC); - efree(id_str); + id = php_http_cs2zs(id_str, id_len); + pf = php_persistent_handle_concede(NULL, PHP_HTTP_G->client.curl.driver.request_name, id, NULL, NULL); + zend_string_release(id); } if (pf) { @@ -2164,9 +2198,8 @@ static ZEND_RESULT_CODE php_http_client_curl_enqueue(php_http_client_t *h, php_h php_http_client_curl_handler_t *handler; php_http_client_progress_state_t *progress; php_resource_factory_t *rf; - TSRMLS_FETCH_FROM_CTX(h->ts); - rf = create_rf(h, enqueue TSRMLS_CC); + rf = create_rf(h, enqueue); if (!rf) { return FAILURE; } @@ -2197,7 +2230,7 @@ static ZEND_RESULT_CODE php_http_client_curl_enqueue(php_http_client_t *h, php_h return SUCCESS; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not enqueue request: %s", curl_multi_strerror(rs)); + php_error_docref(NULL, E_WARNING, "Could not enqueue request: %s", curl_multi_strerror(rs)); return FAILURE; } } @@ -2207,14 +2240,13 @@ static ZEND_RESULT_CODE php_http_client_curl_dequeue(php_http_client_t *h, php_h CURLMcode rs; php_http_client_curl_t *curl = h->ctx; php_http_client_curl_handler_t *handler = enqueue->opaque; - TSRMLS_FETCH_FROM_CTX(h->ts); php_http_client_curl_handler_clear(handler); if (CURLM_OK == (rs = curl_multi_remove_handle(curl->handle, handler->handle))) { zend_llist_del_element(&h->requests, handler->handle, (int (*)(void *, void *)) compare_queue); return SUCCESS; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not dequeue request: %s", curl_multi_strerror(rs)); + php_error_docref(NULL, E_WARNING, "Could not dequeue request: %s", curl_multi_strerror(rs)); } return FAILURE; @@ -2313,10 +2345,7 @@ static ZEND_RESULT_CODE php_http_client_curl_exec(php_http_client_t *h) { #if PHP_HTTP_HAVE_EVENT php_http_client_curl_t *curl = h->ctx; -#endif - TSRMLS_FETCH_FROM_CTX(h->ts); -#if PHP_HTTP_HAVE_EVENT if (curl->useevents) { php_http_curlm_timeout_callback(CURL_SOCKET_TIMEOUT, /*EV_READ|EV_WRITE*/0, h); do { @@ -2327,7 +2356,7 @@ static ZEND_RESULT_CODE php_http_client_curl_exec(php_http_client_t *h) #endif if (ev_rc < 0) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Error in event_base_dispatch()"); + php_error_docref(NULL, E_ERROR, "Error in event_base_dispatch()"); return FAILURE; } } while (curl->unfinished && !EG(exception)); @@ -2338,9 +2367,9 @@ static ZEND_RESULT_CODE php_http_client_curl_exec(php_http_client_t *h) if (SUCCESS != php_http_client_curl_wait(h, NULL)) { #ifdef PHP_WIN32 /* see http://msdn.microsoft.com/library/en-us/winsock/winsock/windows_sockets_error_codes_2.asp */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "WinSock error: %d", WSAGetLastError()); + php_error_docref(NULL, E_WARNING, "WinSock error: %d", WSAGetLastError()); #else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "%s", strerror(errno)); #endif return FAILURE; } @@ -2377,34 +2406,31 @@ static ZEND_RESULT_CODE php_http_client_curl_setopt(php_http_client_t *h, php_ht return SUCCESS; } -static int apply_available_options(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) +static int apply_available_options(zval *pDest, int num_args, va_list args, zend_hash_key *hash_key) { - php_http_option_t *opt = pDest; + php_http_option_t *opt = Z_PTR_P(pDest); HashTable *ht; - zval *entry; + zval entry; int c; ht = va_arg(args, HashTable*); - MAKE_STD_ZVAL(entry); - if ((c = zend_hash_num_elements(&opt->suboptions.options))) { - array_init_size(entry, c); - zend_hash_apply_with_arguments(&opt->suboptions.options TSRMLS_CC, apply_available_options, 1, Z_ARRVAL_P(entry)); + array_init_size(&entry, c); + zend_hash_apply_with_arguments(&opt->suboptions.options, apply_available_options, 1, Z_ARRVAL(entry)); } else { /* catch deliberate NULL options */ if (Z_TYPE(opt->defval) == IS_STRING && !Z_STRVAL(opt->defval)) { - ZVAL_NULL(entry); + ZVAL_NULL(&entry); } else { - ZVAL_COPY_VALUE(entry, &opt->defval); - zval_copy_ctor(entry); + ZVAL_ZVAL(&entry, &opt->defval, 1, 0); } } - if (hash_key->nKeyLength) { - zend_hash_quick_update(ht, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &entry, sizeof(zval *), NULL); + if (hash_key->key) { + zend_hash_update(ht, hash_key->key, &entry); } else { - zend_hash_index_update(ht, hash_key->h, (void *) &entry, sizeof(zval *), NULL); + zend_hash_index_update(ht, hash_key->h, &entry); } return ZEND_HASH_APPLY_KEEP; @@ -2413,7 +2439,6 @@ static int apply_available_options(void *pDest TSRMLS_DC, int num_args, va_list static ZEND_RESULT_CODE php_http_client_curl_getopt(php_http_client_t *h, php_http_client_getopt_opt_t opt, void *arg, void **res) { php_http_client_enqueue_t *enqueue; - TSRMLS_FETCH_FROM_CTX(h->ts); switch (opt) { case PHP_HTTP_CLIENT_OPT_PROGRESS_INFO: @@ -2435,11 +2460,11 @@ static ZEND_RESULT_CODE php_http_client_curl_getopt(php_http_client_t *h, php_ht break; case PHP_HTTP_CLIENT_OPT_AVAILABLE_OPTIONS: - zend_hash_apply_with_arguments(&php_http_curle_options.options TSRMLS_CC, apply_available_options, 1, *(HashTable **) res); + zend_hash_apply_with_arguments(&php_http_curle_options.options, apply_available_options, 1, *(HashTable **) res); break; case PHP_HTTP_CLIENT_OPT_AVAILABLE_CONFIGURATION: - zend_hash_apply_with_arguments(&php_http_curlm_options.options TSRMLS_CC, apply_available_options, 1, *(HashTable **) res); + zend_hash_apply_with_arguments(&php_http_curlm_options.options, apply_available_options, 1, *(HashTable **) res); break; default: @@ -2472,19 +2497,20 @@ php_http_client_ops_t *php_http_client_curl_get_ops(void) PHP_MINIT_FUNCTION(http_client_curl) { php_http_options_t *options; - php_http_client_driver_t driver = { - ZEND_STRL("curl"), - &php_http_client_curl_ops - }; - if (SUCCESS != php_http_client_driver_add(&driver)) { + PHP_HTTP_G->client.curl.driver.driver_name = zend_string_init(ZEND_STRL("curl"), 1); + PHP_HTTP_G->client.curl.driver.client_name = zend_string_init(ZEND_STRL("http\\Client\\Curl"), 1); + PHP_HTTP_G->client.curl.driver.request_name = zend_string_init(ZEND_STRL("http\\Client\\Curl\\Request"), 1); + PHP_HTTP_G->client.curl.driver.client_ops = &php_http_client_curl_ops; + + if (SUCCESS != php_http_client_driver_add(&PHP_HTTP_G->client.curl.driver)) { return FAILURE; } - if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http\\Client\\Curl"), &php_http_curlm_resource_factory_ops, NULL, NULL TSRMLS_CC)) { + if (SUCCESS != php_persistent_handle_provide(PHP_HTTP_G->client.curl.driver.client_name, &php_http_curlm_resource_factory_ops, NULL, NULL)) { return FAILURE; } - if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http\\Client\\Curl\\Request"), &php_http_curle_resource_factory_ops, NULL, NULL TSRMLS_CC)) { + if (SUCCESS != php_persistent_handle_provide(PHP_HTTP_G->client.curl.driver.request_name, &php_http_curle_resource_factory_ops, NULL, NULL)) { return FAILURE; } @@ -2492,13 +2518,13 @@ PHP_MINIT_FUNCTION(http_client_curl) options->getter = php_http_curle_get_option; options->setter = php_http_curle_set_option; - php_http_curle_options_init(options TSRMLS_CC); + php_http_curle_options_init(options); } if ((options = php_http_options_init(&php_http_curlm_options, 1))) { options->getter = php_http_option_get; options->setter = php_http_curlm_set_option; - php_http_curlm_options_init(options TSRMLS_CC); + php_http_curlm_options_init(options); } /* @@ -2578,8 +2604,11 @@ PHP_MINIT_FUNCTION(http_client_curl) PHP_MSHUTDOWN_FUNCTION(http_client_curl) { - php_persistent_handle_cleanup(ZEND_STRL("http\\Client\\Curl"), NULL, 0 TSRMLS_CC); - php_persistent_handle_cleanup(ZEND_STRL("http\\Client\\Curl\\Request"), NULL, 0 TSRMLS_CC); + php_persistent_handle_cleanup(PHP_HTTP_G->client.curl.driver.client_name, NULL); + php_persistent_handle_cleanup(PHP_HTTP_G->client.curl.driver.request_name, NULL); + zend_string_release(PHP_HTTP_G->client.curl.driver.client_name); + zend_string_release(PHP_HTTP_G->client.curl.driver.request_name); + zend_string_release(PHP_HTTP_G->client.curl.driver.driver_name); php_http_options_dtor(&php_http_curle_options); php_http_options_dtor(&php_http_curlm_options); diff --git a/src/php_http_client_curl.h b/src/php_http_client_curl.h index c82a09c..9128647 100644 --- a/src/php_http_client_curl.h +++ b/src/php_http_client_curl.h @@ -15,6 +15,10 @@ #if PHP_HTTP_HAVE_CURL +struct php_http_client_curl_globals { + php_http_client_driver_t driver; +}; + PHP_MINIT_FUNCTION(http_client_curl); PHP_MSHUTDOWN_FUNCTION(http_client_curl); #endif /* PHP_HTTP_HAVE_CURL */ diff --git a/src/php_http_client_request.c b/src/php_http_client_request.c index 0e40cc5..05d4a81 100644 --- a/src/php_http_client_request.c +++ b/src/php_http_client_request.c @@ -12,14 +12,14 @@ #include "php_http_api.h" -void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zval *opts, int overwrite TSRMLS_DC); -void php_http_client_options_set(zval *this_ptr, zval *opts TSRMLS_DC); -void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value TSRMLS_DC); +void php_http_client_options_set_subr(zval *this_ptr, char *key, size_t len, zval *opts, int overwrite); +void php_http_client_options_set(zval *this_ptr, zval *opts); +void php_http_client_options_get_subr(zval *this_ptr, char *key, size_t len, zval *return_value); #define PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj) \ do { \ if (!obj->message) { \ - obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL TSRMLS_CC); \ + obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL); \ } \ } while(0) @@ -32,28 +32,28 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientRequest, __construct) { char *meth_str = NULL; - int meth_len = 0; + size_t meth_len = 0; zval *zheaders = NULL, *zbody = NULL, *zurl = NULL; php_http_message_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!z!a!O!", &meth_str, &meth_len, &zurl, &zheaders, &zbody, php_http_message_body_class_entry), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!z!a!O!", &meth_str, &meth_len, &zurl, &zheaders, &zbody, php_http_message_body_class_entry), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); if (obj->message) { php_http_message_set_type(obj->message, PHP_HTTP_REQUEST); } else { - obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL TSRMLS_CC); + obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL); } if (zbody) { - php_http_expect(SUCCESS == php_http_message_object_set_body(obj, zbody TSRMLS_CC), unexpected_val, return); + php_http_expect(SUCCESS == php_http_message_object_set_body(obj, zbody), unexpected_val, return); } if (meth_str && meth_len) { PHP_HTTP_INFO(obj->message).request.method = estrndup(meth_str, meth_len); } if (zurl) { - PHP_HTTP_INFO(obj->message).request.url = php_http_url_from_zval(zurl, ~0 TSRMLS_CC); + PHP_HTTP_INFO(obj->message).request.url = php_http_url_from_zval(zurl, ~0); } if (zheaders) { array_copy(Z_ARRVAL_P(zheaders), &obj->message->hdrs); @@ -65,25 +65,22 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_setContentType, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientRequest, setContentType) { - char *ct_str; - int ct_len; + zend_string *ct_str; php_http_message_object_t *obj; - zval *zct; + zval zct; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ct_str, &ct_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "S", &ct_str), invalid_arg, return); - if (ct_len && !strchr(ct_str, '/')) { - php_http_throw(unexpected_val, "Content type \"%s\" does not seem to contain a primary and a secondary part", ct_str); + if (ct_str->len && !strchr(ct_str->val, '/')) { + php_http_throw(unexpected_val, "Content type \"%s\" does not seem to contain a primary and a secondary part", ct_str->val); return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj); - MAKE_STD_ZVAL(zct); - ZVAL_STRINGL(zct, ct_str, ct_len, 1); - zend_hash_update(&obj->message->hdrs, "Content-Type", sizeof("Content-Type"), (void *) &zct, sizeof(void *), NULL); + ZVAL_STR_COPY(&zct, ct_str); + zend_hash_str_update(&obj->message->hdrs, "Content-Type", lenof("Content-Type"), &zct); RETVAL_ZVAL(getThis(), 1, 0); } @@ -93,15 +90,15 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientRequest, getContentType) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); zval *zct; PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj); php_http_message_update_headers(obj->message); - zct = php_http_message_header(obj->message, ZEND_STRL("Content-Type"), 1); + zct = php_http_message_header(obj->message, ZEND_STRL("Content-Type")); if (zct) { - RETURN_ZVAL(zct, 0, 1); + RETURN_ZVAL(zct, 1, 0); } } } @@ -111,30 +108,25 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientRequest_setQuery, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientRequest, setQuery) { - zval *qdata = NULL; + zval *qdata = NULL, arr, str; php_http_message_object_t *obj; php_http_url_t *old_url = NULL, new_url = {NULL}; - char empty[] = ""; unsigned flags = PHP_HTTP_URL_REPLACE; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!", &qdata), invalid_arg, return); - - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z!", &qdata), invalid_arg, return); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj); + ZVAL_NULL(&str); if (qdata) { - zval arr, str; - - INIT_PZVAL(&arr); array_init(&arr); - INIT_PZVAL(&str); - ZVAL_NULL(&str); - php_http_expect(SUCCESS == php_http_querystring_update(&arr, qdata, &str TSRMLS_CC), bad_querystring, + php_http_expect(SUCCESS == php_http_querystring_update(&arr, qdata, &str), bad_querystring, zval_dtor(&arr); return; ); + new_url.query = Z_STRVAL(str); zval_dtor(&arr); } else { @@ -145,14 +137,12 @@ static PHP_METHOD(HttpClientRequest, setQuery) old_url = obj->message->http.info.request.url; } - obj->message->http.info.request.url = php_http_url_mod(old_url, &new_url, flags TSRMLS_CC); + obj->message->http.info.request.url = php_http_url_mod(old_url, &new_url, flags); if (old_url) { php_http_url_free(&old_url); } - if (new_url.query != &empty[0]) { - PTR_FREE(new_url.query); - } + zval_ptr_dtor(&str); RETVAL_ZVAL(getThis(), 1, 0); } @@ -162,12 +152,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientRequest, getQuery) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj); if (obj->message->http.info.request.url && obj->message->http.info.request.url->query) { - RETVAL_STRING(obj->message->http.info.request.url->query, 1); + RETVAL_STRING(obj->message->http.info.request.url->query); } } } @@ -181,18 +171,15 @@ static PHP_METHOD(HttpClientRequest, addQuery) php_http_message_object_t *obj; php_http_url_t *old_url = NULL, new_url = {NULL}; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &qdata), invalid_arg, return); - - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z", &qdata), invalid_arg, return); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_CLIENT_REQUEST_OBJECT_INIT(obj); - INIT_PZVAL(&arr); array_init(&arr); - INIT_PZVAL(&str); ZVAL_NULL(&str); - php_http_expect(SUCCESS == php_http_querystring_update(&arr, qdata, &str TSRMLS_CC), bad_querystring, + php_http_expect(SUCCESS == php_http_querystring_update(&arr, qdata, &str), bad_querystring, zval_dtor(&arr); return; ); @@ -203,12 +190,12 @@ static PHP_METHOD(HttpClientRequest, addQuery) old_url = obj->message->http.info.request.url; } - obj->message->http.info.request.url = php_http_url_mod(old_url, &new_url, PHP_HTTP_URL_JOIN_QUERY TSRMLS_CC); + obj->message->http.info.request.url = php_http_url_mod(old_url, &new_url, PHP_HTTP_URL_JOIN_QUERY); if (old_url) { php_http_url_free(&old_url); } - PTR_FREE(new_url.query); + zval_ptr_dtor(&str); RETVAL_ZVAL(getThis(), 1, 0); } @@ -220,9 +207,9 @@ static PHP_METHOD(HttpClientRequest, setOptions) { zval *opts = NULL; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|a!/", &opts), invalid_arg, return); - php_http_client_options_set(getThis(), opts TSRMLS_CC); + php_http_client_options_set(getThis(), opts); RETVAL_ZVAL(getThis(), 1, 0); } @@ -232,7 +219,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientRequest, getOptions) { if (SUCCESS == zend_parse_parameters_none()) { - zval *zoptions = zend_read_property(php_http_client_request_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC); + zval tmp, *zoptions = zend_read_property(php_http_client_request_class_entry, getThis(), ZEND_STRL("options"), 0, &tmp); RETURN_ZVAL(zoptions, 1, 0); } } @@ -244,9 +231,9 @@ static PHP_METHOD(HttpClientRequest, setSslOptions) { zval *opts = NULL; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|a!/", &opts), invalid_arg, return); - php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 1 TSRMLS_CC); + php_http_client_options_set_subr(getThis(), ZEND_STRL("ssl"), opts, 1); RETVAL_ZVAL(getThis(), 1, 0); } @@ -258,9 +245,9 @@ static PHP_METHOD(HttpClientRequest, addSslOptions) { zval *opts = NULL; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|a!/", &opts), invalid_arg, return); - php_http_client_options_set_subr(getThis(), ZEND_STRS("ssl"), opts, 0 TSRMLS_CC); + php_http_client_options_set_subr(getThis(), ZEND_STRL("ssl"), opts, 0); RETVAL_ZVAL(getThis(), 1, 0); } @@ -270,7 +257,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientRequest, getSslOptions) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_client_options_get_subr(getThis(), ZEND_STRS("ssl"), return_value TSRMLS_CC); + php_http_client_options_get_subr(getThis(), ZEND_STRL("ssl"), return_value); } } @@ -296,9 +283,9 @@ PHP_MINIT_FUNCTION(http_client_request) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http\\Client", "Request", php_http_client_request_methods); - php_http_client_request_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry, NULL TSRMLS_CC); + php_http_client_request_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry); - zend_declare_property_null(php_http_client_request_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(php_http_client_request_class_entry, ZEND_STRL("options"), ZEND_ACC_PROTECTED); return SUCCESS; } diff --git a/src/php_http_client_response.c b/src/php_http_client_response.c index 8d512ec..b1377fe 100644 --- a/src/php_http_client_response.c +++ b/src/php_http_client_response.c @@ -18,60 +18,62 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClientResponse_getCookies, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientResponse, getCookies) { - long flags = 0; + zend_long flags = 0; zval *allowed_extras_array = NULL; int i = 0; char **allowed_extras = NULL; - zval *header = NULL, **entry = NULL; - HashPosition pos; + zval *header = NULL, *entry = NULL; php_http_message_object_t *msg; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|la!", &flags, &allowed_extras_array)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|la!/", &flags, &allowed_extras_array)) { return; } - msg = zend_object_store_get_object(getThis() TSRMLS_CC); + msg = PHP_HTTP_OBJ(NULL, getThis()); array_init(return_value); if (allowed_extras_array) { + /* FIXME: use zend_string** instead of char** */ allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *)); - FOREACH_VAL(pos, allowed_extras_array, entry) { - zval *data = php_http_ztyp(IS_STRING, *entry); - allowed_extras[i++] = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data)); - zval_ptr_dtor(&data); + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(allowed_extras_array), entry) + { + zend_string *zs = zval_get_string(entry); + allowed_extras[i++] = estrndup(zs->val, zs->len); + zend_string_release(zs); } + ZEND_HASH_FOREACH_END(); } - if ((header = php_http_message_header(msg->message, ZEND_STRL("Set-Cookie"), 0))) { + if ((header = php_http_message_header(msg->message, ZEND_STRL("Set-Cookie")))) { php_http_cookie_list_t *list; if (Z_TYPE_P(header) == IS_ARRAY) { - zval **single_header; + zval *single_header; - FOREACH_VAL(pos, header, single_header) { - zval *data = php_http_ztyp(IS_STRING, *single_header); + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(header), single_header) + { + zend_string *zs = zval_get_string(single_header); - if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), Z_STRLEN_P(data), flags, allowed_extras TSRMLS_CC))) { - zval *cookie; + if ((list = php_http_cookie_list_parse(NULL, zs->val, zs->len, flags, allowed_extras))) { + zval cookie; - MAKE_STD_ZVAL(cookie); - ZVAL_OBJVAL(cookie, php_http_cookie_object_new_ex(php_http_cookie_class_entry, list, NULL TSRMLS_CC), 0); - add_next_index_zval(return_value, cookie); + ZVAL_OBJ(&cookie, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo); + add_next_index_zval(return_value, &cookie); } - zval_ptr_dtor(&data); + zend_string_release(zs); } + ZEND_HASH_FOREACH_END(); } else { - zval *data = php_http_ztyp(IS_STRING, header); - if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), Z_STRLEN_P(data), flags, allowed_extras TSRMLS_CC))) { - zval *cookie; + zend_string *zs = zval_get_string(header); - MAKE_STD_ZVAL(cookie); - ZVAL_OBJVAL(cookie, php_http_cookie_object_new_ex(php_http_cookie_class_entry, list, NULL TSRMLS_CC), 0); - add_next_index_zval(return_value, cookie); + if ((list = php_http_cookie_list_parse(NULL, zs->val, zs->len, flags, allowed_extras))) { + zval cookie; + + ZVAL_OBJ(&cookie, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo); + add_next_index_zval(return_value, &cookie); } - zval_ptr_dtor(&data); + zend_string_release(zs); } - zval_ptr_dtor(&header); } if (allowed_extras) { @@ -88,12 +90,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpClientResponse, getTransferInfo) { char *info_name = NULL; - int info_len = 0; - zval *info; + size_t info_len = 0; + zval info_tmp, info_name_tmp, *info; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &info_name, &info_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &info_name, &info_len), invalid_arg, return); - info = zend_read_property(php_http_client_response_class_entry, getThis(), ZEND_STRL("transferInfo"), 0 TSRMLS_CC); + info = zend_read_property(php_http_client_response_class_entry, getThis(), ZEND_STRL("transferInfo"), 0, &info_tmp); /* request completed? */ if (Z_TYPE_P(info) != IS_OBJECT) { @@ -102,7 +104,7 @@ static PHP_METHOD(HttpClientResponse, getTransferInfo) } if (info_len && info_name) { - info = zend_read_property(NULL, info, php_http_pretty_key(info_name, info_len, 0, 0), info_len, 0 TSRMLS_CC); + info = zend_read_property(NULL, info, php_http_pretty_key(info_name, info_len, 0, 0), info_len, 0, &info_name_tmp); if (!info) { php_http_throw(unexpected_val, "Could not find transfer info with name '%s'", info_name); @@ -126,8 +128,9 @@ PHP_MINIT_FUNCTION(http_client_response) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http\\Client", "Response", php_http_client_response_methods); - php_http_client_response_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry, NULL TSRMLS_CC); - zend_declare_property_null(php_http_client_response_class_entry, ZEND_STRL("transferInfo"), ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_client_response_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry); + + zend_declare_property_null(php_http_client_response_class_entry, ZEND_STRL("transferInfo"), ZEND_ACC_PROTECTED); return SUCCESS; } diff --git a/src/php_http_cookie.c b/src/php_http_cookie.c index 354dfa6..9625401 100644 --- a/src/php_http_cookie.c +++ b/src/php_http_cookie.c @@ -12,7 +12,7 @@ #include "php_http_api.h" -php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_list_t *list TSRMLS_DC) +php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_list_t *list) { if (!list) { list = emalloc(sizeof(*list)); @@ -27,16 +27,12 @@ php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_list_t *list T list->max_age = -1; list->flags = 0; - TSRMLS_SET_CTX(list->ts); - return list; } php_http_cookie_list_t *php_http_cookie_list_copy(php_http_cookie_list_t *from, php_http_cookie_list_t *to) { - TSRMLS_FETCH_FROM_CTX(from->ts); - - to = php_http_cookie_list_init(to TSRMLS_CC); + to = php_http_cookie_list_init(to); array_copy(&from->cookies, &to->cookies); array_copy(&from->extras, &to->extras); @@ -72,132 +68,135 @@ void php_http_cookie_list_free(php_http_cookie_list_t **list) } } -const char *php_http_cookie_list_get_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, zval **zcookie) +const char *php_http_cookie_list_get_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, zval *zcookie) { - zval **cookie; - if ((SUCCESS != zend_symtable_find(&list->cookies, name, name_len + 1, (void *) &cookie)) || (Z_TYPE_PP(cookie) != IS_STRING)) { + zval *cookie = zend_symtable_str_find(&list->cookies, name, name_len); + + if (!cookie || (Z_TYPE_P(cookie) != IS_STRING)) { return NULL; } if (zcookie) { *zcookie = *cookie; } - return Z_STRVAL_PP(cookie); + return Z_STRVAL_P(cookie); } -const char *php_http_cookie_list_get_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, zval **zextra) +const char *php_http_cookie_list_get_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, zval *zextra) { - zval **extra; + zval *extra = zend_symtable_str_find(&list->extras, name, name_len); - if ((SUCCESS != zend_symtable_find(&list->extras, name, name_len + 1, (void *) &extra)) || (Z_TYPE_PP(extra) != IS_STRING)) { + if (!extra || (Z_TYPE_P(extra) != IS_STRING)) { return NULL; } if (zextra) { *zextra = *extra; } - return Z_STRVAL_PP(extra); + return Z_STRVAL_P(extra); } void php_http_cookie_list_add_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len) { - zval *cookie_value; + zval cookie_value; - MAKE_STD_ZVAL(cookie_value); - ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0); - zend_symtable_update(&list->cookies, name, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL); + ZVAL_STRINGL(&cookie_value, value, value_len); + zend_symtable_str_update(&list->cookies, name, name_len, &cookie_value); } void php_http_cookie_list_add_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len) { - zval *cookie_value; + zval extra_value; - MAKE_STD_ZVAL(cookie_value); - ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0); - zend_symtable_update(&list->extras, name, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL); + ZVAL_STRINGL(&extra_value, value, value_len); + zend_symtable_str_update(&list->extras, name, name_len, &extra_value); } -#define _KEY_IS(s) (key->len == sizeof(s) && !strncasecmp(key->str, (s), key->len)) -static void add_entry(php_http_cookie_list_t *list, char **allowed_extras, long flags, php_http_array_hashkey_t *key, zval *val) +#define _KEY_IS(s) (key->key && key->key->len == sizeof(s)-1 && !strncasecmp(key->key->val, (s), key->key->len)) +static void add_entry(php_http_cookie_list_t *list, char **allowed_extras, long flags, zend_hash_key *key, zval *val) { - zval *arg = php_http_zsep(1, IS_STRING, val); + zval arg; + + ZVAL_DUP(&arg, val); + convert_to_string(&arg); if (!(flags & PHP_HTTP_COOKIE_PARSE_RAW)) { - Z_STRLEN_P(arg) = php_raw_url_decode(Z_STRVAL_P(arg), Z_STRLEN_P(arg)); + Z_STRLEN(arg) = php_raw_url_decode(Z_STRVAL(arg), Z_STRLEN(arg)); + zend_string_forget_hash_val(Z_STR(arg)); } if _KEY_IS("path") { - PTR_SET(list->path, estrndup(Z_STRVAL_P(arg), Z_STRLEN_P(arg))); + PTR_SET(list->path, estrndup(Z_STRVAL(arg), Z_STRLEN(arg))); } else if _KEY_IS("domain") { - PTR_SET(list->domain, estrndup(Z_STRVAL_P(arg), Z_STRLEN_P(arg))); + PTR_SET(list->domain, estrndup(Z_STRVAL(arg), Z_STRLEN(arg))); } else if _KEY_IS("expires") { - char *date = estrndup(Z_STRVAL_P(arg), Z_STRLEN_P(arg)); + char *date = estrndup(Z_STRVAL(arg), Z_STRLEN(arg)); list->expires = php_parse_date(date, NULL); efree(date); } else if _KEY_IS("max-age") { - list->max_age = strtol(Z_STRVAL_P(arg), NULL, 10); + list->max_age = zval_get_long(val); } else if _KEY_IS("secure") { list->flags |= PHP_HTTP_COOKIE_SECURE; } else if _KEY_IS("httpOnly") { list->flags |= PHP_HTTP_COOKIE_HTTPONLY; } else { + php_http_arrkey_t tmp = {0}; + + php_http_arrkey_stringify(&tmp, key); + /* check for extra */ if (allowed_extras) { char **ae = allowed_extras; - - php_http_array_hashkey_stringify(key); for (; *ae; ++ae) { - if (!strncasecmp(key->str, *ae, key->len)) { - if (key->type == HASH_KEY_IS_LONG) { - zend_hash_index_update(&list->extras, key->num, (void *) &arg, sizeof(zval *), NULL); - } else { - zend_hash_update(&list->extras, key->str, key->len, (void *) &arg, sizeof(zval *), NULL); - } - php_http_array_hashkey_stringfree(key); + if (!strncasecmp(*ae, tmp.key->val, tmp.key->len)) { + zend_symtable_update(&list->extras, tmp.key, &arg); + php_http_arrkey_dtor(&tmp); return; } } - php_http_array_hashkey_stringfree(key); } /* cookie */ - if (key->type == HASH_KEY_IS_LONG) { - zend_hash_index_update(&list->cookies, key->num, (void *) &arg, sizeof(zval *), NULL); - } else { - zend_hash_update(&list->cookies, key->str, key->len, (void *) &arg, sizeof(zval *), NULL); - } + zend_symtable_update(&list->cookies, tmp.key, &arg); + + php_http_arrkey_dtor(&tmp); return; } + zval_ptr_dtor(&arg); } -php_http_cookie_list_t *php_http_cookie_list_parse(php_http_cookie_list_t *list, const char *str, size_t len, long flags, char **allowed_extras TSRMLS_DC) +php_http_cookie_list_t *php_http_cookie_list_parse(php_http_cookie_list_t *list, const char *str, size_t len, long flags, char **allowed_extras) { php_http_params_opts_t opts; HashTable params; - HashPosition pos1, pos2; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - zval **param, **val, **args, **arg; + zend_hash_key k, arg_k; + zval *param, *val, *args, *arg; php_http_params_opts_default_get(&opts); opts.input.str = estrndup(str, len); opts.input.len = len; opts.param = NULL; zend_hash_init(¶ms, 10, NULL, ZVAL_PTR_DTOR, 0); - php_http_params_parse(¶ms, &opts TSRMLS_CC); + php_http_params_parse(¶ms, &opts); efree(opts.input.str); - list = php_http_cookie_list_init(list TSRMLS_CC); - FOREACH_HASH_KEYVAL(pos1, ¶ms, key, param) { - if (Z_TYPE_PP(param) == IS_ARRAY) { - if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(param), ZEND_STRS("value"), (void *) &val)) { - add_entry(list, NULL, flags, &key, *val); + list = php_http_cookie_list_init(list); + ZEND_HASH_FOREACH_KEY_VAL(¶ms, k.h, k.key, param) + { + if (Z_TYPE_P(param) == IS_ARRAY) { + if ((val = zend_hash_str_find(Z_ARRVAL_P(param), ZEND_STRL("value")))) { + add_entry(list, NULL, flags, &k, val); } - if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(param), ZEND_STRS("arguments"), (void *) &args) && Z_TYPE_PP(args) == IS_ARRAY) { - FOREACH_KEYVAL(pos2, *args, key, arg) { - add_entry(list, allowed_extras, flags, &key, *arg); + if ((args = zend_hash_str_find(Z_ARRVAL_P(param), ZEND_STRL("arguments"))) && Z_TYPE_P(args) == IS_ARRAY) { + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(args), arg_k.h, arg_k.key, arg) + { + add_entry(list, allowed_extras, flags, &arg_k, arg); } + ZEND_HASH_FOREACH_END(); } } } + ZEND_HASH_FOREACH_END(); + zend_hash_destroy(¶ms); return list; @@ -205,81 +204,87 @@ php_http_cookie_list_t *php_http_cookie_list_parse(php_http_cookie_list_t *list, void php_http_cookie_list_to_struct(php_http_cookie_list_t *list, zval *strct) { - zval array, *cookies, *extras; - TSRMLS_FETCH_FROM_CTX(list->ts); - - INIT_PZVAL_ARRAY(&array, HASH_OF(strct)); + zval cookies, extras, tmp; + HashTable *ht = HASH_OF(strct); - MAKE_STD_ZVAL(cookies); - array_init(cookies); - zend_hash_copy(Z_ARRVAL_P(cookies), &list->cookies, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - add_assoc_zval(&array, "cookies", cookies); + array_init_size(&cookies, zend_hash_num_elements(&list->cookies)); + array_copy(&list->cookies, Z_ARRVAL(cookies)); + zend_symtable_str_update(ht, ZEND_STRL("cookies"), &cookies); - MAKE_STD_ZVAL(extras); - array_init(extras); - zend_hash_copy(Z_ARRVAL_P(extras), &list->extras, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - add_assoc_zval(&array, "extras", extras); + array_init_size(&extras, zend_hash_num_elements(&list->extras)); + array_copy(&list->extras, Z_ARRVAL(extras)); + zend_symtable_str_update(ht, ZEND_STRL("extras"), &extras); - add_assoc_long(&array, "flags", list->flags); - add_assoc_long(&array, "expires", (long) list->expires); - add_assoc_long(&array, "max-age", (long) list->max_age); - add_assoc_string(&array, "path", STR_PTR(list->path), 1); - add_assoc_string(&array, "domain", STR_PTR(list->domain), 1); + ZVAL_LONG(&tmp, list->flags); + zend_symtable_str_update(ht, ZEND_STRL("flags"), &tmp); + ZVAL_LONG(&tmp, list->expires); + zend_symtable_str_update(ht, ZEND_STRL("expires"), &tmp); + ZVAL_LONG(&tmp, list->max_age); + zend_symtable_str_update(ht, ZEND_STRL("max-age"), &tmp); + ZVAL_STRING(&tmp, STR_PTR(list->path)); + zend_symtable_str_update(ht, ZEND_STRL("path"), &tmp); + ZVAL_STRING(&tmp, STR_PTR(list->domain)); + zend_symtable_str_update(ht, ZEND_STRL("domain"), &tmp); } -php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_cookie_list_t *list, zval *strct TSRMLS_DC) +php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_cookie_list_t *list, zval *strct) { - zval **tmp, *cpy; - HashTable *ht = HASH_OF(strct); - - list = php_http_cookie_list_init(list TSRMLS_CC); - - if (SUCCESS == zend_hash_find(ht, "cookies", sizeof("cookies"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_ARRAY) { - zend_hash_copy(&list->cookies, Z_ARRVAL_PP(tmp), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + zval *tmp; + HashTable *ht; + + ht = HASH_OF(strct); + list = php_http_cookie_list_init(list); + + if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("cookies"))) && Z_TYPE_P(tmp) == IS_ARRAY){ + array_copy(Z_ARRVAL_P(tmp), &list->cookies); } - if (SUCCESS == zend_hash_find(ht, "extras", sizeof("extras"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_ARRAY) { - zend_hash_copy(&list->extras, Z_ARRVAL_PP(tmp), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("extras"))) && Z_TYPE_P(tmp) == IS_ARRAY){ + array_copy(Z_ARRVAL_P(tmp), &list->extras); } - if (SUCCESS == zend_hash_find(ht, "flags", sizeof("flags"), (void *) &tmp)) { - cpy = php_http_ztyp(IS_LONG, *tmp); - list->flags = Z_LVAL_P(cpy); - zval_ptr_dtor(&cpy); + if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("flags")))) { + list->flags = zval_get_long(tmp); } - if (SUCCESS == zend_hash_find(ht, "expires", sizeof("expires"), (void *) &tmp)) { - if (Z_TYPE_PP(tmp) == IS_LONG) { - list->expires = Z_LVAL_PP(tmp); + if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("expires")))) { + if (Z_TYPE_P(tmp) == IS_LONG) { + list->expires = Z_LVAL_P(tmp); } else { - long lval; + zend_long lval; + zend_string *lstr = zval_get_string(tmp); - cpy = php_http_ztyp(IS_STRING, *tmp); - if (IS_LONG == is_numeric_string(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy), &lval, NULL, 0)) { + if (IS_LONG == is_numeric_string(lstr->val, lstr->len, &lval, NULL, 0)) { list->expires = lval; } else { - list->expires = php_parse_date(Z_STRVAL_P(cpy), NULL); + list->expires = php_parse_date(lstr->val, NULL); } - zval_ptr_dtor(&cpy); + zend_string_release(lstr); } } - if (SUCCESS == zend_hash_find(ht, "max-age", sizeof("max-age"), (void *) &tmp)) { - if (Z_TYPE_PP(tmp) == IS_LONG) { - list->max_age = Z_LVAL_PP(tmp); + if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("max-age")))) { + if (Z_TYPE_P(tmp) == IS_LONG) { + list->max_age = Z_LVAL_P(tmp); } else { - long lval; + zend_long lval; + zend_string *lstr = zval_get_string(tmp); - cpy = php_http_ztyp(IS_STRING, *tmp); - if (IS_LONG == is_numeric_string(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy), &lval, NULL, 0)) { + if (IS_LONG == is_numeric_string(lstr->val, lstr->len, &lval, NULL, 0)) { list->max_age = lval; } - zval_ptr_dtor(&cpy); + zend_string_release(lstr); } } - if (SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_STRING) { - list->path = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp)); + if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("path")))) { + zend_string *str = zval_get_string(tmp); + + list->path = estrndup(str->val, str->len); + zend_string_release(str); } - if (SUCCESS == zend_hash_find(ht, "domain", sizeof("domain"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_STRING) { - list->domain = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp)); + if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("domain")))) { + zend_string *str = zval_get_string(tmp); + + list->domain = estrndup(str->val, str->len); + zend_string_release(str); } return list; @@ -287,40 +292,39 @@ php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_cookie_list_t static inline void append_encoded(php_http_buffer_t *buf, const char *key, size_t key_len, const char *val, size_t val_len) { - char *enc_str[2]; - int enc_len[2]; + zend_string *enc_str[2]; - enc_str[0] = php_raw_url_encode(key, key_len, &enc_len[0]); - enc_str[1] = php_raw_url_encode(val, val_len, &enc_len[1]); + enc_str[0] = php_raw_url_encode(key, key_len); + enc_str[1] = php_raw_url_encode(val, val_len); - php_http_buffer_append(buf, enc_str[0], enc_len[0]); + php_http_buffer_append(buf, enc_str[0]->val, enc_str[0]->len); php_http_buffer_appends(buf, "="); - php_http_buffer_append(buf, enc_str[1], enc_len[1]); + php_http_buffer_append(buf, enc_str[1]->val, enc_str[1]->len); php_http_buffer_appends(buf, "; "); - efree(enc_str[0]); - efree(enc_str[1]); + zend_string_release(enc_str[0]); + zend_string_release(enc_str[1]); } void php_http_cookie_list_to_string(php_http_cookie_list_t *list, char **str, size_t *len) { php_http_buffer_t buf; - zval **val; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - HashPosition pos; - TSRMLS_FETCH_FROM_CTX(list->ts); + zend_hash_key key; + zval *val; php_http_buffer_init(&buf); - - FOREACH_HASH_KEYVAL(pos, &list->cookies, key, val) { - zval *tmp = php_http_ztyp(IS_STRING, *val); - php_http_array_hashkey_stringify(&key); - append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); - php_http_array_hashkey_stringfree(&key); + ZEND_HASH_FOREACH_KEY_VAL(&list->cookies, key.h, key.key, val) + { + zend_string *str = zval_get_string(val); + php_http_arrkey_t arrkey = {0}; - zval_ptr_dtor(&tmp); + php_http_arrkey_stringify(&arrkey, &key); + append_encoded(&buf, arrkey.key->val, arrkey.key->len, str->val, str->len); + php_http_arrkey_dtor(&arrkey); + zend_string_release(str); } + ZEND_HASH_FOREACH_END(); if (list->domain && *list->domain) { php_http_buffer_appendf(&buf, "domain=%s; ", list->domain); @@ -329,23 +333,25 @@ void php_http_cookie_list_to_string(php_http_cookie_list_t *list, char **str, si php_http_buffer_appendf(&buf, "path=%s; ", list->path); } if (list->expires >= 0) { - char *date = php_format_date(ZEND_STRL(PHP_HTTP_DATE_FORMAT), list->expires, 0 TSRMLS_CC); - php_http_buffer_appendf(&buf, "expires=%s; ", date); - efree(date); + zend_string *date = php_format_date(ZEND_STRL(PHP_HTTP_DATE_FORMAT), list->expires, 0); + php_http_buffer_appendf(&buf, "expires=%s; ", date->val); + zend_string_release(date); } if (list->max_age >= 0) { php_http_buffer_appendf(&buf, "max-age=%ld; ", list->max_age); } - FOREACH_HASH_KEYVAL(pos, &list->extras, key, val) { - zval *tmp = php_http_ztyp(IS_STRING, *val); - - php_http_array_hashkey_stringify(&key); - append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); - php_http_array_hashkey_stringfree(&key); - - zval_ptr_dtor(&tmp); + ZEND_HASH_FOREACH_KEY_VAL(&list->extras, key.h, key.key, val) + { + zend_string *str = zval_get_string(val); + php_http_arrkey_t arrkey; + + php_http_arrkey_stringify(&arrkey, &key); + append_encoded(&buf, arrkey.key->val, arrkey.key->len, str->val, str->len); + php_http_arrkey_dtor(&arrkey); + zend_string_release(str); } + ZEND_HASH_FOREACH_END(); if (list->flags & PHP_HTTP_COOKIE_SECURE) { php_http_buffer_appends(&buf, "secure; "); @@ -363,60 +369,56 @@ void php_http_cookie_list_to_string(php_http_cookie_list_t *list, char **str, si static zend_object_handlers php_http_cookie_object_handlers; -zend_object_value php_http_cookie_object_new(zend_class_entry *ce TSRMLS_DC) +zend_object *php_http_cookie_object_new(zend_class_entry *ce) { - return php_http_cookie_object_new_ex(ce, NULL, NULL TSRMLS_CC); + return &php_http_cookie_object_new_ex(ce, NULL)->zo; } -zend_object_value php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_cookie_list_t *list, php_http_cookie_object_t **ptr TSRMLS_DC) +php_http_cookie_object_t *php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_cookie_list_t *list) { php_http_cookie_object_t *o; - o = ecalloc(sizeof(*o), 1); - zend_object_std_init((zend_object *) o, ce TSRMLS_CC); - object_properties_init((zend_object *) o, ce); + if (!ce) { + ce = php_http_cookie_class_entry; + } + + o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); + zend_object_std_init(&o->zo, ce); + object_properties_init(&o->zo, ce); + o->zo.handlers = &php_http_cookie_object_handlers; if (list) { o->list = list; } - if (ptr) { - *ptr = o; - } - - o->zv.handle = zend_objects_store_put(o, NULL, php_http_cookie_object_free, NULL TSRMLS_CC); - o->zv.handlers = &php_http_cookie_object_handlers; - - return o->zv; + return o; } #define PHP_HTTP_COOKIE_OBJECT_INIT(obj) \ do { \ if (!obj->list) { \ - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); \ + obj->list = php_http_cookie_list_init(NULL); \ } \ } while(0) -zend_object_value php_http_cookie_object_clone(zval *this_ptr TSRMLS_DC) +zend_object *php_http_cookie_object_clone(zval *obj) { - php_http_cookie_object_t *new_obj, *old_obj = zend_object_store_get_object(getThis() TSRMLS_CC); - zend_object_value ov; + php_http_cookie_object_t *new_obj, *old_obj = PHP_HTTP_OBJ(NULL, obj); PHP_HTTP_COOKIE_OBJECT_INIT(old_obj); - ov = php_http_cookie_object_new_ex(old_obj->zo.ce, php_http_cookie_list_copy(old_obj->list, NULL), &new_obj TSRMLS_CC); - zend_objects_clone_members((zend_object *) new_obj, ov, (zend_object *) old_obj, Z_OBJ_HANDLE_P(getThis()) TSRMLS_CC); + new_obj = php_http_cookie_object_new_ex(old_obj->zo.ce, php_http_cookie_list_copy(old_obj->list, NULL)); + zend_objects_clone_members(&new_obj->zo, &old_obj->zo); - return ov; + return &new_obj->zo; } -void php_http_cookie_object_free(void *object TSRMLS_DC) +void php_http_cookie_object_free(zend_object *object) { - php_http_cookie_object_t *obj = object; + php_http_cookie_object_t *obj = PHP_HTTP_OBJ(object, NULL); php_http_cookie_list_free(&obj->list); - zend_object_std_dtor((zend_object *) obj TSRMLS_CC); - efree(obj); + zend_object_std_dtor(object); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie___construct, 0, 0, 0) @@ -433,32 +435,33 @@ static PHP_METHOD(HttpCookie, __construct) HashTable *allowed_extras = NULL; zend_error_handling zeh; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!lH", &zcookie, &flags, &allowed_extras), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z!lH", &zcookie, &flags, &allowed_extras), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); - zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh); if (zcookie) { if (allowed_extras && zend_hash_num_elements(allowed_extras)) { char **ae_ptr = safe_emalloc(zend_hash_num_elements(allowed_extras) + 1, sizeof(char *), 0); - HashPosition pos; - zval **val; + zval *val; ae = ae_ptr; - FOREACH_HASH_VAL(pos, allowed_extras, val) { - zval *cpy = php_http_ztyp(IS_STRING, *val); + ZEND_HASH_FOREACH_VAL(allowed_extras, val) + { + zend_string *str = zval_get_string(val); - *ae_ptr++ = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)); - zval_ptr_dtor(&cpy); + *ae_ptr++ = estrndup(str->val, str->len); + zend_string_release(str); } + ZEND_HASH_FOREACH_END(); *ae_ptr = NULL; } switch (Z_TYPE_P(zcookie)) { case IS_OBJECT: - if (instanceof_function(Z_OBJCE_P(zcookie), php_http_cookie_class_entry TSRMLS_CC)) { - php_http_cookie_object_t *zco = zend_object_store_get_object(zcookie TSRMLS_CC); + if (instanceof_function(Z_OBJCE_P(zcookie), php_http_cookie_class_entry)) { + php_http_cookie_object_t *zco = PHP_HTTP_OBJ(NULL, zcookie); if (zco->list) { obj->list = php_http_cookie_list_copy(zco->list, NULL); @@ -467,13 +470,13 @@ static PHP_METHOD(HttpCookie, __construct) } /* no break */ case IS_ARRAY: - obj->list = php_http_cookie_list_from_struct(obj->list, zcookie TSRMLS_CC); + obj->list = php_http_cookie_list_from_struct(obj->list, zcookie); break; default: { - zval *cpy = php_http_ztyp(IS_STRING, zcookie); + zend_string *str = zval_get_string(zcookie); - obj->list = php_http_cookie_list_parse(obj->list, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy), flags, ae TSRMLS_CC); - zval_ptr_dtor(&cpy); + obj->list = php_http_cookie_list_parse(obj->list, str->val, str->len, flags, ae); + zend_string_release(str); break; } } @@ -487,7 +490,7 @@ static PHP_METHOD(HttpCookie, __construct) efree(ae); } } - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); PHP_HTTP_COOKIE_OBJECT_INIT(obj); } @@ -502,11 +505,11 @@ static PHP_METHOD(HttpCookie, getCookies) return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); - array_init(return_value); + array_init_size(return_value, zend_hash_num_elements(&obj->list->cookies)); array_copy(&obj->list->cookies, Z_ARRVAL_P(return_value)); } @@ -518,9 +521,9 @@ static PHP_METHOD(HttpCookie, setCookies) HashTable *cookies = NULL; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H", &cookies), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|H", &cookies), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -529,7 +532,7 @@ static PHP_METHOD(HttpCookie, setCookies) array_copy_strings(cookies, &obj->list->cookies); } - RETVAL_ZVAL(getThis(), 1, 0); + RETURN_ZVAL(getThis(), 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_addCookies, 0, 0, 1) @@ -540,9 +543,9 @@ static PHP_METHOD(HttpCookie, addCookies) HashTable *cookies = NULL; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &cookies), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "H", &cookies), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -561,11 +564,11 @@ static PHP_METHOD(HttpCookie, getExtras) return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); - array_init(return_value); + array_init_size(return_value, zend_hash_num_elements(&obj->list->extras)); array_copy(&obj->list->extras, Z_ARRVAL_P(return_value)); } @@ -577,9 +580,9 @@ static PHP_METHOD(HttpCookie, setExtras) HashTable *extras = NULL; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H", &extras), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|H", &extras), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -599,9 +602,9 @@ static PHP_METHOD(HttpCookie, addExtras) HashTable *extras = NULL; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &extras), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "H", &extras), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -616,20 +619,20 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpCookie, getCookie) { char *name_str; - int name_len; - zval *zvalue; + size_t name_len; + zval zvalue; php_http_cookie_object_t *obj; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name_str, &name_len)) { return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); if (php_http_cookie_list_get_cookie(obj->list, name_str, name_len, &zvalue)) { - RETURN_ZVAL(zvalue, 1, 0); + RETURN_ZVAL(&zvalue, 1, 0); } } @@ -640,12 +643,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpCookie, setCookie) { char *name_str, *value_str = NULL; - int name_len, value_len = 0; + size_t name_len, value_len = 0; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|s!", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -665,12 +668,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpCookie, addCookie) { char *name_str, *value_str; - int name_len, value_len; + size_t name_len, value_len; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -685,20 +688,20 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpCookie, getExtra) { char *name_str; - int name_len; - zval *zvalue; + size_t name_len; + zval zvalue; php_http_cookie_object_t *obj; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name_str, &name_len)) { return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); if (php_http_cookie_list_get_extra(obj->list, name_str, name_len, &zvalue)) { - RETURN_ZVAL(zvalue, 1, 0); + RETURN_ZVAL(&zvalue, 1, 0); } } @@ -709,12 +712,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpCookie, setExtra) { char *name_str, *value_str = NULL; - int name_len, value_len = 0; + size_t name_len, value_len = 0; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|s!", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -734,12 +737,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpCookie, addExtra) { char *name_str, *value_str; - int name_len, value_len; + size_t name_len, value_len; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -758,12 +761,12 @@ static PHP_METHOD(HttpCookie, getDomain) return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); if (obj->list->domain) { - RETURN_STRING(obj->list->domain, 1); + RETURN_STRING(obj->list->domain); } } @@ -773,12 +776,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpCookie, setDomain) { char *domain_str = NULL; - int domain_len = 0; + size_t domain_len = 0; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &domain_str, &domain_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &domain_str, &domain_len), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -797,12 +800,12 @@ static PHP_METHOD(HttpCookie, getPath) return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); if (obj->list->path) { - RETURN_STRING(obj->list->path, 1); + RETURN_STRING(obj->list->path); } } @@ -812,12 +815,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpCookie, setPath) { char *path_str = NULL; - int path_len = 0; + size_t path_len = 0; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &path_str, &path_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &path_str, &path_len), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -836,7 +839,7 @@ static PHP_METHOD(HttpCookie, getExpires) return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -851,9 +854,9 @@ static PHP_METHOD(HttpCookie, setExpires) long ts = -1; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &ts), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &ts), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -872,7 +875,7 @@ static PHP_METHOD(HttpCookie, getMaxAge) return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -884,16 +887,16 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setMaxAge, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpCookie, setMaxAge) { - long ts = -1; + long ma = -1; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &ts), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &ma), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); - obj->list->max_age = ts; + obj->list->max_age = ma; RETVAL_ZVAL(getThis(), 1, 0); } @@ -908,7 +911,7 @@ static PHP_METHOD(HttpCookie, getFlags) return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -923,9 +926,9 @@ static PHP_METHOD(HttpCookie, setFlags) long flags = 0; php_http_cookie_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); @@ -946,13 +949,13 @@ static PHP_METHOD(HttpCookie, toString) RETURN_EMPTY_STRING(); } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); php_http_cookie_list_to_string(obj->list, &str, &len); - RETURN_STRINGL(str, len, 0); + RETURN_NEW_STR(php_http_cs2zs(str, len)); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_toArray, 0, 0, 0) @@ -965,11 +968,11 @@ static PHP_METHOD(HttpCookie, toArray) return; } - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_COOKIE_OBJECT_INIT(obj); - array_init(return_value); + array_init_size(return_value, 8); php_http_cookie_list_to_struct(obj->list, return_value); } @@ -1014,14 +1017,16 @@ PHP_MINIT_FUNCTION(http_cookie) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http", "Cookie", php_http_cookie_methods); - php_http_cookie_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_http_cookie_class_entry = zend_register_internal_class(&ce); php_http_cookie_class_entry->create_object = php_http_cookie_object_new; memcpy(&php_http_cookie_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_http_cookie_object_handlers.offset = XtOffsetOf(php_http_cookie_object_t, zo); php_http_cookie_object_handlers.clone_obj = php_http_cookie_object_clone; + php_http_cookie_object_handlers.free_obj = php_http_cookie_object_free; - zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_COOKIE_PARSE_RAW TSRMLS_CC); - zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("SECURE"), PHP_HTTP_COOKIE_SECURE TSRMLS_CC); - zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("HTTPONLY"), PHP_HTTP_COOKIE_HTTPONLY TSRMLS_CC); + zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_COOKIE_PARSE_RAW); + zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("SECURE"), PHP_HTTP_COOKIE_SECURE); + zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("HTTPONLY"), PHP_HTTP_COOKIE_HTTPONLY); return SUCCESS; } diff --git a/src/php_http_cookie.h b/src/php_http_cookie.h index 7cf00fe..f7dbf8d 100644 --- a/src/php_http_cookie.h +++ b/src/php_http_cookie.h @@ -31,44 +31,39 @@ typedef struct php_http_cookie_list { char *domain; time_t expires; time_t max_age; - -#ifdef ZTS - void ***ts; -#endif } php_http_cookie_list_t; -PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_list_t *list TSRMLS_DC); -PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_parse(php_http_cookie_list_t *list, const char *str, size_t len, long flags, char **allowed_extras TSRMLS_DC); +PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_list_t *list); +PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_parse(php_http_cookie_list_t *list, const char *str, size_t len, long flags, char **allowed_extras); PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_copy(php_http_cookie_list_t *from, php_http_cookie_list_t *to); PHP_HTTP_API void php_http_cookie_list_dtor(php_http_cookie_list_t *list); PHP_HTTP_API void php_http_cookie_list_free(php_http_cookie_list_t **list); -#define php_http_cookie_list_has_cookie(list, name, name_len) zend_symtable_exists(&(list)->cookies, (name), (name_len)+1) -#define php_http_cookie_list_del_cookie(list, name, name_len) zend_symtable_del(&(list)->cookies, (name), (name_len)+1) +#define php_http_cookie_list_has_cookie(list, name, name_len) zend_symtable_str_exists(&(list)->cookies, (name), (name_len)) +#define php_http_cookie_list_del_cookie(list, name, name_len) zend_symtable_str_del(&(list)->cookies, (name), (name_len)) PHP_HTTP_API void php_http_cookie_list_add_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len); -PHP_HTTP_API const char *php_http_cookie_list_get_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, zval **cookie); +PHP_HTTP_API const char *php_http_cookie_list_get_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, zval *cookie); -#define php_http_cookie_list_has_extra(list, name, name_len) zend_symtable_exists(&(list)->extras, (name), (name_len)+1) -#define php_http_cookie_list_del_extra(list, name, name_len) zend_symtable_del(&(list)->extras, (name), (name_len)+1) +#define php_http_cookie_list_has_extra(list, name, name_len) zend_symtable_str_exists(&(list)->extras, (name), (name_len)) +#define php_http_cookie_list_del_extra(list, name, name_len) zend_symtable_str_del(&(list)->extras, (name), (name_len)) PHP_HTTP_API void php_http_cookie_list_add_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len); -PHP_HTTP_API const char *php_http_cookie_list_get_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, zval **extra); +PHP_HTTP_API const char *php_http_cookie_list_get_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, zval *extra); PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, char **str, size_t *len); -PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_cookie_list_t *list, zval *strct TSRMLS_DC); +PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_cookie_list_t *list, zval *strct); PHP_HTTP_API void php_http_cookie_list_to_struct(php_http_cookie_list_t *list, zval *strct); PHP_HTTP_API zend_class_entry *php_http_cookie_class_entry; typedef struct php_http_cookie_object { - zend_object zo; - zend_object_value zv; php_http_cookie_list_t *list; + zend_object zo; } php_http_cookie_object_t; -zend_object_value php_http_cookie_object_new(zend_class_entry *ce TSRMLS_DC); -zend_object_value php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_cookie_list_t *list, php_http_cookie_object_t **obj TSRMLS_DC); -zend_object_value php_http_cookie_object_clone(zval *this_ptr TSRMLS_DC); -void php_http_cookie_object_free(void *object TSRMLS_DC); +zend_object *php_http_cookie_object_new(zend_class_entry *ce); +php_http_cookie_object_t *php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_cookie_list_t *list); +zend_object *php_http_cookie_object_clone(zval *this_ptr); +void php_http_cookie_object_free(zend_object *object); PHP_MINIT_FUNCTION(http_cookie); diff --git a/src/php_http_encoding.c b/src/php_http_encoding.c index 286f2b5..e7557a0 100644 --- a/src/php_http_encoding.c +++ b/src/php_http_encoding.c @@ -28,7 +28,7 @@ static inline int eol_match(char **line, int *eol_len) } } -const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC) +const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len) { int eol_len = 0; char *n_ptr = NULL; @@ -50,13 +50,13 @@ const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c * not encoded data and return a copy */ if (e_ptr == encoded) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Data does not seem to be chunked encoded"); + php_error_docref(NULL, E_NOTICE, "Data does not seem to be chunked encoded"); memcpy(*decoded, encoded, encoded_len); *decoded_len = encoded_len; return encoded + encoded_len; } else { efree(*decoded); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected chunk size at pos %tu of %zu but got trash", n_ptr - encoded, encoded_len); + php_error_docref(NULL, E_WARNING, "Expected chunk size at pos %tu of %zu but got trash", n_ptr - encoded, encoded_len); return NULL; } } @@ -79,16 +79,16 @@ const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c /* there should be CRLF after the chunk size, but we'll ignore SP+ too */ if (*n_ptr && !eol_match(&n_ptr, &eol_len)) { if (eol_len == 2) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected CRLF at pos %tu of %zu but got 0x%02X 0x%02X", n_ptr - encoded, encoded_len, *n_ptr, *(n_ptr + 1)); + php_error_docref(NULL, E_WARNING, "Expected CRLF at pos %tu of %zu but got 0x%02X 0x%02X", n_ptr - encoded, encoded_len, *n_ptr, *(n_ptr + 1)); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected LF at pos %tu of %zu but got 0x%02X", n_ptr - encoded, encoded_len, *n_ptr); + php_error_docref(NULL, E_WARNING, "Expected LF at pos %tu of %zu but got 0x%02X", n_ptr - encoded, encoded_len, *n_ptr); } } n_ptr += eol_len; /* chunk size pretends more data than we actually got, so it's probably a truncated message */ if (chunk_len > (rest = encoded + encoded_len - n_ptr)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Truncated message: chunk size %lu exceeds remaining data size %lu at pos %tu of %zu", chunk_len, rest, n_ptr - encoded, encoded_len); + php_error_docref(NULL, E_WARNING, "Truncated message: chunk size %lu exceeds remaining data size %lu at pos %tu of %zu", chunk_len, rest, n_ptr - encoded, encoded_len); chunk_len = rest; } @@ -148,7 +148,7 @@ static inline int php_http_inflate_rounds(z_stream *Z, int flush, char **buf, si return status; } -ZEND_RESULT_CODE php_http_encoding_deflate(int flags, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC) +ZEND_RESULT_CODE php_http_encoding_deflate(int flags, const char *data, size_t data_len, char **encoded, size_t *encoded_len) { int status, level, wbits, strategy; z_stream Z; @@ -185,11 +185,11 @@ ZEND_RESULT_CODE php_http_encoding_deflate(int flags, const char *data, size_t d } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not deflate data: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Could not deflate data: %s", zError(status)); return FAILURE; } -ZEND_RESULT_CODE php_http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC) +ZEND_RESULT_CODE php_http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len) { z_stream Z; int status, wbits = PHP_HTTP_WINDOW_BITS_ANY; @@ -227,11 +227,11 @@ retry_raw_inflate: } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not inflate data: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Could not inflate data: %s", zError(status)); return FAILURE; } -php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stream_t *s, php_http_encoding_stream_ops_t *ops, unsigned flags TSRMLS_DC) +php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stream_t *s, php_http_encoding_stream_ops_t *ops, unsigned flags) { int freeme; @@ -241,7 +241,6 @@ php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stre memset(s, 0, sizeof(*s)); s->flags = flags; - TSRMLS_SET_CTX(s->ts); if ((s->ops = ops)) { php_http_encoding_stream_t *ss = s->ops->init(s); @@ -261,8 +260,6 @@ php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stre php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to) { - TSRMLS_FETCH_FROM_CTX(from->ts); - if (from->ops->copy) { int freeme; php_http_encoding_stream_t *ns; @@ -274,7 +271,6 @@ php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stre to->flags = from->flags; to->ops = from->ops; - TSRMLS_SET_CTX(to->ts); if ((ns = to->ops->copy(from, to))) { return ns; @@ -293,6 +289,7 @@ php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stre ZEND_RESULT_CODE php_http_encoding_stream_reset(php_http_encoding_stream_t **s) { php_http_encoding_stream_t *ss; + if ((*s)->ops->dtor) { (*s)->ops->dtor(*s); } @@ -367,7 +364,6 @@ static php_http_encoding_stream_t *deflate_init(php_http_encoding_stream_t *s) { int status, level, wbits, strategy, p = (s->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT); z_streamp ctx = pecalloc(1, sizeof(z_stream), p); - TSRMLS_FETCH_FROM_CTX(s->ts); PHP_HTTP_DEFLATE_LEVEL_SET(s->flags, level); PHP_HTTP_DEFLATE_WBITS_SET(s->flags, wbits); @@ -382,7 +378,7 @@ static php_http_encoding_stream_t *deflate_init(php_http_encoding_stream_t *s) status = Z_MEM_ERROR; } pefree(ctx, p); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to initialize deflate encoding stream: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Failed to initialize deflate encoding stream: %s", zError(status)); return NULL; } @@ -390,7 +386,6 @@ static php_http_encoding_stream_t *inflate_init(php_http_encoding_stream_t *s) { int status, wbits, p = (s->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT); z_streamp ctx = pecalloc(1, sizeof(z_stream), p); - TSRMLS_FETCH_FROM_CTX(s->ts); PHP_HTTP_INFLATE_WBITS_SET(s->flags, wbits); @@ -403,7 +398,7 @@ static php_http_encoding_stream_t *inflate_init(php_http_encoding_stream_t *s) status = Z_MEM_ERROR; } pefree(ctx, p); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to initialize inflate stream: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Failed to initialize inflate stream: %s", zError(status)); return NULL; } @@ -426,7 +421,6 @@ static php_http_encoding_stream_t *deflate_copy(php_http_encoding_stream_t *from { int status, p = to->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT; z_streamp from_ctx = from->ctx, to_ctx = pecalloc(1, sizeof(*to_ctx), p); - TSRMLS_FETCH_FROM_CTX(from->ts); if (Z_OK == (status = deflateCopy(to_ctx, from_ctx))) { if ((to_ctx->opaque = php_http_buffer_init_ex(NULL, PHP_HTTP_DEFLATE_BUFFER_SIZE, p ? PHP_HTTP_BUFFER_INIT_PERSISTENT : 0))) { @@ -437,7 +431,7 @@ static php_http_encoding_stream_t *deflate_copy(php_http_encoding_stream_t *from deflateEnd(to_ctx); status = Z_MEM_ERROR; } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to copy deflate encoding stream: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Failed to copy deflate encoding stream: %s", zError(status)); return NULL; } @@ -445,7 +439,6 @@ static php_http_encoding_stream_t *inflate_copy(php_http_encoding_stream_t *from { int status, p = from->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT; z_streamp from_ctx = from->ctx, to_ctx = pecalloc(1, sizeof(*to_ctx), p); - TSRMLS_FETCH_FROM_CTX(from->ts); if (Z_OK == (status = inflateCopy(to_ctx, from_ctx))) { if ((to_ctx->opaque = php_http_buffer_init_ex(NULL, PHP_HTTP_DEFLATE_BUFFER_SIZE, p ? PHP_HTTP_BUFFER_INIT_PERSISTENT : 0))) { @@ -456,7 +449,7 @@ static php_http_encoding_stream_t *inflate_copy(php_http_encoding_stream_t *from inflateEnd(to_ctx); status = Z_MEM_ERROR; } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to copy inflate encoding stream: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Failed to copy inflate encoding stream: %s", zError(status)); return NULL; } @@ -464,7 +457,6 @@ static php_http_encoding_stream_t *dechunk_copy(php_http_encoding_stream_t *from { int p = from->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT; struct dechunk_ctx *from_ctx = from->ctx, *to_ctx = pemalloc(sizeof(*to_ctx), p); - TSRMLS_FETCH_FROM_CTX(from->ts); if (php_http_buffer_init_ex(&to_ctx->buffer, PHP_HTTP_BUFFER_DEFAULT_SIZE, p ? PHP_HTTP_BUFFER_INIT_PERSISTENT : 0)) { to_ctx->hexlen = from_ctx->hexlen; @@ -474,7 +466,7 @@ static php_http_encoding_stream_t *dechunk_copy(php_http_encoding_stream_t *from return to; } pefree(to_ctx, p); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to copy inflate encoding stream: out of memory"); + php_error_docref(NULL, E_WARNING, "Failed to copy inflate encoding stream: out of memory"); return NULL; } @@ -482,7 +474,6 @@ static ZEND_RESULT_CODE deflate_update(php_http_encoding_stream_t *s, const char { int status; z_streamp ctx = s->ctx; - TSRMLS_FETCH_FROM_CTX(s->ts); /* append input to our buffer */ php_http_buffer_append(PHP_HTTP_BUFFER(ctx->opaque), data, data_len); @@ -515,7 +506,7 @@ static ZEND_RESULT_CODE deflate_update(php_http_encoding_stream_t *s, const char PTR_SET(*encoded, NULL); *encoded_len = 0; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to update deflate stream: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Failed to update deflate stream: %s", zError(status)); return FAILURE; } @@ -523,7 +514,6 @@ static ZEND_RESULT_CODE inflate_update(php_http_encoding_stream_t *s, const char { int status; z_streamp ctx = s->ctx; - TSRMLS_FETCH_FROM_CTX(s->ts); /* append input to buffer */ php_http_buffer_append(PHP_HTTP_BUFFER(ctx->opaque), data, data_len); @@ -554,7 +544,7 @@ retry_raw_inflate: break; } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to update inflate stream: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Failed to update inflate stream: %s", zError(status)); return FAILURE; } @@ -562,10 +552,9 @@ static ZEND_RESULT_CODE dechunk_update(php_http_encoding_stream_t *s, const char { php_http_buffer_t tmp; struct dechunk_ctx *ctx = s->ctx; - TSRMLS_FETCH_FROM_CTX(s->ts); if (ctx->zeroed) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dechunk encoding stream has already reached the end of chunked input"); + php_error_docref(NULL, E_WARNING, "Dechunk encoding stream has already reached the end of chunked input"); return FAILURE; } if ((PHP_HTTP_BUFFER_NOMEM == php_http_buffer_append(&ctx->buffer, data, data_len)) || !php_http_buffer_fix(&ctx->buffer)) { @@ -645,7 +634,7 @@ static ZEND_RESULT_CODE dechunk_update(php_http_encoding_stream_t *s, const char /* if strtoul() stops at the beginning of the buffered data there's something oddly wrong, i.e. bad input */ if (stop == ctx->buffer.data) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse chunk len from '%.*s'", (int) MIN(16, ctx->buffer.used), ctx->buffer.data); + php_error_docref(NULL, E_WARNING, "Failed to parse chunk len from '%.*s'", (int) MIN(16, ctx->buffer.used), ctx->buffer.data); php_http_buffer_dtor(&tmp); return FAILURE; } @@ -690,7 +679,6 @@ static ZEND_RESULT_CODE deflate_flush(php_http_encoding_stream_t *s, char **enco { int status; z_streamp ctx = s->ctx; - TSRMLS_FETCH_FROM_CTX(s->ts); *encoded_len = PHP_HTTP_DEFLATE_BUFFER_SIZE; *encoded = emalloc(*encoded_len); @@ -711,7 +699,7 @@ static ZEND_RESULT_CODE deflate_flush(php_http_encoding_stream_t *s, char **enco PTR_SET(*encoded, NULL); *encoded_len = 0; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to flush deflate stream: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Failed to flush deflate stream: %s", zError(status)); return FAILURE; } @@ -739,7 +727,6 @@ static ZEND_RESULT_CODE deflate_finish(php_http_encoding_stream_t *s, char **enc { int status; z_streamp ctx = s->ctx; - TSRMLS_FETCH_FROM_CTX(s->ts); *encoded_len = PHP_HTTP_DEFLATE_BUFFER_SIZE; *encoded = emalloc(*encoded_len); @@ -768,7 +755,7 @@ static ZEND_RESULT_CODE deflate_finish(php_http_encoding_stream_t *s, char **enc PTR_SET(*encoded, NULL); *encoded_len = 0; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to finish deflate stream: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Failed to finish deflate stream: %s", zError(status)); return FAILURE; } @@ -776,7 +763,6 @@ static ZEND_RESULT_CODE inflate_finish(php_http_encoding_stream_t *s, char **dec { int status; z_streamp ctx = s->ctx; - TSRMLS_FETCH_FROM_CTX(s->ts); if (!PHP_HTTP_BUFFER(ctx->opaque)->used) { *decoded = NULL; @@ -807,7 +793,7 @@ static ZEND_RESULT_CODE inflate_finish(php_http_encoding_stream_t *s, char **dec PTR_SET(*decoded, NULL); *decoded_len = 0; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to finish inflate stream: %s", zError(status)); + php_error_docref(NULL, E_WARNING, "Failed to finish inflate stream: %s", zError(status)); return FAILURE; } @@ -914,53 +900,47 @@ php_http_encoding_stream_ops_t *php_http_encoding_stream_get_dechunk_ops(void) static zend_object_handlers php_http_encoding_stream_object_handlers; -zend_object_value php_http_encoding_stream_object_new(zend_class_entry *ce TSRMLS_DC) +zend_object *php_http_encoding_stream_object_new(zend_class_entry *ce) { - return php_http_encoding_stream_object_new_ex(ce, NULL, NULL TSRMLS_CC); + return &php_http_encoding_stream_object_new_ex(ce, NULL)->zo; } -zend_object_value php_http_encoding_stream_object_new_ex(zend_class_entry *ce, php_http_encoding_stream_t *s, php_http_encoding_stream_object_t **ptr TSRMLS_DC) +php_http_encoding_stream_object_t *php_http_encoding_stream_object_new_ex(zend_class_entry *ce, php_http_encoding_stream_t *s) { php_http_encoding_stream_object_t *o; - o = ecalloc(1, sizeof(*o)); - zend_object_std_init((zend_object *) o, ce TSRMLS_CC); - object_properties_init((zend_object *) o, ce); - - if (ptr) { - *ptr = o; - } + o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); + zend_object_std_init(&o->zo, ce); + object_properties_init(&o->zo, ce); if (s) { o->stream = s; } - o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_encoding_stream_object_free, NULL TSRMLS_CC); - o->zv.handlers = &php_http_encoding_stream_object_handlers; + o->zo.handlers = &php_http_encoding_stream_object_handlers; - return o->zv; + return o; } -zend_object_value php_http_encoding_stream_object_clone(zval *this_ptr TSRMLS_DC) +zend_object *php_http_encoding_stream_object_clone(zval *object) { - zend_object_value new_ov; - php_http_encoding_stream_object_t *new_obj = NULL, *old_obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_encoding_stream_object_t *new_obj = NULL, *old_obj = PHP_HTTP_OBJ(NULL, object); + php_http_encoding_stream_t *cpy = php_http_encoding_stream_copy(old_obj->stream, NULL); - new_ov = php_http_encoding_stream_object_new_ex(old_obj->zo.ce, php_http_encoding_stream_copy(old_obj->stream, NULL), &new_obj TSRMLS_CC); - zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + new_obj = php_http_encoding_stream_object_new_ex(old_obj->zo.ce, cpy); + zend_objects_clone_members(&new_obj->zo, &old_obj->zo); - return new_ov; + return &new_obj->zo; } -void php_http_encoding_stream_object_free(void *object TSRMLS_DC) +void php_http_encoding_stream_object_free(zend_object *object) { - php_http_encoding_stream_object_t *o = (php_http_encoding_stream_object_t *) object; + php_http_encoding_stream_object_t *o = PHP_HTTP_OBJ(object, NULL); if (o->stream) { php_http_encoding_stream_free(&o->stream); } - zend_object_std_dtor((zend_object *) o TSRMLS_CC); - efree(o); + zend_object_std_dtor(object); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream___construct, 0, 0, 0) @@ -968,31 +948,31 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream___construct, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEncodingStream, __construct) { - long flags = 0; + zend_long flags = 0; php_http_encoding_stream_object_t *obj; php_http_encoding_stream_ops_t *ops; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); if (obj->stream) { php_http_throw(bad_method_call, "http\\Encoding\\Stream cannot be initialized twice", NULL); return; } - if (instanceof_function(obj->zo.ce, php_http_deflate_stream_class_entry TSRMLS_CC)) { + if (instanceof_function(obj->zo.ce, php_http_deflate_stream_class_entry)) { ops = &php_http_encoding_deflate_ops; - } else if (instanceof_function(obj->zo.ce, php_http_inflate_stream_class_entry TSRMLS_CC)) { + } else if (instanceof_function(obj->zo.ce, php_http_inflate_stream_class_entry)) { ops = &php_http_encoding_inflate_ops; - } else if (instanceof_function(obj->zo.ce, php_http_dechunk_stream_class_entry TSRMLS_CC)) { + } else if (instanceof_function(obj->zo.ce, php_http_dechunk_stream_class_entry)) { ops = &php_http_encoding_dechunk_ops; } else { - php_http_throw(runtime, "Unknown http\\Encoding\\Stream class '%s'", obj->zo.ce->name); + php_http_throw(runtime, "Unknown http\\Encoding\\Stream class '%s'", obj->zo.ce->name->val); return; } - php_http_expect(obj->stream = php_http_encoding_stream_init(obj->stream, ops, flags TSRMLS_CC), runtime, return); + php_http_expect(obj->stream = php_http_encoding_stream_init(obj->stream, ops, flags), runtime, return); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream_update, 0, 0, 1) @@ -1000,18 +980,22 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream_update, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEncodingStream, update) { - int data_len; + size_t data_len; char *data_str; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_str, &data_len)) { - php_http_encoding_stream_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &data_str, &data_len)) { + php_http_encoding_stream_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); if (obj->stream) { + char *encoded_str = NULL; size_t encoded_len; - char *encoded_str; if (SUCCESS == php_http_encoding_stream_update(obj->stream, data_str, data_len, &encoded_str, &encoded_len)) { - RETURN_STRINGL(encoded_str, encoded_len, 0); + if (encoded_str) { + RETURN_STR(php_http_cs2zs(encoded_str, encoded_len)); + } else { + RETURN_EMPTY_STRING(); + } } } } @@ -1022,15 +1006,15 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEncodingStream, flush) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_encoding_stream_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_encoding_stream_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); if (obj->stream) { - char *encoded_str; + char *encoded_str = NULL; size_t encoded_len; if (SUCCESS == php_http_encoding_stream_flush(obj->stream, &encoded_str, &encoded_len)) { if (encoded_str) { - RETURN_STRINGL(encoded_str, encoded_len, 0); + RETURN_STR(php_http_cs2zs(encoded_str, encoded_len)); } else { RETURN_EMPTY_STRING(); } @@ -1044,7 +1028,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEncodingStream, done) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_encoding_stream_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_encoding_stream_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); if (obj->stream) { RETURN_BOOL(php_http_encoding_stream_done(obj->stream)); @@ -1057,16 +1041,16 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEncodingStream, finish) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_encoding_stream_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_encoding_stream_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); if (obj->stream) { - char *encoded_str; + char *encoded_str = NULL; size_t encoded_len; if (SUCCESS == php_http_encoding_stream_finish(obj->stream, &encoded_str, &encoded_len)) { if (SUCCESS == php_http_encoding_stream_reset(&obj->stream)) { if (encoded_str) { - RETURN_STRINGL(encoded_str, encoded_len, 0); + RETURN_STR(php_http_cs2zs(encoded_str, encoded_len)); } else { RETURN_EMPTY_STRING(); } @@ -1094,15 +1078,19 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpDeflateStream, encode) { char *str; - int len; - long flags = 0; + size_t len; + zend_long flags = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &str, &len, &flags)) { - char *enc_str; + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &str, &len, &flags)) { + char *enc_str = NULL; size_t enc_len; - if (SUCCESS == php_http_encoding_deflate(flags, str, len, &enc_str, &enc_len TSRMLS_CC)) { - RETURN_STRINGL(enc_str, enc_len, 0); + if (SUCCESS == php_http_encoding_deflate(flags, str, len, &enc_str, &enc_len)) { + if (enc_str) { + RETURN_STR(php_http_cs2zs(enc_str, enc_len)); + } else { + RETURN_EMPTY_STRING(); + } } } RETURN_FALSE; @@ -1119,14 +1107,18 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpInflateStream, decode) { char *str; - int len; + size_t len; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) { - char *enc_str; + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &len)) { + char *enc_str = NULL; size_t enc_len; - if (SUCCESS == php_http_encoding_inflate(str, len, &enc_str, &enc_len TSRMLS_CC)) { - RETURN_STRINGL(enc_str, enc_len, 0); + if (SUCCESS == php_http_encoding_inflate(str, len, &enc_str, &enc_len)) { + if (enc_str) { + RETURN_STR(php_http_cs2zs(enc_str, enc_len)); + } else { + RETURN_EMPTY_STRING(); + } } } RETURN_FALSE; @@ -1144,20 +1136,25 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpDechunkStream, decode) { char *str; - int len; + size_t len; zval *zlen = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z!", &str, &len, &zlen)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|z!", &str, &len, &zlen)) { const char *end_ptr; - char *enc_str; + char *enc_str = NULL; size_t enc_len; - if ((end_ptr = php_http_encoding_dechunk(str, len, &enc_str, &enc_len TSRMLS_CC))) { + if ((end_ptr = php_http_encoding_dechunk(str, len, &enc_str, &enc_len))) { if (zlen) { + ZVAL_DEREF(zlen); zval_dtor(zlen); ZVAL_LONG(zlen, str + len - end_ptr); } - RETURN_STRINGL(enc_str, enc_len, 0); + if (enc_str) { + RETURN_STR(php_http_cs2zs(enc_str, enc_len)); + } else { + RETURN_EMPTY_STRING(); + } } } RETURN_FALSE; @@ -1178,39 +1175,44 @@ PHP_MINIT_FUNCTION(http_encoding) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http\\Encoding", "Stream", php_http_encoding_stream_methods); - php_http_encoding_stream_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_http_encoding_stream_class_entry = zend_register_internal_class(&ce); php_http_encoding_stream_class_entry->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; php_http_encoding_stream_class_entry->create_object = php_http_encoding_stream_object_new; memcpy(&php_http_encoding_stream_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_http_encoding_stream_object_handlers.offset = XtOffsetOf(php_http_encoding_stream_object_t, zo); php_http_encoding_stream_object_handlers.clone_obj = php_http_encoding_stream_object_clone; + php_http_encoding_stream_object_handlers.free_obj = php_http_encoding_stream_object_free; - zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_NONE"), PHP_HTTP_ENCODING_STREAM_FLUSH_NONE TSRMLS_CC); - zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_SYNC"), PHP_HTTP_ENCODING_STREAM_FLUSH_SYNC TSRMLS_CC); - zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_FULL"), PHP_HTTP_ENCODING_STREAM_FLUSH_FULL TSRMLS_CC); + zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_NONE"), PHP_HTTP_ENCODING_STREAM_FLUSH_NONE); + zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_SYNC"), PHP_HTTP_ENCODING_STREAM_FLUSH_SYNC); + zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_FULL"), PHP_HTTP_ENCODING_STREAM_FLUSH_FULL); memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Encoding\\Stream", "Deflate", php_http_deflate_stream_methods); - php_http_deflate_stream_class_entry = zend_register_internal_class_ex(&ce, php_http_encoding_stream_class_entry, NULL TSRMLS_CC); - - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_GZIP"), PHP_HTTP_DEFLATE_TYPE_GZIP TSRMLS_CC); - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_ZLIB"), PHP_HTTP_DEFLATE_TYPE_ZLIB TSRMLS_CC); - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_RAW"), PHP_HTTP_DEFLATE_TYPE_RAW TSRMLS_CC); - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("LEVEL_DEF"), PHP_HTTP_DEFLATE_LEVEL_DEF TSRMLS_CC); - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("LEVEL_MIN"), PHP_HTTP_DEFLATE_LEVEL_MIN TSRMLS_CC); - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("LEVEL_MAX"), PHP_HTTP_DEFLATE_LEVEL_MAX TSRMLS_CC); - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_DEF"), PHP_HTTP_DEFLATE_STRATEGY_DEF TSRMLS_CC); - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_FILT"), PHP_HTTP_DEFLATE_STRATEGY_FILT TSRMLS_CC); - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_HUFF"), PHP_HTTP_DEFLATE_STRATEGY_HUFF TSRMLS_CC); - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_RLE"), PHP_HTTP_DEFLATE_STRATEGY_RLE TSRMLS_CC); - zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_FIXED"), PHP_HTTP_DEFLATE_STRATEGY_FIXED TSRMLS_CC); + php_http_deflate_stream_class_entry = zend_register_internal_class_ex(&ce, php_http_encoding_stream_class_entry); + php_http_deflate_stream_class_entry->create_object = php_http_encoding_stream_object_new; + + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_GZIP"), PHP_HTTP_DEFLATE_TYPE_GZIP); + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_ZLIB"), PHP_HTTP_DEFLATE_TYPE_ZLIB); + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_RAW"), PHP_HTTP_DEFLATE_TYPE_RAW); + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("LEVEL_DEF"), PHP_HTTP_DEFLATE_LEVEL_DEF); + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("LEVEL_MIN"), PHP_HTTP_DEFLATE_LEVEL_MIN); + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("LEVEL_MAX"), PHP_HTTP_DEFLATE_LEVEL_MAX); + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_DEF"), PHP_HTTP_DEFLATE_STRATEGY_DEF); + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_FILT"), PHP_HTTP_DEFLATE_STRATEGY_FILT); + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_HUFF"), PHP_HTTP_DEFLATE_STRATEGY_HUFF); + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_RLE"), PHP_HTTP_DEFLATE_STRATEGY_RLE); + zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_FIXED"), PHP_HTTP_DEFLATE_STRATEGY_FIXED); memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Encoding\\Stream", "Inflate", php_http_inflate_stream_methods); - php_http_inflate_stream_class_entry = zend_register_internal_class_ex(&ce, php_http_encoding_stream_class_entry, NULL TSRMLS_CC); + php_http_inflate_stream_class_entry = zend_register_internal_class_ex(&ce, php_http_encoding_stream_class_entry); + php_http_inflate_stream_class_entry->create_object = php_http_encoding_stream_object_new; memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Encoding\\Stream", "Dechunk", php_http_dechunk_stream_methods); - php_http_dechunk_stream_class_entry = zend_register_internal_class_ex(&ce, php_http_encoding_stream_class_entry, NULL TSRMLS_CC); + php_http_dechunk_stream_class_entry = zend_register_internal_class_ex(&ce, php_http_encoding_stream_class_entry); + php_http_dechunk_stream_class_entry->create_object = php_http_encoding_stream_object_new; return SUCCESS; } diff --git a/src/php_http_encoding.h b/src/php_http_encoding.h index cdf7a1a..ea767dd 100644 --- a/src/php_http_encoding.h +++ b/src/php_http_encoding.h @@ -145,16 +145,13 @@ struct php_http_encoding_stream { unsigned flags; void *ctx; php_http_encoding_stream_ops_t *ops; -#ifdef ZTS - void ***ts; -#endif }; PHP_HTTP_API php_http_encoding_stream_ops_t *php_http_encoding_stream_get_deflate_ops(void); PHP_HTTP_API php_http_encoding_stream_ops_t *php_http_encoding_stream_get_inflate_ops(void); PHP_HTTP_API php_http_encoding_stream_ops_t *php_http_encoding_stream_get_dechunk_ops(void); -PHP_HTTP_API php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stream_t *s, php_http_encoding_stream_ops_t *ops, unsigned flags TSRMLS_DC); +PHP_HTTP_API php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stream_t *s, php_http_encoding_stream_ops_t *ops, unsigned flags); PHP_HTTP_API php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to); PHP_HTTP_API ZEND_RESULT_CODE php_http_encoding_stream_reset(php_http_encoding_stream_t **s); PHP_HTTP_API ZEND_RESULT_CODE php_http_encoding_stream_update(php_http_encoding_stream_t *s, const char *in_str, size_t in_len, char **out_str, size_t *out_len); @@ -164,22 +161,21 @@ PHP_HTTP_API ZEND_RESULT_CODE php_http_encoding_stream_finish(php_http_encoding_ PHP_HTTP_API void php_http_encoding_stream_dtor(php_http_encoding_stream_t *s); PHP_HTTP_API void php_http_encoding_stream_free(php_http_encoding_stream_t **s); -PHP_HTTP_API const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC); -PHP_HTTP_API ZEND_RESULT_CODE php_http_encoding_deflate(int flags, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC); -PHP_HTTP_API ZEND_RESULT_CODE php_http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC); +PHP_HTTP_API const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len); +PHP_HTTP_API ZEND_RESULT_CODE php_http_encoding_deflate(int flags, const char *data, size_t data_len, char **encoded, size_t *encoded_len); +PHP_HTTP_API ZEND_RESULT_CODE php_http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len); typedef struct php_http_encoding_stream_object { - zend_object zo; - zend_object_value zv; php_http_encoding_stream_t *stream; + zend_object zo; } php_http_encoding_stream_object_t; PHP_HTTP_API zend_class_entry *php_http_encoding_stream_class_entry; -zend_object_value php_http_encoding_stream_object_new(zend_class_entry *ce TSRMLS_DC); -zend_object_value php_http_encoding_stream_object_new_ex(zend_class_entry *ce, php_http_encoding_stream_t *s, php_http_encoding_stream_object_t **ptr TSRMLS_DC); -zend_object_value php_http_encoding_stream_object_clone(zval *object TSRMLS_DC); -void php_http_encoding_stream_object_free(void *object TSRMLS_DC); +zend_object *php_http_encoding_stream_object_new(zend_class_entry *ce); +php_http_encoding_stream_object_t *php_http_encoding_stream_object_new_ex(zend_class_entry *ce, php_http_encoding_stream_t *s); +zend_object *php_http_encoding_stream_object_clone(zval *object); +void php_http_encoding_stream_object_free(zend_object *object); PHP_HTTP_API zend_class_entry *php_http_deflate_stream_class_entry; PHP_HTTP_API zend_class_entry *php_http_inflate_stream_class_entry; diff --git a/src/php_http_env.c b/src/php_http_env.c index c60d4c0..df22d5a 100644 --- a/src/php_http_env.c +++ b/src/php_http_env.c @@ -13,6 +13,7 @@ #include "php_http_api.h" #include "php_variables.h" + PHP_RSHUTDOWN_FUNCTION(http_env) { if (PHP_HTTP_G->env.request.headers) { @@ -25,75 +26,72 @@ PHP_RSHUTDOWN_FUNCTION(http_env) } if (PHP_HTTP_G->env.server_var) { - zval_ptr_dtor(&PHP_HTTP_G->env.server_var); + zval_ptr_dtor(PHP_HTTP_G->env.server_var); PHP_HTTP_G->env.server_var = NULL; } return SUCCESS; } -void php_http_env_get_request_headers(HashTable *headers TSRMLS_DC) +void php_http_env_get_request_headers(HashTable *headers) { - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - zval **hsv, **header; - HashPosition pos; + php_http_arrkey_t key; + zval *hsv, *header; if (!PHP_HTTP_G->env.request.headers) { ALLOC_HASHTABLE(PHP_HTTP_G->env.request.headers); - zend_hash_init(PHP_HTTP_G->env.request.headers, 0, NULL, ZVAL_PTR_DTOR, 0); - - zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC); + ZEND_INIT_SYMTABLE(PHP_HTTP_G->env.request.headers); - if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv) && Z_TYPE_PP(hsv) == IS_ARRAY) { - FOREACH_KEY(pos, *hsv, key) { - if (key.type == HASH_KEY_IS_STRING && key.len > 6 && *key.str == 'H' && !strncmp(key.str, "HTTP_", 5)) { - key.len -= 5; - key.str = php_http_pretty_key(estrndup(key.str + 5, key.len - 1), key.len - 1, 1, 1); + if ((hsv = php_http_env_get_superglobal(ZEND_STRL("_SERVER")))) { + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(hsv), key.h, key.key, header) + { + if (key.key && key.key->len > 5 && *key.key->val == 'H' && !strncmp(key.key->val, "HTTP_", 5)) { + size_t key_len = key.key->len - 5; + char *key_str = php_http_pretty_key(estrndup(&key.key->val[5], key_len), key_len, 1, 1); - zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos); - Z_ADDREF_P(*header); - zend_symtable_update(PHP_HTTP_G->env.request.headers, key.str, key.len, (void *) header, sizeof(zval *), NULL); + Z_TRY_ADDREF_P(header); + zend_symtable_str_update(PHP_HTTP_G->env.request.headers, key_str, key_len, header); - efree(key.str); - } else if (key.type == HASH_KEY_IS_STRING && key.len > 9 && *key.str == 'C' && !strncmp(key.str, "CONTENT_", 8)) { - key.str = php_http_pretty_key(estrndup(key.str, key.len - 1), key.len - 1, 1, 1); + efree(key_str); + } else if (key.key && key.key->len > 8 && *key.key->val == 'C' && !strncmp(key.key->val, "CONTENT_", 8)) { + char *key_str = php_http_pretty_key(estrndup(key.key->val, key.key->len), key.key->len, 1, 1); - zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos); - Z_ADDREF_P(*header); - zend_symtable_update(PHP_HTTP_G->env.request.headers, key.str, key.len, (void *) header, sizeof(zval *), NULL); + Z_TRY_ADDREF_P(header); + zend_symtable_str_update(PHP_HTTP_G->env.request.headers, key_str, key.key->len, header); - efree(key.str); + efree(key_str); } } + ZEND_HASH_FOREACH_END(); } } if (headers) { - zend_hash_copy(headers, PHP_HTTP_G->env.request.headers, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + array_copy(PHP_HTTP_G->env.request.headers, headers); } } -char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *len, php_http_message_t *request TSRMLS_DC) +char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *len, php_http_message_t *request) { HashTable *request_headers; - zval **zvalue = NULL; + zval *zvalue = NULL; char *val = NULL, *key = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); if (request) { request_headers = &request->hdrs; } else { - php_http_env_get_request_headers(NULL TSRMLS_CC); + php_http_env_get_request_headers(NULL); request_headers = PHP_HTTP_G->env.request.headers; } - if (SUCCESS == zend_symtable_find(request_headers, key, name_len + 1, (void *) &zvalue)) { - zval *zcopy = php_http_ztyp(IS_STRING, *zvalue); + if ((zvalue = zend_symtable_str_find(request_headers, key, name_len))) { + zend_string *zs = zval_get_string(zvalue); - val = estrndup(Z_STRVAL_P(zcopy), Z_STRLEN_P(zcopy)); + val = estrndup(zs->val, zs->len); if (len) { - *len = Z_STRLEN_P(zcopy); + *len = zs->len; } - zval_ptr_dtor(&zcopy); + zend_string_release(zs); } efree(key); @@ -101,45 +99,49 @@ char *php_http_env_get_request_header(const char *name_str, size_t name_len, siz return val; } -int php_http_env_got_request_header(const char *name_str, size_t name_len, php_http_message_t *request TSRMLS_DC) +zend_bool php_http_env_got_request_header(const char *name_str, size_t name_len, php_http_message_t *request) { HashTable *request_headers; char *key = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); - int got; + zend_bool got; if (request) { request_headers = &request->hdrs; } else { - php_http_env_get_request_headers(NULL TSRMLS_CC); + php_http_env_get_request_headers(NULL); request_headers = PHP_HTTP_G->env.request.headers; } - got = zend_symtable_exists(request_headers, key, name_len + 1); + got = zend_symtable_str_exists(request_headers, key, name_len); efree(key); return got; } -zval *php_http_env_get_superglobal(const char *key, size_t key_len TSRMLS_DC) +zval *php_http_env_get_superglobal(const char *key, size_t key_len) { - zval **hsv; + zval *hsv; + zend_string *key_str = zend_string_init(key, key_len, 0); - zend_is_auto_global(key, key_len TSRMLS_CC); + zend_is_auto_global(key_str); + hsv = zend_hash_find(&EG(symbol_table), key_str); + zend_string_release(key_str); - if ((SUCCESS != zend_hash_find(&EG(symbol_table), key, key_len + 1, (void *) &hsv)) || (Z_TYPE_PP(hsv) != IS_ARRAY)) { + if (Z_TYPE_P(hsv) != IS_ARRAY) { return NULL; } - return *hsv; + return hsv; } -zval *php_http_env_get_server_var(const char *key, size_t key_len, zend_bool check TSRMLS_DC) +zval *php_http_env_get_server_var(const char *key, size_t key_len, zend_bool check) { - zval *hsv, **var; - char *env; + zval *hsv, *var; - /* if available, this is a lot faster than accessing $_SERVER */ + /* if available, this is a lot faster than accessing $_SERVER * / if (sapi_module.getenv) { - if ((!(env = sapi_module.getenv((char *) key, key_len TSRMLS_CC))) || (check && !*env)) { + char *env; + + if ((!(env = sapi_module.getenv((char *) key, key_len))) || (check && !*env)) { return NULL; } if (PHP_HTTP_G->env.server_var) { @@ -149,60 +151,38 @@ zval *php_http_env_get_server_var(const char *key, size_t key_len, zend_bool che ZVAL_STRING(PHP_HTTP_G->env.server_var, env, 1); return PHP_HTTP_G->env.server_var; } + / * */ - if (!(hsv = php_http_env_get_superglobal(ZEND_STRL("_SERVER") TSRMLS_CC))) { + if (!(hsv = php_http_env_get_superglobal(ZEND_STRL("_SERVER")))) { return NULL; } - if ((SUCCESS != zend_symtable_find(Z_ARRVAL_P(hsv), key, key_len + 1, (void *) &var))) { + if (!(var = zend_symtable_str_find(Z_ARRVAL_P(hsv), key, key_len))) { return NULL; } - if (check && !((Z_TYPE_PP(var) == IS_STRING) && Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) { + if (check && !((Z_TYPE_P(var) == IS_STRING) && Z_STRVAL_P(var) && Z_STRLEN_P(var))) { return NULL; } - return *var; + return var; } -php_http_message_body_t *php_http_env_get_request_body(TSRMLS_D) +php_http_message_body_t *php_http_env_get_request_body(void) { if (!PHP_HTTP_G->env.request.body) { php_stream *s = php_stream_temp_new(); -#if PHP_VERSION_ID >= 50600 php_stream *input = php_stream_open_wrapper("php://input", "r", 0, NULL); /* php://input does not support stat */ php_stream_copy_to_stream_ex(input, s, -1, NULL); php_stream_close(input); -#else - if (SG(request_info).post_data || SG(request_info).raw_post_data) { - /* php://input does not support seek() in PHP <= 5.5 */ - if (SG(request_info).raw_post_data) { - php_stream_write(s, SG(request_info).raw_post_data, SG(request_info).raw_post_data_length); - } else { - php_stream_write(s, SG(request_info).post_data, SG(request_info).post_data_length); - } - } else if (sapi_module.read_post && !SG(read_post_bytes)) { - char *buf = emalloc(4096); - int len; - - while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) { - SG(read_post_bytes) += len; - php_stream_write(s, buf, len); - if (len < 4096) { - break; - } - } - efree(buf); - } -#endif php_stream_rewind(s); - PHP_HTTP_G->env.request.body = php_http_message_body_init(NULL, s TSRMLS_CC); + PHP_HTTP_G->env.request.body = php_http_message_body_init(NULL, s); } return PHP_HTTP_G->env.request.body; } -const char *php_http_env_get_request_method(php_http_message_t *request TSRMLS_DC) +const char *php_http_env_get_request_method(php_http_message_t *request) { const char *m; @@ -215,13 +195,13 @@ const char *php_http_env_get_request_method(php_http_message_t *request TSRMLS_D return m ? m : "GET"; } -php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t length, php_http_message_t *request TSRMLS_DC) +php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t length, php_http_message_t *request) { - zval *zentry; + zval zentry; char *range, *rp, c; long begin = -1, end = -1, *ptr; - if (!(range = php_http_env_get_request_header(ZEND_STRL("Range"), NULL, request TSRMLS_CC))) { + if (!(range = php_http_env_get_request_header(ZEND_STRL("Range"), NULL, request))) { return PHP_HTTP_RANGE_NO; } if (strncmp(range, "bytes=", lenof("bytes="))) { @@ -340,11 +320,10 @@ php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_ } } - 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); + array_init(&zentry); + add_index_long(&zentry, 0, begin); + add_index_long(&zentry, 1, end); + zend_hash_next_index_insert(ranges, &zentry); begin = -1; end = -1; @@ -362,88 +341,102 @@ php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_ return PHP_HTTP_RANGE_OK; } -static void grab_headers(void *data, void *arg TSRMLS_DC) +static void grab_headers(void *data, void *arg) { php_http_buffer_appendl(PHP_HTTP_BUFFER(arg), ((sapi_header_struct *)data)->header); php_http_buffer_appends(PHP_HTTP_BUFFER(arg), PHP_HTTP_CRLF); } -ZEND_RESULT_CODE php_http_env_get_response_headers(HashTable *headers_ht TSRMLS_DC) +static void grab_header(void *data, void *arg) +{ + struct { + char *name_str; + size_t name_len; + char *value_ptr; + } *args = arg; + sapi_header_struct *header = data; + + if ( header->header_len > args->name_len + && header->header[args->name_len] == ':' + && !strncmp(header->header, args->name_str, args->name_len) + ) { + args->value_ptr = &header->header[args->name_len + 1]; + while (PHP_HTTP_IS_CTYPE(space, *args->value_ptr)) { + ++args->value_ptr; + } + } +} + +ZEND_RESULT_CODE php_http_env_get_response_headers(HashTable *headers_ht) { ZEND_RESULT_CODE status; php_http_buffer_t headers; php_http_buffer_init(&headers); - zend_llist_apply_with_argument(&SG(sapi_headers).headers, grab_headers, &headers TSRMLS_CC); + zend_llist_apply_with_argument(&SG(sapi_headers).headers, grab_headers, &headers); php_http_buffer_fix(&headers); - status = php_http_header_parse(headers.data, headers.used, headers_ht, NULL, NULL TSRMLS_CC); + status = php_http_header_parse(headers.data, headers.used, headers_ht, NULL, NULL); php_http_buffer_dtor(&headers); return status; } -char *php_http_env_get_response_header(const char *name_str, size_t name_len TSRMLS_DC) +char *php_http_env_get_response_header(const char *name_str, size_t name_len) { - char *val = NULL; - HashTable headers; - - zend_hash_init(&headers, 0, NULL, ZVAL_PTR_DTOR, 0); - if (SUCCESS == php_http_env_get_response_headers(&headers TSRMLS_CC)) { - zval **zvalue; - char *key = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); + struct { + char *name_str; + size_t name_len; + char *value_ptr; + } args; - if (SUCCESS == zend_symtable_find(&headers, key, name_len + 1, (void *) &zvalue)) { - zval *zcopy = php_http_ztyp(IS_STRING, *zvalue); + args.name_str = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); + args.name_len = name_len; + args.value_ptr = NULL; + zend_llist_apply_with_argument(&SG(sapi_headers).headers, grab_header, &args); + efree(args.name_str); - val = estrndup(Z_STRVAL_P(zcopy), Z_STRLEN_P(zcopy)); - zval_ptr_dtor(&zcopy); - } - - efree(key); - } - zend_hash_destroy(&headers); - - return val; + return args.value_ptr ? estrdup(args.value_ptr) : NULL; } -long php_http_env_get_response_code(TSRMLS_D) +long php_http_env_get_response_code(void) { long code = SG(sapi_headers).http_response_code; return code ? code : 200; } -ZEND_RESULT_CODE php_http_env_set_response_code(long http_code TSRMLS_DC) +ZEND_RESULT_CODE php_http_env_set_response_code(long http_code) { - return sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) http_code TSRMLS_CC); + return sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) (zend_intptr_t) http_code); } -ZEND_RESULT_CODE php_http_env_set_response_status_line(long code, php_http_version_t *v TSRMLS_DC) +ZEND_RESULT_CODE php_http_env_set_response_status_line(long code, php_http_version_t *v) { sapi_header_line h = {NULL, 0, 0}; ZEND_RESULT_CODE ret; h.line_len = spprintf(&h.line, 0, "HTTP/%u.%u %ld %s", v->major, v->minor, code, php_http_env_get_response_status_for_code(code)); - ret = sapi_header_op(SAPI_HEADER_REPLACE, (void *) &h TSRMLS_CC); + ret = sapi_header_op(SAPI_HEADER_REPLACE, (void *) &h); efree(h.line); return ret; } -ZEND_RESULT_CODE php_http_env_set_response_protocol_version(php_http_version_t *v TSRMLS_DC) +ZEND_RESULT_CODE php_http_env_set_response_protocol_version(php_http_version_t *v) { - return php_http_env_set_response_status_line(php_http_env_get_response_code(TSRMLS_C), v TSRMLS_CC); + return php_http_env_set_response_status_line(php_http_env_get_response_code(), v); } -ZEND_RESULT_CODE php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace TSRMLS_DC) +ZEND_RESULT_CODE php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace) { sapi_header_line h = {estrndup(header_str, header_len), header_len, http_code}; - ZEND_RESULT_CODE ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC); + ZEND_RESULT_CODE ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h); + efree(h.line); return ret; } -ZEND_RESULT_CODE php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv TSRMLS_DC) +ZEND_RESULT_CODE php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv) { ZEND_RESULT_CODE ret = FAILURE; sapi_header_line h = {NULL, 0, http_code}; @@ -452,65 +445,67 @@ ZEND_RESULT_CODE php_http_env_set_response_header_va(long http_code, zend_bool r if (h.line) { if (h.line_len) { - ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC); + ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h); } efree(h.line); } return ret; } -ZEND_RESULT_CODE php_http_env_set_response_header_format(long http_code, zend_bool replace TSRMLS_DC, const char *fmt, ...) +ZEND_RESULT_CODE php_http_env_set_response_header_format(long http_code, zend_bool replace, const char *fmt, ...) { ZEND_RESULT_CODE ret; va_list args; va_start(args, fmt); - ret = php_http_env_set_response_header_va(http_code, replace, fmt, args TSRMLS_CC); + ret = php_http_env_set_response_header_va(http_code, replace, fmt, args); va_end(args); return ret; } -ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace TSRMLS_DC) +ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace) { if (!value) { sapi_header_line h = {(char *) name_str, name_len, http_code}; - return sapi_header_op(SAPI_HEADER_DELETE, (void *) &h TSRMLS_CC); + return sapi_header_op(SAPI_HEADER_DELETE, (void *) &h); } - if(Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) { - HashPosition pos; + if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) { int first = replace; - zval **data_ptr; + zval *data_ptr; + HashTable *ht = HASH_OF(value); - FOREACH_HASH_VAL(pos, HASH_OF(value), data_ptr) { - if (SUCCESS != php_http_env_set_response_header_value(http_code, name_str, name_len, *data_ptr, first TSRMLS_CC)) { + ZEND_HASH_FOREACH_VAL_IND(ht, data_ptr) + { + if (SUCCESS != php_http_env_set_response_header_value(http_code, name_str, name_len, data_ptr, first)) { return FAILURE; } first = 0; } + ZEND_HASH_FOREACH_END(); return SUCCESS; } else { - zval *data = php_http_ztyp(IS_STRING, value); + zend_string *data = zval_get_string(value); - if (!Z_STRLEN_P(data)) { - zval_ptr_dtor(&data); - return php_http_env_set_response_header_value(http_code, name_str, name_len, NULL, replace TSRMLS_CC); + if (!data->len) { + zend_string_release(data); + return php_http_env_set_response_header_value(http_code, name_str, name_len, NULL, replace); } else { sapi_header_line h; ZEND_RESULT_CODE ret; if (name_len > INT_MAX) { - name_len = INT_MAX; + return FAILURE; } h.response_code = http_code; - h.line_len = spprintf(&h.line, 0, "%.*s: %.*s", (int) name_len, name_str, Z_STRLEN_P(data), Z_STRVAL_P(data)); + h.line_len = spprintf(&h.line, 0, "%.*s: %.*s", (int) name_len, name_str, data->len, data->val); - ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC); + ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h); - zval_ptr_dtor(&data); + zend_string_release(data); PTR_FREE(h.line); return ret; @@ -535,21 +530,21 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnv, getRequestHeader) { char *header_name_str = NULL; - int header_name_len = 0; + size_t header_name_len = 0; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &header_name_str, &header_name_len)) { return; } if (header_name_str && header_name_len) { size_t header_length; - char *header_value = php_http_env_get_request_header(header_name_str, header_name_len, &header_length, NULL TSRMLS_CC); + char *header_value = php_http_env_get_request_header(header_name_str, header_name_len, &header_length, NULL); if (header_value) { - RETURN_STRINGL(header_value, header_length, 0); + RETURN_STR(php_http_cs2zs(header_value, header_length)); } } else { array_init(return_value); - php_http_env_get_request_headers(Z_ARRVAL_P(return_value) TSRMLS_CC); + php_http_env_get_request_headers(Z_ARRVAL_P(return_value)); } } @@ -558,16 +553,16 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getRequestBody, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnv, getRequestBody) { - zend_object_value ov; php_http_message_body_t *body; + php_http_message_body_object_t *body_obj; zend_class_entry *class_entry = php_http_message_body_class_entry; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &class_entry), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|C", &class_entry), invalid_arg, return); - body = php_http_env_get_request_body(TSRMLS_C); - if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_body_object_new_ex, php_http_message_body_class_entry, body, NULL TSRMLS_CC)) { + body = php_http_env_get_request_body(); + if (SUCCESS == php_http_new((void *) &body_obj, class_entry, (php_http_new_t) php_http_message_body_object_new_ex, php_http_message_body_class_entry, body)) { php_http_message_body_addref(body); - RETVAL_OBJVAL(ov, 0); + RETVAL_OBJ(&body_obj->zo); } } @@ -576,15 +571,15 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseStatusForCode, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnv, getResponseStatusForCode) { - long code; + zend_long code; const char *status; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "l", &code)) { return; } if ((status = php_http_env_get_response_status_for_code(code))) { - RETURN_STRING(status, 1); + RETURN_STRING(status); } } @@ -597,7 +592,7 @@ static PHP_METHOD(HttpEnv, getResponseStatusForAllCodes) } array_init(return_value); -#define PHP_HTTP_RESPONSE_CODE(code, status) add_index_string(return_value, code, status, 1); +#define PHP_HTTP_RESPONSE_CODE(code, status) add_index_string(return_value, code, status); #include "php_http_response_codes.h" #undef PHP_HTTP_RESPONSE_CODE } @@ -608,20 +603,20 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnv, getResponseHeader) { char *header_name_str = NULL; - int header_name_len = 0; + size_t header_name_len = 0; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &header_name_str, &header_name_len)) { return; } if (header_name_str && header_name_len) { - char *header_value = php_http_env_get_response_header(header_name_str, header_name_len TSRMLS_CC); + char *header_value = php_http_env_get_response_header(header_name_str, header_name_len); if (header_value) { - RETURN_STRING(header_value, 0); + RETURN_STR(php_http_cs2zs(header_value, strlen(header_value))); } } else { array_init(return_value); - php_http_env_get_response_headers(Z_ARRVAL_P(return_value) TSRMLS_CC); + php_http_env_get_response_headers(Z_ARRVAL_P(return_value)); } } @@ -632,7 +627,7 @@ static PHP_METHOD(HttpEnv, getResponseCode) if (SUCCESS != zend_parse_parameters_none()) { return; } - RETURN_LONG(php_http_env_get_response_code(TSRMLS_C)); + RETURN_LONG(php_http_env_get_response_code()); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_setResponseHeader, 0, 0, 1) @@ -644,15 +639,15 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnv, setResponseHeader) { char *header_name_str; - int header_name_len; + size_t header_name_len; zval *header_value = NULL; - long code = 0; + zend_long code = 0; zend_bool replace_header = 1; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z!lb", &header_name_str, &header_name_len, &header_value, &code, &replace_header)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "s|z!lb", &header_name_str, &header_name_len, &header_value, &code, &replace_header)) { return; } - RETURN_BOOL(SUCCESS == php_http_env_set_response_header_value(code, header_name_str, header_name_len, header_value, replace_header TSRMLS_CC)); + RETURN_BOOL(SUCCESS == php_http_env_set_response_header_value(code, header_name_str, header_name_len, header_value, replace_header)); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_setResponseCode, 0, 0, 1) @@ -660,12 +655,12 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_setResponseCode, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnv, setResponseCode) { - long code; + zend_long code; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "l", &code)) { return; } - RETURN_BOOL(SUCCESS == php_http_env_set_response_code(code TSRMLS_CC)); + RETURN_BOOL(SUCCESS == php_http_env_set_response_code(code)); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateLanguage, 0, 0, 1) @@ -677,10 +672,11 @@ static PHP_METHOD(HttpEnv, negotiateLanguage) HashTable *supported; zval *rs_array = NULL; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "H|z", &supported, &rs_array)) { return; } if (rs_array) { + ZVAL_DEREF(rs_array); zval_dtor(rs_array); array_init(rs_array); } @@ -697,10 +693,11 @@ static PHP_METHOD(HttpEnv, negotiateCharset) HashTable *supported; zval *rs_array = NULL; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "H|z", &supported, &rs_array)) { return; } if (rs_array) { + ZVAL_DEREF(rs_array); zval_dtor(rs_array); array_init(rs_array); } @@ -716,10 +713,11 @@ static PHP_METHOD(HttpEnv, negotiateEncoding) HashTable *supported; zval *rs_array = NULL; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "H|z", &supported, &rs_array)) { return; } if (rs_array) { + ZVAL_DEREF(rs_array); zval_dtor(rs_array); array_init(rs_array); } @@ -735,10 +733,11 @@ static PHP_METHOD(HttpEnv, negotiateContentType) HashTable *supported; zval *rs_array = NULL; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "H|z", &supported, &rs_array)) { return; } if (rs_array) { + ZVAL_DEREF(rs_array); zval_dtor(rs_array); array_init(rs_array); } @@ -756,19 +755,19 @@ static PHP_METHOD(HttpEnv, negotiate) HashTable *supported, *rs; zval *rs_array = NULL; char *value_str, *sep_str = NULL; - int value_len, sep_len = 0; + size_t value_len, sep_len = 0; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sH|s!z", &value_str, &value_len, &supported, &sep_str, &sep_len, &rs_array)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "sH|s!z", &value_str, &value_len, &supported, &sep_str, &sep_len, &rs_array)) { return; } - if (rs_array) { + ZVAL_DEREF(rs_array); zval_dtor(rs_array); array_init(rs_array); } - if ((rs = php_http_negotiate(value_str, value_len, supported, sep_str, sep_len TSRMLS_CC))) { + if ((rs = php_http_negotiate(value_str, value_len, supported, sep_str, sep_len))) { PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array); } else { PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array); @@ -803,7 +802,7 @@ PHP_MINIT_FUNCTION(http_env) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http", "Env", php_http_env_methods); - php_http_env_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_http_env_class_entry = zend_register_internal_class(&ce); return SUCCESS; } diff --git a/src/php_http_env.h b/src/php_http_env.h index 3fc80ab..273ba16 100644 --- a/src/php_http_env.h +++ b/src/php_http_env.h @@ -37,12 +37,12 @@ typedef enum php_http_range_status { PHP_HTTP_RANGE_ERR } php_http_range_status_t; -PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t entity_length, php_http_message_t *request TSRMLS_DC); -PHP_HTTP_API void php_http_env_get_request_headers(HashTable *headers TSRMLS_DC); -PHP_HTTP_API char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *len, php_http_message_t *request TSRMLS_DC); -PHP_HTTP_API int php_http_env_got_request_header(const char *name_str, size_t name_len, php_http_message_t *request TSRMLS_DC); -PHP_HTTP_API php_http_message_body_t *php_http_env_get_request_body(TSRMLS_D); -PHP_HTTP_API const char *php_http_env_get_request_method(php_http_message_t *request TSRMLS_DC); +PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t entity_length, php_http_message_t *request); +PHP_HTTP_API void php_http_env_get_request_headers(HashTable *headers); +PHP_HTTP_API char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *len, php_http_message_t *request); +PHP_HTTP_API zend_bool php_http_env_got_request_header(const char *name_str, size_t name_len, php_http_message_t *request); +PHP_HTTP_API php_http_message_body_t *php_http_env_get_request_body(void); +PHP_HTTP_API const char *php_http_env_get_request_method(php_http_message_t *request); typedef enum php_http_content_disposition { PHP_HTTP_CONTENT_DISPOSITION_NONE, @@ -56,20 +56,25 @@ typedef enum php_http_cache_status { PHP_HTTP_CACHE_MISS } php_http_cache_status_t; -PHP_HTTP_API long php_http_env_get_response_code(TSRMLS_D); +PHP_HTTP_API long php_http_env_get_response_code(void); PHP_HTTP_API const char *php_http_env_get_response_status_for_code(unsigned code); -PHP_HTTP_API ZEND_RESULT_CODE php_http_env_get_response_headers(HashTable *headers_ht TSRMLS_DC); -PHP_HTTP_API char *php_http_env_get_response_header(const char *name_str, size_t name_len TSRMLS_DC); -PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_code(long http_code TSRMLS_DC); -PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_protocol_version(php_http_version_t *v TSRMLS_DC); -PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace TSRMLS_DC); -PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace TSRMLS_DC); -PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header_format(long http_code, zend_bool replace TSRMLS_DC, const char *fmt, ...); -PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv TSRMLS_DC); - -PHP_HTTP_API zval *php_http_env_get_server_var(const char *key_str, size_t key_len, zend_bool check TSRMLS_DC); -#define php_http_env_got_server_var(v) (NULL != php_http_env_get_server_var((v), strlen(v), 1 TSRMLS_CC)) -PHP_HTTP_API zval *php_http_env_get_superglobal(const char *key, size_t key_len TSRMLS_DC); +PHP_HTTP_API ZEND_RESULT_CODE php_http_env_get_response_headers(HashTable *headers_ht); +PHP_HTTP_API char *php_http_env_get_response_header(const char *name_str, size_t name_len); +PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_code(long http_code); +PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_protocol_version(php_http_version_t *v); +PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace); +PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace); +PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header_format(long http_code, zend_bool replace, const char *fmt, ...); +PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv); + +PHP_HTTP_API zval *php_http_env_get_server_var(const char *key_str, size_t key_len, zend_bool check); +PHP_HTTP_API zval *php_http_env_get_superglobal(const char *key, size_t key_len); + +static inline zend_bool php_http_env_got_server_var(const char *v) +{ + return NULL != php_http_env_get_server_var(v, strlen(v), 1); +} + PHP_HTTP_API zend_class_entry *php_http_env_class_entry; PHP_MINIT_FUNCTION(http_env); diff --git a/src/php_http_env_request.c b/src/php_http_env_request.c index a884d2f..0ee68f4 100644 --- a/src/php_http_env_request.c +++ b/src/php_http_env_request.c @@ -12,94 +12,97 @@ #include "php_http_api.h" -static int grab_file(void *zpp TSRMLS_DC, int argc, va_list argv, zend_hash_key *key) +static int grab_file(zval *tmp_name, int argc, va_list argv, zend_hash_key *key) { - zval *zfiles, **name, **zname, **error, **zerror, **type, **ztype, **size, **zsize, **tmp_name = zpp; + zval *zfiles, *name, *zname, *error, *zerror, *type, *ztype, *size, *zsize; zend_hash_key *file_key; zfiles = (zval *) va_arg(argv, zval *); file_key = (zend_hash_key *) va_arg(argv, zend_hash_key *); - name = (zval **) va_arg(argv, zval **); - size = (zval **) va_arg(argv, zval **); - type = (zval **) va_arg(argv, zval **); - error = (zval **) va_arg(argv, zval **); - - if (SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(name), key->h, (void *) &zname) - && SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(size), key->h, (void *) &zsize) - && SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(type), key->h, (void *) &ztype) - && SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(error), key->h, (void *) &zerror) + name = (zval *) va_arg(argv, zval *); + size = (zval *) va_arg(argv, zval *); + type = (zval *) va_arg(argv, zval *); + error = (zval *) va_arg(argv, zval *); + + if ((zname = zend_hash_index_find(Z_ARRVAL_P(name), key->h)) + && (zsize = zend_hash_index_find(Z_ARRVAL_P(size), key->h)) + && (ztype = zend_hash_index_find(Z_ARRVAL_P(type), key->h)) + && (zerror = zend_hash_index_find(Z_ARRVAL_P(error), key->h)) ) { - zval *entry, **array; - - MAKE_STD_ZVAL(entry); - array_init(entry); - - Z_ADDREF_PP(tmp_name); - add_assoc_zval_ex(entry, ZEND_STRS("file"), *tmp_name); - Z_ADDREF_PP(zname); - add_assoc_zval_ex(entry, ZEND_STRS("name"), *zname); - Z_ADDREF_PP(zsize); - add_assoc_zval_ex(entry, ZEND_STRS("size"), *zsize); - Z_ADDREF_PP(ztype); - add_assoc_zval_ex(entry, ZEND_STRS("type"), *ztype); - Z_ADDREF_PP(zerror); - add_assoc_zval_ex(entry, ZEND_STRS("error"), *zerror); - - if (SUCCESS == zend_hash_quick_find(Z_ARRVAL_P(zfiles), file_key->arKey, file_key->nKeyLength, file_key->h, (void *) &array)) { - add_next_index_zval(*array, entry); + zval entry, *array; + + array_init(&entry); + + Z_TRY_ADDREF_P(tmp_name); + add_assoc_zval_ex(&entry, ZEND_STRL("file"), tmp_name); + Z_TRY_ADDREF_P(zname); + add_assoc_zval_ex(&entry, ZEND_STRL("name"), zname); + Z_TRY_ADDREF_P(zsize); + add_assoc_zval_ex(&entry, ZEND_STRL("size"), zsize); + Z_TRY_ADDREF_P(ztype); + add_assoc_zval_ex(&entry, ZEND_STRL("type"), ztype); + Z_TRY_ADDREF_P(zerror); + add_assoc_zval_ex(&entry, ZEND_STRL("error"), zerror); + + if (file_key->key && (array = zend_hash_find(Z_ARRVAL_P(zfiles), file_key->key))) { + add_next_index_zval(array, &entry); + } else if (!file_key->key && (array = zend_hash_index_find(Z_ARRVAL_P(zfiles), file_key->h))) { + add_next_index_zval(array, &entry); } else { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - array_init(tmp); - add_next_index_zval(tmp, entry); - zend_hash_quick_update(Z_ARRVAL_P(zfiles), file_key->arKey, file_key->nKeyLength, file_key->h, (void *) &tmp, sizeof(zval *), NULL); + array_init(&tmp); + add_next_index_zval(&tmp, &entry); + if (file_key->key) { + zend_hash_update(Z_ARRVAL_P(zfiles), file_key->key, &tmp); + } else { + zend_hash_index_update(Z_ARRVAL_P(zfiles), file_key->h, &tmp); + } } } return ZEND_HASH_APPLY_KEEP; } -static int grab_files(void *zpp TSRMLS_DC, int argc, va_list argv, zend_hash_key *key) +static int grab_files(zval *val, int argc, va_list argv, zend_hash_key *key) { - zval *zfiles, **name, **tmp_name, **error, **type, **size, **val = zpp; + zval *zfiles, *name, *tmp_name, *error, *type, *size; zfiles = (zval *) va_arg(argv, zval *); - if (Z_TYPE_PP(val) == IS_ARRAY - && SUCCESS == zend_hash_find(Z_ARRVAL_PP(val), ZEND_STRS("tmp_name"), (void *) &tmp_name) - && SUCCESS == zend_hash_find(Z_ARRVAL_PP(val), ZEND_STRS("name"), (void *) &name) - && SUCCESS == zend_hash_find(Z_ARRVAL_PP(val), ZEND_STRS("size"), (void *) &size) - && SUCCESS == zend_hash_find(Z_ARRVAL_PP(val), ZEND_STRS("type"), (void *) &type) - && SUCCESS == zend_hash_find(Z_ARRVAL_PP(val), ZEND_STRS("error"), (void *) &error) + if ((Z_TYPE_P(val) == IS_ARRAY) + && (tmp_name = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("tmp_name"))) + && (name = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("name"))) + && (size = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("size"))) + && (type = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("type"))) + && (error = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("error"))) ) { int count; - if (Z_TYPE_PP(tmp_name) == IS_ARRAY && (count = zend_hash_num_elements(Z_ARRVAL_PP(tmp_name))) > 1) { - if (count == zend_hash_num_elements(Z_ARRVAL_PP(name)) - && count == zend_hash_num_elements(Z_ARRVAL_PP(size)) - && count == zend_hash_num_elements(Z_ARRVAL_PP(type)) - && count == zend_hash_num_elements(Z_ARRVAL_PP(error)) + if (Z_TYPE_P(tmp_name) == IS_ARRAY && (count = zend_hash_num_elements(Z_ARRVAL_P(tmp_name))) > 1) { + if (count == zend_hash_num_elements(Z_ARRVAL_P(name)) + && count == zend_hash_num_elements(Z_ARRVAL_P(size)) + && count == zend_hash_num_elements(Z_ARRVAL_P(type)) + && count == zend_hash_num_elements(Z_ARRVAL_P(error)) ) { - zend_hash_apply_with_arguments(Z_ARRVAL_PP(tmp_name) TSRMLS_CC, grab_file, 6, zfiles, key, name, size, type, error); + zend_hash_apply_with_arguments(Z_ARRVAL_P(tmp_name), grab_file, 6, zfiles, key, name, size, type, error); } else { /* wat?! */ return ZEND_HASH_APPLY_STOP; } } else { - zval *cpy, **tmp; - - MAKE_STD_ZVAL(cpy); - MAKE_COPY_ZVAL(val, cpy); - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(cpy), ZEND_STRS("tmp_name"), (void *) &tmp)) { - Z_ADDREF_PP(tmp); - add_assoc_zval_ex(cpy, ZEND_STRS("file"), *tmp); - zend_hash_del_key_or_index(Z_ARRVAL_P(cpy), ZEND_STRS("tmp_name"), 0, HASH_DEL_KEY); + zval *tmp, entry; + + ZVAL_DUP(&entry, val); + if ((tmp = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("tmp_name")))) { + Z_ADDREF_P(tmp); + add_assoc_zval_ex(&entry, ZEND_STRL("file"), tmp); + zend_hash_str_del(Z_ARRVAL(entry), ZEND_STRL("tmp_name")); } - if (key->nKeyLength > 0) { - zend_hash_quick_update(Z_ARRVAL_P(zfiles), key->arKey, key->nKeyLength, key->h, (void *) &cpy, sizeof(zval *), NULL); + if (key->key) { + zend_hash_update(Z_ARRVAL_P(zfiles), key->key, &entry); } else { - zend_hash_index_update(Z_ARRVAL_P(zfiles), key->h, (void *) &cpy, sizeof(zval *), NULL); + zend_hash_index_update(Z_ARRVAL_P(zfiles), key->h, &entry); } } } @@ -110,7 +113,7 @@ static int grab_files(void *zpp TSRMLS_DC, int argc, va_list argv, zend_hash_key #define PHP_HTTP_ENV_REQUEST_OBJECT_INIT(obj) \ do { \ if (!obj->message) { \ - obj->message = php_http_message_init_env(NULL, PHP_HTTP_REQUEST TSRMLS_CC); \ + obj->message = php_http_message_init_env(NULL, PHP_HTTP_REQUEST); \ } \ } while(0) @@ -120,51 +123,38 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvRequest, __construct) { php_http_message_object_t *obj; - zval *zsg, *zqs; + zval *zsg, zqs; php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); obj->body = NULL; - php_http_expect(obj->message = php_http_message_init_env(obj->message, PHP_HTTP_REQUEST TSRMLS_CC), unexpected_val, return); + php_http_expect(obj->message = php_http_message_init_env(obj->message, PHP_HTTP_REQUEST), unexpected_val, return); - zsg = php_http_env_get_superglobal(ZEND_STRL("_GET") TSRMLS_CC); - MAKE_STD_ZVAL(zqs); - object_init_ex(zqs, php_http_querystring_class_entry); - php_http_expect(SUCCESS == php_http_querystring_ctor(zqs, zsg TSRMLS_CC), unexpected_val, - zval_ptr_dtor(&zqs); - return; - ); - zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("query"), zqs TSRMLS_CC); + zsg = php_http_env_get_superglobal(ZEND_STRL("_GET")); + object_init_ex(&zqs, php_http_querystring_class_entry); + php_http_expect(SUCCESS == php_http_querystring_ctor(&zqs, zsg), unexpected_val, return); + zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("query"), &zqs); zval_ptr_dtor(&zqs); - zsg = php_http_env_get_superglobal(ZEND_STRL("_POST") TSRMLS_CC); - MAKE_STD_ZVAL(zqs); - object_init_ex(zqs, php_http_querystring_class_entry); - php_http_expect(SUCCESS == php_http_querystring_ctor(zqs, zsg TSRMLS_CC), unexpected_val, - zval_ptr_dtor(&zqs); - return; - ); - zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("form"), zqs TSRMLS_CC); + zsg = php_http_env_get_superglobal(ZEND_STRL("_POST")); + object_init_ex(&zqs, php_http_querystring_class_entry); + php_http_expect(SUCCESS == php_http_querystring_ctor(&zqs, zsg), unexpected_val, return); + zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("form"), &zqs); zval_ptr_dtor(&zqs); - zsg = php_http_env_get_superglobal(ZEND_STRL("_COOKIE") TSRMLS_CC); - MAKE_STD_ZVAL(zqs); - object_init_ex(zqs, php_http_querystring_class_entry); - php_http_expect(SUCCESS == php_http_querystring_ctor(zqs, zsg TSRMLS_CC), unexpected_val, - zval_ptr_dtor(&zqs); - return; - ); - zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("cookie"), zqs TSRMLS_CC); + zsg = php_http_env_get_superglobal(ZEND_STRL("_COOKIE")); + object_init_ex(&zqs, php_http_querystring_class_entry); + php_http_expect(SUCCESS == php_http_querystring_ctor(&zqs, zsg), unexpected_val, return); + zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("cookie"), &zqs); zval_ptr_dtor(&zqs); - MAKE_STD_ZVAL(zqs); - array_init(zqs); - if ((zsg = php_http_env_get_superglobal(ZEND_STRL("_FILES") TSRMLS_CC))) { - zend_hash_apply_with_arguments(Z_ARRVAL_P(zsg) TSRMLS_CC, grab_files, 1, zqs); + array_init(&zqs); + if ((zsg = php_http_env_get_superglobal(ZEND_STRL("_FILES")))) { + zend_hash_apply_with_arguments(Z_ARRVAL_P(zsg), grab_files, 1, &zqs); } - zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("files"), zqs TSRMLS_CC); + zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("files"), &zqs); zval_ptr_dtor(&zqs); } @@ -172,24 +162,23 @@ static PHP_METHOD(HttpEnvRequest, __construct) do {\ zend_fcall_info fci; \ zend_fcall_info_cache fcc; \ - zval *rv = NULL, mn, ***args = ecalloc(sizeof(zval **), ZEND_NUM_ARGS()); \ - zval *qs = zend_read_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL(prop), 0 TSRMLS_CC); \ + zval rv, mn, *args = ecalloc(sizeof(zval), ZEND_NUM_ARGS()); \ + zval *this_ptr = getThis(); \ + zval qs_tmp, *qs = zend_read_property(Z_OBJCE_P(this_ptr), this_ptr, ZEND_STRL(prop), 0, &qs_tmp); \ \ - INIT_PZVAL(&mn); \ + ZVAL_NULL(&rv); \ array_init(&mn); \ - Z_ADDREF_P(qs); \ + Z_TRY_ADDREF_P(qs); \ add_next_index_zval(&mn, qs); \ - add_next_index_stringl(&mn, ZEND_STRL("get"), 1); \ - zend_fcall_info_init(&mn, 0, &fci, &fcc, NULL, NULL TSRMLS_CC); \ + add_next_index_stringl(&mn, ZEND_STRL("get")); \ + zend_fcall_info_init(&mn, 0, &fci, &fcc, NULL, NULL); \ zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args); \ - zend_fcall_info_argp(&fci TSRMLS_CC, ZEND_NUM_ARGS(), args); \ - zend_fcall_info_call(&fci, &fcc, &rv, NULL TSRMLS_CC); \ + zend_fcall_info_argp(&fci, ZEND_NUM_ARGS(), args); \ + zend_fcall_info_call(&fci, &fcc, &rv, NULL); \ zend_fcall_info_args_clear(&fci, 1); \ efree(args); \ zval_dtor(&mn); \ - if (rv) { \ - RETVAL_ZVAL(rv, 0, 1); \ - } \ + RETVAL_ZVAL(&rv, 0, 1); \ } while(0); ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvRequest_getForm, 0, 0, 0) @@ -203,7 +192,7 @@ static PHP_METHOD(HttpEnvRequest, getForm) if (ZEND_NUM_ARGS()) { call_querystring_get("form"); } else { - zval *zform = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("form"), 0 TSRMLS_CC); + zval zform_tmp, *zform = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("form"), 0, &zform_tmp); RETURN_ZVAL(zform, 1, 0); } } @@ -219,7 +208,7 @@ static PHP_METHOD(HttpEnvRequest, getQuery) if (ZEND_NUM_ARGS()) { call_querystring_get("query"); } else { - zval *zquery = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("query"), 0 TSRMLS_CC); + zval zquery_tmp, *zquery = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("query"), 0, &zquery_tmp); RETURN_ZVAL(zquery, 1, 0); } } @@ -235,7 +224,7 @@ static PHP_METHOD(HttpEnvRequest, getCookie) if (ZEND_NUM_ARGS()) { call_querystring_get("cookie"); } else { - zval *zcookie = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("cookie"), 0 TSRMLS_CC); + zval zcookie_tmp, *zcookie = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("cookie"), 0, &zcookie_tmp); RETURN_ZVAL(zcookie, 1, 0); } } @@ -245,7 +234,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvRequest, getFiles) { if (SUCCESS == zend_parse_parameters_none()) { - zval *zfiles = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("files"), 0 TSRMLS_CC); + zval zfiles_tmp, *zfiles = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("files"), 0, &zfiles_tmp); RETURN_ZVAL(zfiles, 1, 0); } } @@ -266,12 +255,12 @@ PHP_MINIT_FUNCTION(http_env_request) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http\\Env", "Request", php_http_env_request_methods); - php_http_env_request_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry, NULL TSRMLS_CC); + php_http_env_request_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry); - zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("query"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("form"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("cookie"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("files"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("query"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("form"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("cookie"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("files"), ZEND_ACC_PROTECTED); return SUCCESS; } diff --git a/src/php_http_env_response.c b/src/php_http_env_response.c index 20a31eb..9bc3f5b 100644 --- a/src/php_http_env_response.c +++ b/src/php_http_env_response.c @@ -12,207 +12,186 @@ #include "php_http_api.h" -static void set_option(zval *options, const char *name_str, size_t name_len, int type, void *value_ptr, size_t value_len TSRMLS_DC) +static void set_option(zval *options, const char *name_str, size_t name_len, int type, void *value_ptr, size_t value_len) { if (Z_TYPE_P(options) == IS_OBJECT) { if (value_ptr) { switch (type) { case IS_DOUBLE: - zend_update_property_double(Z_OBJCE_P(options), options, name_str, name_len, *(double *)value_ptr TSRMLS_CC); + zend_update_property_double(Z_OBJCE_P(options), options, name_str, name_len, *(double *)value_ptr); break; case IS_LONG: - zend_update_property_long(Z_OBJCE_P(options), options, name_str, name_len, *(long *)value_ptr TSRMLS_CC); + zend_update_property_long(Z_OBJCE_P(options), options, name_str, name_len, *(zend_long *)value_ptr); break; case IS_STRING: - zend_update_property_stringl(Z_OBJCE_P(options), options, name_str, name_len, value_ptr, value_len TSRMLS_CC); + zend_update_property_stringl(Z_OBJCE_P(options), options, name_str, name_len, value_ptr, value_len); break; case IS_ARRAY: case IS_OBJECT: - zend_update_property(Z_OBJCE_P(options), options, name_str, name_len, value_ptr TSRMLS_CC); + zend_update_property(Z_OBJCE_P(options), options, name_str, name_len, value_ptr); break; } } else { - zend_update_property_null(Z_OBJCE_P(options), options, name_str, name_len TSRMLS_CC); + zend_update_property_null(Z_OBJCE_P(options), options, name_str, name_len); } } else { convert_to_array(options); if (value_ptr) { switch (type) { case IS_DOUBLE: - add_assoc_double_ex(options, name_str, name_len + 1, *(double *)value_ptr); + add_assoc_double_ex(options, name_str, name_len, *(double *)value_ptr); break; case IS_LONG: - add_assoc_long_ex(options, name_str, name_len + 1, *(long *)value_ptr); + add_assoc_long_ex(options, name_str, name_len, *(zend_long *)value_ptr); break; case IS_STRING: { - char *value = estrndup(value_ptr, value_len); - add_assoc_stringl_ex(options, name_str, name_len + 1, value, value_len, 0); + zend_string *value = zend_string_init(value_ptr, value_len, 0); + add_assoc_str_ex(options, name_str, name_len, value); break; case IS_ARRAY: case IS_OBJECT: Z_ADDREF_P(value_ptr); - add_assoc_zval_ex(options, name_str, name_len + 1, value_ptr); + add_assoc_zval_ex(options, name_str, name_len, value_ptr); break; } } } else { - add_assoc_null_ex(options, name_str, name_len + 1); + add_assoc_null_ex(options, name_str, name_len); } } } -static zval *get_option(zval *options, const char *name_str, size_t name_len TSRMLS_DC) +static zval *get_option(zval *options, const char *name_str, size_t name_len, zval *tmp) { - zval *val, **valptr; + zval *val = NULL; if (Z_TYPE_P(options) == IS_OBJECT) { - val = zend_read_property(Z_OBJCE_P(options), options, name_str, name_len, 0 TSRMLS_CC); + val = zend_read_property(Z_OBJCE_P(options), options, name_str, name_len, 0, tmp); + } else if (Z_TYPE_P(options) == IS_ARRAY) { + val = zend_symtable_str_find(Z_ARRVAL_P(options), name_str, name_len); } else { - if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(options), name_str, name_len + 1, (void *) &valptr)) { - val = *valptr; - } else { - val = NULL; - } + abort(); } if (val) { - Z_ADDREF_P(val); + Z_TRY_ADDREF_P(val); } return val; } -static php_http_message_body_t *get_body(zval *options TSRMLS_DC) +static php_http_message_body_t *get_body(zval *options) { - zval *zbody; + zval zbody_tmp, *zbody; php_http_message_body_t *body = NULL; - if ((zbody = get_option(options, ZEND_STRL("body") TSRMLS_CC))) { - if ((Z_TYPE_P(zbody) == IS_OBJECT) && instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry TSRMLS_CC)) { - php_http_message_body_object_t *body_obj = zend_object_store_get_object(zbody TSRMLS_CC); + if ((zbody = get_option(options, ZEND_STRL("body"), &zbody_tmp))) { + if ((Z_TYPE_P(zbody) == IS_OBJECT) && instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry)) { + php_http_message_body_object_t *body_obj = PHP_HTTP_OBJ(NULL, zbody); body = body_obj->body; } - zval_ptr_dtor(&zbody); + Z_TRY_DELREF_P(zbody); } return body; } -static php_http_message_t *get_request(zval *options TSRMLS_DC) +static php_http_message_t *get_request(zval *options) { - zval *zrequest; + zval zrequest_tmp, *zrequest; php_http_message_t *request = NULL; - if ((zrequest = get_option(options, ZEND_STRL("request") TSRMLS_CC))) { - if (Z_TYPE_P(zrequest) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zrequest), php_http_message_class_entry TSRMLS_CC)) { - php_http_message_object_t *request_obj = zend_object_store_get_object(zrequest TSRMLS_CC); + if ((zrequest = get_option(options, ZEND_STRL("request"), &zrequest_tmp))) { + if (Z_TYPE_P(zrequest) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zrequest), php_http_message_class_entry)) { + php_http_message_object_t *request_obj = PHP_HTTP_OBJ(NULL, zrequest); request = request_obj->message; } - zval_ptr_dtor(&zrequest); + Z_TRY_DELREF_P(zrequest); } return request; } -static void set_cookie(zval *options, zval *zcookie_new TSRMLS_DC) +static void set_cookie(zval *options, zval *zcookie_new) { - HashPosition pos; - zval *zcookies_set; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - php_http_cookie_object_t *obj = zend_object_store_get_object(zcookie_new TSRMLS_CC); - - zcookies_set = get_option(options, ZEND_STRL("cookies") TSRMLS_CC); - if (!zcookies_set || Z_TYPE_P(zcookies_set) != IS_ARRAY) { - if (zcookies_set) { - zval_ptr_dtor(&zcookies_set); - } - MAKE_STD_ZVAL(zcookies_set); - array_init_size(zcookies_set, zend_hash_num_elements(&obj->list->cookies)); - } else { - SEPARATE_ZVAL(&zcookies_set); + zval tmp, zcookies_set_tmp, *zcookies_set; + php_http_arrkey_t key; + php_http_cookie_object_t *obj = PHP_HTTP_OBJ(NULL, zcookie_new); + + array_init(&tmp); + zcookies_set = get_option(options, ZEND_STRL("cookies"), &zcookies_set_tmp); + if (zcookies_set && Z_TYPE_P(zcookies_set) == IS_ARRAY) { + array_copy(Z_ARRVAL_P(zcookies_set), Z_ARRVAL(tmp)); + zval_ptr_dtor(zcookies_set); } - FOREACH_HASH_KEY(pos, &obj->list->cookies, key) { + ZEND_HASH_FOREACH_KEY(&obj->list->cookies, key.h, key.key) + { Z_ADDREF_P(zcookie_new); - if (key.type == HASH_KEY_IS_STRING) { - add_assoc_zval_ex(zcookies_set, key.str, key.len, zcookie_new); + if (key.key) { + add_assoc_zval_ex(&tmp, key.key->val, key.key->len, zcookie_new); } else { - add_index_zval(zcookies_set, key.num, zcookie_new); + add_index_zval(&tmp, key.h, zcookie_new); } } + ZEND_HASH_FOREACH_END(); - set_option(options, ZEND_STRL("cookies"), IS_ARRAY, zcookies_set, 0 TSRMLS_CC); - zval_ptr_dtor(&zcookies_set); + set_option(options, ZEND_STRL("cookies"), IS_ARRAY, &tmp, 0); + zval_ptr_dtor(&tmp); } -php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, const char *header_str, size_t header_len, php_http_message_t *request TSRMLS_DC) +php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, const char *header_str, size_t header_len, php_http_message_t *request) { php_http_cache_status_t ret = PHP_HTTP_CACHE_NO; - int free_etag = 0; - char *header = NULL, *etag; + char *header = NULL, *etag = NULL; php_http_message_body_t *body; - zval *zetag; + zval zetag_tmp, *zetag; - if (!(body = get_body(options TSRMLS_CC))) { + if (!(body = get_body(options))) { return ret; } - if ((zetag = get_option(options, ZEND_STRL("etag") TSRMLS_CC))) { - zval *zetag_copy = php_http_ztyp(IS_STRING, zetag); - zval_ptr_dtor(&zetag); - zetag = zetag_copy; + if ((zetag = get_option(options, ZEND_STRL("etag"), &zetag_tmp)) && Z_TYPE_P(zetag) != IS_NULL) { + zend_string *zs = zval_get_string(zetag); + etag = estrndup(zs->val, zs->len); + zend_string_release(zs); + zval_ptr_dtor(zetag); } - if (zetag && Z_STRLEN_P(zetag)) { - etag = Z_STRVAL_P(zetag); - } else if ((etag = php_http_message_body_etag(body))) { - set_option(options, ZEND_STRL("etag"), IS_STRING, etag, strlen(etag) TSRMLS_CC); - free_etag = 1; + if (!etag && (etag = php_http_message_body_etag(body))) { + set_option(options, ZEND_STRL("etag"), IS_STRING, etag, strlen(etag)); } - if (zetag) { - zval_ptr_dtor(&zetag); - } - - if (etag && (header = php_http_env_get_request_header(header_str, header_len, NULL, request TSRMLS_CC))) { - ret = php_http_match(header, etag, PHP_HTTP_MATCH_WORD) ? PHP_HTTP_CACHE_HIT : PHP_HTTP_CACHE_MISS; - } - - if (free_etag) { - efree(etag); + if (etag && (header = php_http_env_get_request_header(header_str, header_len, NULL, request))) { + ret = php_http_match(header, etag, PHP_HTTP_MATCH_WORD) ? PHP_HTTP_CACHE_HIT : PHP_HTTP_CACHE_MISS; } + PTR_FREE(etag); PTR_FREE(header); + return ret; } -php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *options, const char *header_str, size_t header_len, php_http_message_t *request TSRMLS_DC) +php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *options, const char *header_str, size_t header_len, php_http_message_t *request) { php_http_cache_status_t ret = PHP_HTTP_CACHE_NO; char *header; time_t ums, lm = 0; php_http_message_body_t *body; - zval *zlm; + zval zlm_tmp, *zlm; - if (!(body = get_body(options TSRMLS_CC))) { + if (!(body = get_body(options))) { return ret; } - if ((zlm = get_option(options, ZEND_STRL("lastModified") TSRMLS_CC))) { - zval *zlm_copy = php_http_ztyp(IS_LONG, zlm); - zval_ptr_dtor(&zlm); - zlm = zlm_copy; + if ((zlm = get_option(options, ZEND_STRL("lastModified"), &zlm_tmp))) { + lm = zval_get_long(zlm); + zval_ptr_dtor(zlm); } - if (zlm && Z_LVAL_P(zlm) > 0) { - lm = Z_LVAL_P(zlm); - } else { + if (lm <= 0) { lm = php_http_message_body_mtime(body); - set_option(options, ZEND_STRL("lastModified"), IS_LONG, &lm, 0 TSRMLS_CC); - } - - if (zlm) { - zval_ptr_dtor(&zlm); + set_option(options, ZEND_STRL("lastModified"), IS_LONG, &lm, 0); } - if ((header = php_http_env_get_request_header(header_str, header_len, NULL, request TSRMLS_CC))) { + if ((header = php_http_env_get_request_header(header_str, header_len, NULL, request))) { ums = php_parse_date(header, NULL); if (ums > 0 && ums >= lm) { @@ -229,24 +208,23 @@ php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *o static zend_bool php_http_env_response_is_cacheable(php_http_env_response_t *r, php_http_message_t *request) { long status = r->ops->get_status(r); - TSRMLS_FETCH_FROM_CTX(r->ts); if (status && status / 100 != 2) { return 0; } - if (php_http_env_got_request_header(ZEND_STRL("Authorization"), request TSRMLS_CC)) { + if (php_http_env_got_request_header(ZEND_STRL("Authorization"), request)) { return 0; } - if (-1 == php_http_select_str(php_http_env_get_request_method(request TSRMLS_CC), 2, "HEAD", "GET")) { + if (-1 == php_http_select_str(php_http_env_get_request_method(request), 2, "HEAD", "GET")) { return 0; } return 1; } -static size_t output(void *context, char *buf, size_t len TSRMLS_DC) +static size_t output(void *context, char *buf, size_t len) { php_http_env_response_t *r = context; @@ -263,11 +241,9 @@ static size_t output(void *context, char *buf, size_t len TSRMLS_DC) return len; } -#define php_http_env_response_send_done(r) php_http_env_response_send_data((r), NULL, 0) static ZEND_RESULT_CODE php_http_env_response_send_data(php_http_env_response_t *r, const char *buf, size_t len) { size_t chunks_sent, chunk = r->throttle.chunk ? r->throttle.chunk : PHP_HTTP_SENDBUF_SIZE; - TSRMLS_FETCH_FROM_CTX(r->ts); if (r->content.encoder) { char *enc_str = NULL; @@ -286,16 +262,21 @@ static ZEND_RESULT_CODE php_http_env_response_send_data(php_http_env_response_t if (!enc_str) { return SUCCESS; } - chunks_sent = php_http_buffer_chunked_output(&r->buffer, enc_str, enc_len, buf ? chunk : 0, output, r TSRMLS_CC); + chunks_sent = php_http_buffer_chunked_output(&r->buffer, enc_str, enc_len, buf ? chunk : 0, output, r); PTR_FREE(enc_str); } else { - chunks_sent = php_http_buffer_chunked_output(&r->buffer, buf, len, buf ? chunk : 0, output, r TSRMLS_CC); + chunks_sent = php_http_buffer_chunked_output(&r->buffer, buf, len, buf ? chunk : 0, output, r); } return chunks_sent != (size_t) -1 ? SUCCESS : FAILURE; } -php_http_env_response_t *php_http_env_response_init(php_http_env_response_t *r, zval *options, php_http_env_response_ops_t *ops, void *init_arg TSRMLS_DC) +static inline ZEND_RESULT_CODE php_http_env_response_send_done(php_http_env_response_t *r) +{ + return php_http_env_response_send_data(r, NULL, 0); +} + +php_http_env_response_t *php_http_env_response_init(php_http_env_response_t *r, zval *options, php_http_env_response_ops_t *ops, void *init_arg) { zend_bool free_r; @@ -312,10 +293,7 @@ php_http_env_response_t *php_http_env_response_init(php_http_env_response_t *r, r->buffer = php_http_buffer_init(NULL); - Z_ADDREF_P(options); - r->options = options; - - TSRMLS_SET_CTX(r->ts); + ZVAL_COPY(&r->options, options); if (r->ops->init && (SUCCESS != r->ops->init(r, init_arg))) { if (free_r) { @@ -355,62 +333,60 @@ void php_http_env_response_free(php_http_env_response_t **r) static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t *r, php_http_message_t *request) { ZEND_RESULT_CODE ret = SUCCESS; - zval *zoption, *options = r->options; - TSRMLS_FETCH_FROM_CTX(r->ts); + zval zoption_tmp, *zoption, *options = &r->options; if (r->done) { return ret; } - if ((zoption = get_option(options, ZEND_STRL("headers") TSRMLS_CC))) { + if ((zoption = get_option(options, ZEND_STRL("headers"), &zoption_tmp))) { if (Z_TYPE_P(zoption) == IS_ARRAY) { - php_http_header_to_callback(Z_ARRVAL_P(zoption), 0, (php_http_pass_format_callback_t) r->ops->set_header, r TSRMLS_CC); + php_http_header_to_callback(Z_ARRVAL_P(zoption), 0, (php_http_pass_format_callback_t) r->ops->set_header, r); } - zval_ptr_dtor(&zoption); + zval_ptr_dtor(zoption); } if (ret != SUCCESS) { return ret; } - if ((zoption = get_option(options, ZEND_STRL("responseCode") TSRMLS_CC))) { - zval *zoption_copy = php_http_ztyp(IS_LONG, zoption); + if ((zoption = get_option(options, ZEND_STRL("responseCode"), &zoption_tmp))) { + zend_long rc = zval_get_long(zoption); - zval_ptr_dtor(&zoption); - if (Z_LVAL_P(zoption_copy) > 0) { - ret = r->ops->set_status(r, Z_LVAL_P(zoption_copy)); + zval_ptr_dtor(zoption); + if (rc > 0) { + ret = r->ops->set_status(r, rc); } - zval_ptr_dtor(&zoption_copy); } if (ret != SUCCESS) { return ret; } - if ((zoption = get_option(options, ZEND_STRL("httpVersion") TSRMLS_CC))) { + if ((zoption = get_option(options, ZEND_STRL("httpVersion"), &zoption_tmp))) { php_http_version_t v; - zval *zoption_copy = php_http_ztyp(IS_STRING, zoption); + zend_string *zs = zval_get_string(zoption); - zval_ptr_dtor(&zoption); - if (Z_STRLEN_P(zoption_copy) && php_http_version_parse(&v, Z_STRVAL_P(zoption_copy) TSRMLS_CC)) { + zval_ptr_dtor(zoption); + if (zs->len && php_http_version_parse(&v, zs->val)) { ret = r->ops->set_protocol_version(r, &v); php_http_version_dtor(&v); } - zval_ptr_dtor(&zoption_copy); + zend_string_release(zs); } if (ret != SUCCESS) { return ret; } - if ((zoption = get_option(options, ZEND_STRL("cookies") TSRMLS_CC))) { + if ((zoption = get_option(options, ZEND_STRL("cookies"), &zoption_tmp))) { if (Z_TYPE_P(zoption) == IS_ARRAY) { - HashPosition pos; - zval **zcookie; + zval *zcookie; - FOREACH_VAL(pos, zoption, zcookie) { - if (Z_TYPE_PP(zcookie) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(zcookie), php_http_cookie_class_entry TSRMLS_CC)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(*zcookie TSRMLS_CC); + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(zoption), zcookie) + { + if (Z_TYPE_P(zcookie) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zcookie), php_http_cookie_class_entry)) { + php_http_cookie_object_t *obj = PHP_HTTP_OBJ(NULL, zcookie); char *str; size_t len; @@ -422,24 +398,25 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t efree(str); } } + ZEND_HASH_FOREACH_END(); } - zval_ptr_dtor(&zoption); + zval_ptr_dtor(zoption); } if (ret != SUCCESS) { return ret; } - if ((zoption = get_option(options, ZEND_STRL("contentType") TSRMLS_CC))) { - zval *zoption_copy = php_http_ztyp(IS_STRING, zoption); + if ((zoption = get_option(options, ZEND_STRL("contentType"), &zoption_tmp))) { + zend_string *zs = zval_get_string(zoption); - zval_ptr_dtor(&zoption); - if (Z_STRLEN_P(zoption_copy) && strchr(Z_STRVAL_P(zoption_copy), '/')) { - if (SUCCESS == (ret = r->ops->set_header(r, "Content-Type: %.*s", Z_STRLEN_P(zoption_copy), Z_STRVAL_P(zoption_copy)))) { - r->content.type = estrndup(Z_STRVAL_P(zoption_copy), Z_STRLEN_P(zoption_copy)); + zval_ptr_dtor(zoption); + if (zs->len && strchr(zs->val, '/')) { + if (SUCCESS == (ret = r->ops->set_header(r, "Content-Type: %.*s", zs->len, zs->val))) { + r->content.type = estrndup(zs->val, zs->len); } } - zval_ptr_dtor(&zoption_copy); + zend_string_release(zs); } if (ret != SUCCESS) { @@ -448,13 +425,13 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t if (r->range.status == PHP_HTTP_RANGE_OK) { if (zend_hash_num_elements(&r->range.values) == 1) { - zval **range, **begin, **end; + zval *range, *begin, *end; - if ( 1 == php_http_array_list(&r->range.values TSRMLS_CC, 1, &range) - && 2 == php_http_array_list(Z_ARRVAL_PP(range) TSRMLS_CC, 2, &begin, &end) + if ( 1 == php_http_array_list(&r->range.values, 1, &range) + && 2 == php_http_array_list(Z_ARRVAL_P(range), 2, &begin, &end) ) { if (SUCCESS == (ret = r->ops->set_status(r, 206))) { - ret = r->ops->set_header(r, "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), r->content.length); + ret = r->ops->set_header(r, "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_P(begin), Z_LVAL_P(end), r->content.length); } } else { /* this should never happen */ @@ -462,77 +439,77 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t ret = FAILURE; } } else { - php_http_boundary(r->range.boundary, sizeof(r->range.boundary) TSRMLS_CC); + php_http_boundary(r->range.boundary, sizeof(r->range.boundary)); if (SUCCESS == (ret = r->ops->set_status(r, 206))) { ret = r->ops->set_header(r, "Content-Type: multipart/byteranges; boundary=%s", r->range.boundary); } } } else { - if ((zoption = get_option(options, ZEND_STRL("cacheControl") TSRMLS_CC))) { - zval *zoption_copy = php_http_ztyp(IS_STRING, zoption); + if ((zoption = get_option(options, ZEND_STRL("cacheControl"), &zoption_tmp))) { + zend_string *zs = zval_get_string(zoption); - zval_ptr_dtor(&zoption); - if (Z_STRLEN_P(zoption_copy)) { - ret = r->ops->set_header(r, "Cache-Control: %.*s", Z_STRLEN_P(zoption_copy), Z_STRVAL_P(zoption_copy)); + zval_ptr_dtor(zoption); + if (zs->len) { + ret = r->ops->set_header(r, "Cache-Control: %.*s", zs->len, zs->val); } - zval_ptr_dtor(&zoption_copy); + zend_string_release(zs); } if (ret != SUCCESS) { return ret; } - if ((zoption = get_option(options, ZEND_STRL("contentDisposition") TSRMLS_CC))) { - zval *zoption_copy = php_http_ztyp(IS_ARRAY, zoption); - php_http_buffer_t buf; + if ((zoption = get_option(options, ZEND_STRL("contentDisposition"), &zoption_tmp))) { + + if (Z_TYPE_P(zoption) == IS_ARRAY) { + php_http_buffer_t buf; - php_http_buffer_init(&buf); - if (php_http_params_to_string(&buf, Z_ARRVAL_P(zoption_copy), ZEND_STRL(","), ZEND_STRL(";"), ZEND_STRL("="), PHP_HTTP_PARAMS_DEFAULT TSRMLS_CC)) { - if (buf.used) { - ret = r->ops->set_header(r, "Content-Disposition: %.*s", buf.used, buf.data); + php_http_buffer_init(&buf); + if (php_http_params_to_string(&buf, Z_ARRVAL_P(zoption), ZEND_STRL(","), ZEND_STRL(";"), ZEND_STRL("="), PHP_HTTP_PARAMS_DEFAULT)) { + if (buf.used) { + ret = r->ops->set_header(r, "Content-Disposition: %.*s", buf.used, buf.data); + } } - } - php_http_buffer_dtor(&buf); - zval_ptr_dtor(&zoption_copy); - zval_ptr_dtor(&zoption); + php_http_buffer_dtor(&buf); + } + zval_ptr_dtor(zoption); } if (ret != SUCCESS) { return ret; } - if ((zoption = get_option(options, ZEND_STRL("contentEncoding") TSRMLS_CC))) { - zval *zoption_copy = php_http_ztyp(IS_LONG, zoption); + if ((zoption = get_option(options, ZEND_STRL("contentEncoding"), &zoption_tmp))) { + zend_long ce = zval_get_long(zoption); zval zsupported; HashTable *result = NULL; - zval_ptr_dtor(&zoption); - switch (Z_LVAL_P(zoption_copy)) { + zval_ptr_dtor(zoption); + switch (ce) { case PHP_HTTP_CONTENT_ENCODING_GZIP: - INIT_PZVAL(&zsupported); array_init(&zsupported); - add_next_index_stringl(&zsupported, ZEND_STRL("none"), 1); - add_next_index_stringl(&zsupported, ZEND_STRL("gzip"), 1); - add_next_index_stringl(&zsupported, ZEND_STRL("deflate"), 1); + add_next_index_stringl(&zsupported, ZEND_STRL("none")); + add_next_index_stringl(&zsupported, ZEND_STRL("gzip")); + add_next_index_stringl(&zsupported, ZEND_STRL("deflate")); - if ((result = php_http_negotiate_encoding(Z_ARRVAL(zsupported), request TSRMLS_CC))) { - char *key_str = NULL; - uint key_len = 0; + if ((result = php_http_negotiate_encoding(Z_ARRVAL(zsupported), request))) { + zend_string *key_str = NULL; + zend_ulong index = 0; zend_hash_internal_pointer_reset(result); - if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key_str, &key_len, NULL, 0, NULL)) { - if (!strcmp(key_str, "gzip")) { - if (!(r->content.encoder = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), PHP_HTTP_DEFLATE_TYPE_GZIP TSRMLS_CC))) { + if (HASH_KEY_IS_STRING == zend_hash_get_current_key(result, &key_str, &index)) { + if (zend_string_equals_literal(key_str, "gzip")) { + if (!(r->content.encoder = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), PHP_HTTP_DEFLATE_TYPE_GZIP))) { ret = FAILURE; } else if (SUCCESS == (ret = r->ops->set_header(r, "Content-Encoding: gzip"))) { - r->content.encoding = estrndup(key_str, key_len - 1); + r->content.encoding = estrndup(key_str->val, key_str->len); } - } else if (!strcmp(key_str, "deflate")) { - if (!(r->content.encoder = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), PHP_HTTP_DEFLATE_TYPE_ZLIB TSRMLS_CC))) { + } else if (zend_string_equals_literal(key_str, "deflate")) { + if (!(r->content.encoder = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), PHP_HTTP_DEFLATE_TYPE_ZLIB))) { ret = FAILURE; } else if (SUCCESS == (ret = r->ops->set_header(r, "Content-Encoding: deflate"))) { - r->content.encoding = estrndup(key_str, key_len - 1); + r->content.encoding = estrndup(key_str->val, key_str->len); } } else { ret = r->ops->del_header(r, ZEND_STRL("Content-Encoding")); @@ -555,7 +532,6 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t ret = r->ops->del_header(r, ZEND_STRL("Content-Encoding")); break; } - zval_ptr_dtor(&zoption_copy); } if (SUCCESS != ret) { @@ -563,12 +539,12 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t } if (php_http_env_response_is_cacheable(r, request)) { - switch (php_http_env_is_response_cached_by_etag(options, ZEND_STRL("If-None-Match"), request TSRMLS_CC)) { + switch (php_http_env_is_response_cached_by_etag(options, ZEND_STRL("If-None-Match"), request)) { case PHP_HTTP_CACHE_MISS: break; case PHP_HTTP_CACHE_NO: - if (PHP_HTTP_CACHE_HIT != php_http_env_is_response_cached_by_last_modified(options, ZEND_STRL("If-Modified-Since"), request TSRMLS_CC)) { + if (PHP_HTTP_CACHE_HIT != php_http_env_is_response_cached_by_last_modified(options, ZEND_STRL("If-Modified-Since"), request)) { break; } /* no break */ @@ -579,29 +555,28 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t break; } - if ((zoption = get_option(options, ZEND_STRL("etag") TSRMLS_CC))) { - zval *zoption_copy = php_http_ztyp(IS_STRING, zoption); + if ((zoption = get_option(options, ZEND_STRL("etag"), &zoption_tmp))) { + zend_string *zs = zval_get_string(zoption); - zval_ptr_dtor(&zoption); - if (*Z_STRVAL_P(zoption_copy) != '"' && strncmp(Z_STRVAL_P(zoption_copy), "W/\"", 3)) { - ret = r->ops->set_header(r, "ETag: \"%s\"", Z_STRVAL_P(zoption_copy)); + zval_ptr_dtor(zoption); + if (*zs->val != '"' && strncmp(zs->val, "W/\"", 3)) { + ret = r->ops->set_header(r, "ETag: \"%s\"", zs->val); } else { - ret = r->ops->set_header(r, "ETag: %s", Z_STRVAL_P(zoption_copy)); + ret = r->ops->set_header(r, "ETag: %s", zs->val); } - zval_ptr_dtor(&zoption_copy); + zend_string_release(zs); } - if ((zoption = get_option(options, ZEND_STRL("lastModified") TSRMLS_CC))) { - zval *zoption_copy = php_http_ztyp(IS_LONG, zoption); + if ((zoption = get_option(options, ZEND_STRL("lastModified"), &zoption_tmp))) { + zend_long lm = zval_get_long(zoption); - zval_ptr_dtor(&zoption); - if (Z_LVAL_P(zoption_copy)) { - char *date = php_format_date(ZEND_STRL(PHP_HTTP_DATE_FORMAT), Z_LVAL_P(zoption_copy), 0 TSRMLS_CC); + zval_ptr_dtor(zoption); + if (lm) { + zend_string *date = php_format_date(ZEND_STRL(PHP_HTTP_DATE_FORMAT), lm, 0); if (date) { - ret = r->ops->set_header(r, "Last-Modified: %s", date); - efree(date); + ret = r->ops->set_header(r, "Last-Modified: %s", date->val); + zend_string_release(date); } } - zval_ptr_dtor(&zoption_copy); } } } @@ -612,38 +587,33 @@ static ZEND_RESULT_CODE php_http_env_response_send_head(php_http_env_response_t static ZEND_RESULT_CODE php_http_env_response_send_body(php_http_env_response_t *r) { ZEND_RESULT_CODE ret = SUCCESS; - zval *zoption; + zval zoption_tmp, *zoption; php_http_message_body_t *body; - TSRMLS_FETCH_FROM_CTX(r->ts); if (r->done) { return ret; } - if ((body = get_body(r->options TSRMLS_CC))) { - if ((zoption = get_option(r->options, ZEND_STRL("throttleDelay") TSRMLS_CC))) { - if (Z_TYPE_P(zoption) == IS_DOUBLE) { - r->throttle.delay = Z_DVAL_P(zoption); - } - zval_ptr_dtor(&zoption); + if ((body = get_body(&r->options))) { + if ((zoption = get_option(&r->options, ZEND_STRL("throttleDelay"), &zoption_tmp))) { + r->throttle.delay = zval_get_double(zoption); + zval_ptr_dtor(zoption); } - if ((zoption = get_option(r->options, ZEND_STRL("throttleChunk") TSRMLS_CC))) { - if (Z_TYPE_P(zoption) == IS_LONG) { - r->throttle.chunk = Z_LVAL_P(zoption); - } - zval_ptr_dtor(&zoption); + if ((zoption = get_option(&r->options, ZEND_STRL("throttleChunk"), &zoption_tmp))) { + r->throttle.chunk = zval_get_long(zoption); + zval_ptr_dtor(zoption); } if (r->range.status == PHP_HTTP_RANGE_OK) { if (zend_hash_num_elements(&r->range.values) == 1) { /* single range */ - zval **range, **begin, **end; + zval *range, *begin, *end; - if ( 1 == php_http_array_list(&r->range.values TSRMLS_CC, 1, &range) - && 2 == php_http_array_list(Z_ARRVAL_PP(range) TSRMLS_CC, 2, &begin, &end) + if ( 1 == php_http_array_list(&r->range.values, 1, &range) + && 2 == php_http_array_list(Z_ARRVAL_P(range), 2, &begin, &end) ) { /* send chunk */ - ret = php_http_message_body_to_callback(body, (php_http_pass_callback_t) php_http_env_response_send_data, r, Z_LVAL_PP(begin), Z_LVAL_PP(end) - Z_LVAL_PP(begin) + 1); + ret = php_http_message_body_to_callback(body, (php_http_pass_callback_t) php_http_env_response_send_data, r, Z_LVAL_P(begin), Z_LVAL_P(end) - Z_LVAL_P(begin) + 1); if (ret == SUCCESS) { ret = php_http_env_response_send_done(r); } @@ -657,13 +627,13 @@ static ZEND_RESULT_CODE php_http_env_response_send_body(php_http_env_response_t } else { /* send multipart/byte-ranges message */ - HashPosition pos; - zval **chunk; + zval *chunk; - FOREACH_HASH_VAL(pos, &r->range.values, chunk) { - zval **begin, **end; + ZEND_HASH_FOREACH_VAL(&r->range.values, chunk) + { + zval *begin, *end; - if (2 == php_http_array_list(Z_ARRVAL_PP(chunk) TSRMLS_CC, 2, &begin, &end)) { + if (2 == php_http_array_list(Z_ARRVAL_P(chunk), 2, &begin, &end)) { php_http_buffer_appendf(r->buffer, PHP_HTTP_CRLF "--%s" PHP_HTTP_CRLF @@ -672,13 +642,14 @@ static ZEND_RESULT_CODE php_http_env_response_send_body(php_http_env_response_t /* - */ r->range.boundary, r->content.type ? r->content.type : "application/octet-stream", - Z_LVAL_PP(begin), - Z_LVAL_PP(end), + Z_LVAL_P(begin), + Z_LVAL_P(end), r->content.length ); - ret = php_http_message_body_to_callback(body, (php_http_pass_callback_t) php_http_env_response_send_data, r, Z_LVAL_PP(begin), Z_LVAL_PP(end) - Z_LVAL_PP(begin) + 1); + ret = php_http_message_body_to_callback(body, (php_http_pass_callback_t) php_http_env_response_send_data, r, Z_LVAL_P(begin), Z_LVAL_P(end) - Z_LVAL_P(begin) + 1); } } + ZEND_HASH_FOREACH_END(); if (ret == SUCCESS) { php_http_buffer_appendf(r->buffer, PHP_HTTP_CRLF "--%s--", r->range.boundary); @@ -701,19 +672,18 @@ ZEND_RESULT_CODE php_http_env_response_send(php_http_env_response_t *r) { php_http_message_t *request; php_http_message_body_t *body; - TSRMLS_FETCH_FROM_CTX(r->ts); - request = get_request(r->options TSRMLS_CC); + request = get_request(&r->options); /* check for ranges */ - if ((body = get_body(r->options TSRMLS_CC))) { + if ((body = get_body(&r->options))) { r->content.length = php_http_message_body_size(body); if (SUCCESS != r->ops->set_header(r, "Accept-Ranges: bytes")) { return FAILURE; } else { - zend_hash_init(&r->range.values, 0, NULL, ZVAL_PTR_DTOR, 0); - r->range.status = php_http_env_get_request_ranges(&r->range.values, r->content.length, request TSRMLS_CC); + ZEND_INIT_SYMTABLE_EX(&r->range.values, 0, 0); + r->range.status = php_http_env_get_request_ranges(&r->range.values, r->content.length, request); switch (r->range.status) { case PHP_HTTP_RANGE_NO: @@ -721,7 +691,7 @@ ZEND_RESULT_CODE php_http_env_response_send(php_http_env_response_t *r) break; case PHP_HTTP_RANGE_ERR: - if (php_http_env_got_request_header(ZEND_STRL("If-Range"), request TSRMLS_CC)) { + if (php_http_env_got_request_header(ZEND_STRL("If-Range"), request)) { r->range.status = PHP_HTTP_RANGE_NO; zend_hash_destroy(&r->range.values); } else { @@ -737,16 +707,16 @@ ZEND_RESULT_CODE php_http_env_response_send(php_http_env_response_t *r) break; case PHP_HTTP_RANGE_OK: - if (PHP_HTTP_CACHE_MISS == php_http_env_is_response_cached_by_etag(r->options, ZEND_STRL("If-Range"), request TSRMLS_CC) - || PHP_HTTP_CACHE_MISS == php_http_env_is_response_cached_by_last_modified(r->options, ZEND_STRL("If-Range"), request TSRMLS_CC) + if (PHP_HTTP_CACHE_MISS == php_http_env_is_response_cached_by_etag(&r->options, ZEND_STRL("If-Range"), request) + || PHP_HTTP_CACHE_MISS == php_http_env_is_response_cached_by_last_modified(&r->options, ZEND_STRL("If-Range"), request) ) { r->range.status = PHP_HTTP_RANGE_NO; zend_hash_destroy(&r->range.values); break; } - if (PHP_HTTP_CACHE_MISS == php_http_env_is_response_cached_by_etag(r->options, ZEND_STRL("If-Match"), request TSRMLS_CC) - || PHP_HTTP_CACHE_MISS == php_http_env_is_response_cached_by_last_modified(r->options, ZEND_STRL("If-Unmodified-Since"), request TSRMLS_CC) - || PHP_HTTP_CACHE_MISS == php_http_env_is_response_cached_by_last_modified(r->options, ZEND_STRL("Unless-Modified-Since"), request TSRMLS_CC) + if (PHP_HTTP_CACHE_MISS == php_http_env_is_response_cached_by_etag(&r->options, ZEND_STRL("If-Match"), request) + || PHP_HTTP_CACHE_MISS == php_http_env_is_response_cached_by_last_modified(&r->options, ZEND_STRL("If-Unmodified-Since"), request) + || PHP_HTTP_CACHE_MISS == php_http_env_is_response_cached_by_last_modified(&r->options, ZEND_STRL("Unless-Modified-Since"), request) ) { r->done = 1; zend_hash_destroy(&r->range.values); @@ -762,17 +732,17 @@ ZEND_RESULT_CODE php_http_env_response_send(php_http_env_response_t *r) } if (SUCCESS != php_http_env_response_send_head(r, request)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to send response headers"); + php_error_docref(NULL, E_WARNING, "Failed to send response headers"); return FAILURE; } if (SUCCESS != php_http_env_response_send_body(r)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to send response body"); + php_error_docref(NULL, E_WARNING, "Failed to send response body"); return FAILURE; } if (SUCCESS != r->ops->finish(r)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to finish response"); + php_error_docref(NULL, E_WARNING, "Failed to finish response"); return FAILURE; } @@ -781,30 +751,24 @@ ZEND_RESULT_CODE php_http_env_response_send(php_http_env_response_t *r) static long php_http_env_response_sapi_get_status(php_http_env_response_t *r) { - TSRMLS_FETCH_FROM_CTX(r->ts); - - return php_http_env_get_response_code(TSRMLS_C); + return php_http_env_get_response_code(); } static ZEND_RESULT_CODE php_http_env_response_sapi_set_status(php_http_env_response_t *r, long http_code) { - TSRMLS_FETCH_FROM_CTX(r->ts); - - return php_http_env_set_response_code(http_code TSRMLS_CC); + return php_http_env_set_response_code(http_code); } static ZEND_RESULT_CODE php_http_env_response_sapi_set_protocol_version(php_http_env_response_t *r, php_http_version_t *v) { - TSRMLS_FETCH_FROM_CTX(r->ts); - return php_http_env_set_response_protocol_version(v TSRMLS_CC); + return php_http_env_set_response_protocol_version(v); } static ZEND_RESULT_CODE php_http_env_response_sapi_set_header(php_http_env_response_t *r, const char *fmt, ...) { ZEND_RESULT_CODE ret; va_list args; - TSRMLS_FETCH_FROM_CTX(r->ts); va_start(args, fmt); - ret = php_http_env_set_response_header_va(0, 1, fmt, args TSRMLS_CC); + ret = php_http_env_set_response_header_va(0, 1, fmt, args); va_end(args); return ret; @@ -813,24 +777,19 @@ static ZEND_RESULT_CODE php_http_env_response_sapi_add_header(php_http_env_respo { ZEND_RESULT_CODE ret; va_list args; - TSRMLS_FETCH_FROM_CTX(r->ts); va_start(args, fmt); - ret = php_http_env_set_response_header_va(0, 0, fmt, args TSRMLS_CC); + ret = php_http_env_set_response_header_va(0, 0, fmt, args); va_end(args); return ret; } static ZEND_RESULT_CODE php_http_env_response_sapi_del_header(php_http_env_response_t *r, const char *header_str, size_t header_len) { - TSRMLS_FETCH_FROM_CTX(r->ts); - - return php_http_env_set_response_header_value(0, header_str, header_len, NULL, 1 TSRMLS_CC); + return php_http_env_set_response_header_value(0, header_str, header_len, NULL, 1); } static ZEND_RESULT_CODE php_http_env_response_sapi_write(php_http_env_response_t *r, const char *data_str, size_t data_len) { - TSRMLS_FETCH_FROM_CTX(r->ts); - if (0 < PHPWRITE(data_str, data_len)) { return SUCCESS; } @@ -838,19 +797,12 @@ static ZEND_RESULT_CODE php_http_env_response_sapi_write(php_http_env_response_t } static ZEND_RESULT_CODE php_http_env_response_sapi_flush(php_http_env_response_t *r) { - TSRMLS_FETCH_FROM_CTX(r->ts); - -#if PHP_VERSION_ID >= 50400 - if (php_output_get_level(TSRMLS_C)) { - php_output_flush_all(TSRMLS_C); + if (php_output_get_level()) { + php_output_flush_all(); } - if (!(php_output_get_status(TSRMLS_C) & PHP_OUTPUT_IMPLICITFLUSH)) { - sapi_flush(TSRMLS_C); + if (!(php_output_get_status() & PHP_OUTPUT_IMPLICITFLUSH)) { + sapi_flush(); } -#else - php_end_ob_buffer(1, 1 TSRMLS_CC); - sapi_flush(TSRMLS_C); -#endif return SUCCESS; } @@ -896,21 +848,17 @@ static ZEND_RESULT_CODE php_http_env_response_stream_init(php_http_env_response_ { php_http_env_response_stream_ctx_t *ctx; size_t buffer_size = 0x1000; - TSRMLS_FETCH_FROM_CTX(r->ts); ctx = ecalloc(1, sizeof(*ctx)); ctx->stream = init_arg; - if (!ctx->stream || SUCCESS != zend_list_addref(ctx->stream->rsrc_id)) { - efree(ctx); - return FAILURE; - } + ++GC_REFCOUNT(ctx->stream->res); + ZEND_INIT_SYMTABLE(&ctx->header); + php_http_version_init(&ctx->version, 1, 1); php_stream_set_option(ctx->stream, PHP_STREAM_OPTION_WRITE_BUFFER, PHP_STREAM_BUFFER_FULL, &buffer_size); - zend_hash_init(&ctx->header, 0, NULL, ZVAL_PTR_DTOR, 0); - php_http_version_init(&ctx->version, 1, 1 TSRMLS_CC); ctx->status_code = 200; ctx->chunked = 1; - ctx->request = get_request(r->options TSRMLS_CC); + ctx->request = get_request(&r->options); /* there are some limitations regarding TE:chunked, see https://tools.ietf.org/html/rfc7230#section-3.3.1 */ if (ctx->request && ctx->request->http.version.major == 1 && ctx->request->http.version.minor == 0) { @@ -924,40 +872,40 @@ static ZEND_RESULT_CODE php_http_env_response_stream_init(php_http_env_response_ static void php_http_env_response_stream_dtor(php_http_env_response_t *r) { php_http_env_response_stream_ctx_t *ctx = r->ctx; - TSRMLS_FETCH_FROM_CTX(r->ts); if (ctx->chunked_filter) { - ctx->chunked_filter = php_stream_filter_remove(ctx->chunked_filter, 1 TSRMLS_CC); + ctx->chunked_filter = php_stream_filter_remove(ctx->chunked_filter, 1); } zend_hash_destroy(&ctx->header); - zend_list_delete(ctx->stream->rsrc_id); + zend_list_delete(ctx->stream->res); efree(ctx); r->ctx = NULL; } -static void php_http_env_response_stream_header(php_http_env_response_stream_ctx_t *ctx, HashTable *header, php_http_buffer_t *buf TSRMLS_DC) +static void php_http_env_response_stream_header(php_http_env_response_stream_ctx_t *ctx, HashTable *header, php_http_buffer_t *buf) { - HashPosition pos; - zval **val; + zval *val; - FOREACH_HASH_VAL(pos, header, val) { - if (Z_TYPE_PP(val) == IS_ARRAY) { - php_http_env_response_stream_header(ctx, Z_ARRVAL_PP(val), buf TSRMLS_CC); + ZEND_HASH_FOREACH_VAL(header, val) + { + if (Z_TYPE_P(val) == IS_ARRAY) { + php_http_env_response_stream_header(ctx, Z_ARRVAL_P(val), buf); } else { - zval *tmp = php_http_ztyp(IS_STRING, *val); + zend_string *zs = zval_get_string(val); if (ctx->chunked) { /* disable chunked transfer encoding if we've got an explicit content-length */ - if (!strncasecmp(Z_STRVAL_P(tmp), "Content-Length:", lenof("Content-Length:"))) { + if (!strncasecmp(zs->val, "Content-Length:", lenof("Content-Length:"))) { ctx->chunked = 0; } } - php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); + php_http_buffer_append(buf, zs->val, zs->len); php_http_buffer_appends(buf, PHP_HTTP_CRLF); - zval_ptr_dtor(&tmp); + zend_string_release(zs); } } + ZEND_HASH_FOREACH_END(); } -static ZEND_RESULT_CODE php_http_env_response_stream_start(php_http_env_response_stream_ctx_t *ctx TSRMLS_DC) +static ZEND_RESULT_CODE php_http_env_response_stream_start(php_http_env_response_stream_ctx_t *ctx) { php_http_buffer_t header_buf; @@ -977,12 +925,13 @@ static ZEND_RESULT_CODE php_http_env_response_stream_start(php_http_env_response ctx->chunked = 0; } - php_http_env_response_stream_header(ctx, &ctx->header, &header_buf TSRMLS_CC); + php_http_env_response_stream_header(ctx, &ctx->header, &header_buf); /* enable chunked transfer encoding */ if (ctx->chunked) { php_http_buffer_appends(&header_buf, "Transfer-Encoding: chunked" PHP_HTTP_CRLF); } + php_http_buffer_appends(&header_buf, PHP_HTTP_CRLF); if (header_buf.used == php_stream_write(ctx->stream, header_buf.data, header_buf.used)) { @@ -992,7 +941,7 @@ static ZEND_RESULT_CODE php_http_env_response_stream_start(php_http_env_response php_stream_flush(ctx->stream); if (ctx->chunked) { - ctx->chunked_filter = php_stream_filter_create("http.chunked_encode", NULL, 0 TSRMLS_CC); + ctx->chunked_filter = php_stream_filter_create("http.chunked_encode", NULL, 0); php_stream_filter_append(&ctx->stream->writefilters, ctx->chunked_filter); } @@ -1033,7 +982,9 @@ static ZEND_RESULT_CODE php_http_env_response_stream_set_header_ex(php_http_env_ php_http_env_response_stream_ctx_t *stream_ctx = r->ctx; char *header_end, *header_str = NULL; size_t header_len = 0; - zval *zheader, **zheader_ptr; + zval zheader, *zheader_ptr; + zend_string *header_key; + ZEND_RESULT_CODE rv; if (stream_ctx->started || stream_ctx->finished) { return FAILURE; @@ -1046,24 +997,21 @@ static ZEND_RESULT_CODE php_http_env_response_stream_set_header_ex(php_http_env_ return FAILURE; } - *header_end = '\0'; + header_key = zend_string_init(header_str, header_end - header_str, 0); - if (!replace && (SUCCESS == zend_hash_find(&stream_ctx->header, header_str, header_end - header_str + 1, (void *) &zheader_ptr))) { - convert_to_array(*zheader_ptr); - *header_end = ':'; - return add_next_index_stringl(*zheader_ptr, header_str, header_len, 0); + if (!replace && (zheader_ptr = zend_hash_find(&stream_ctx->header, header_key))) { + convert_to_array(zheader_ptr); + rv = add_next_index_str(zheader_ptr, php_http_cs2zs(header_str, header_len)); } else { - MAKE_STD_ZVAL(zheader); - ZVAL_STRINGL(zheader, header_str, header_len, 0); + ZVAL_STR(&zheader, php_http_cs2zs(header_str, header_len)); - if (SUCCESS != zend_hash_update(&stream_ctx->header, header_str, header_end - header_str + 1, (void *) &zheader, sizeof(zval *), NULL)) { - zval_ptr_dtor(&zheader); - return FAILURE; - } - - *header_end = ':'; - return SUCCESS; + rv = zend_hash_update(&stream_ctx->header, header_key, &zheader) + ? SUCCESS : FAILURE; } + + zend_string_release(header_key); + + return rv; } static ZEND_RESULT_CODE php_http_env_response_stream_set_header(php_http_env_response_t *r, const char *fmt, ...) { @@ -1095,19 +1043,18 @@ static ZEND_RESULT_CODE php_http_env_response_stream_del_header(php_http_env_res return FAILURE; } - zend_hash_del(&stream_ctx->header, header_str, header_len + 1); + zend_hash_str_del(&stream_ctx->header, header_str, header_len); return SUCCESS; } static ZEND_RESULT_CODE php_http_env_response_stream_write(php_http_env_response_t *r, const char *data_str, size_t data_len) { php_http_env_response_stream_ctx_t *stream_ctx = r->ctx; - TSRMLS_FETCH_FROM_CTX(r->ts); if (stream_ctx->finished) { return FAILURE; } if (!stream_ctx->started) { - if (SUCCESS != php_http_env_response_stream_start(stream_ctx TSRMLS_CC)) { + if (SUCCESS != php_http_env_response_stream_start(stream_ctx)) { return FAILURE; } } @@ -1121,13 +1068,12 @@ static ZEND_RESULT_CODE php_http_env_response_stream_write(php_http_env_response static ZEND_RESULT_CODE php_http_env_response_stream_flush(php_http_env_response_t *r) { php_http_env_response_stream_ctx_t *stream_ctx = r->ctx; - TSRMLS_FETCH_FROM_CTX(r->ts); if (stream_ctx->finished) { return FAILURE; } if (!stream_ctx->started) { - if (SUCCESS != php_http_env_response_stream_start(stream_ctx TSRMLS_CC)) { + if (SUCCESS != php_http_env_response_stream_start(stream_ctx)) { return FAILURE; } } @@ -1137,13 +1083,12 @@ static ZEND_RESULT_CODE php_http_env_response_stream_flush(php_http_env_response static ZEND_RESULT_CODE php_http_env_response_stream_finish(php_http_env_response_t *r) { php_http_env_response_stream_ctx_t *ctx = r->ctx; - TSRMLS_FETCH_FROM_CTX(r->ts); if (ctx->finished) { return FAILURE; } if (!ctx->started) { - if (SUCCESS != php_http_env_response_stream_start(ctx TSRMLS_CC)) { + if (SUCCESS != php_http_env_response_stream_start(ctx)) { return FAILURE; } } @@ -1151,7 +1096,7 @@ static ZEND_RESULT_CODE php_http_env_response_stream_finish(php_http_env_respons php_stream_flush(ctx->stream); if (ctx->chunked && ctx->chunked_filter) { php_stream_filter_flush(ctx->chunked_filter, 1); - ctx->chunked_filter = php_stream_filter_remove(ctx->chunked_filter, 1 TSRMLS_CC); + ctx->chunked_filter = php_stream_filter_remove(ctx->chunked_filter, 1); } ctx->finished = 1; @@ -1181,7 +1126,7 @@ php_http_env_response_ops_t *php_http_env_response_get_stream_ops(void) #define PHP_HTTP_ENV_RESPONSE_OBJECT_INIT(obj) \ do { \ if (!obj->message) { \ - obj->message = php_http_message_init_env(NULL, PHP_HTTP_RESPONSE TSRMLS_CC); \ + obj->message = php_http_message_init_env(NULL, PHP_HTTP_RESPONSE); \ } \ } while (0) @@ -1193,9 +1138,9 @@ static PHP_METHOD(HttpEnvResponse, __construct) php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); - php_http_expect(obj->message = php_http_message_init_env(obj->message, PHP_HTTP_RESPONSE TSRMLS_CC), unexpected_val, return); + php_http_expect(obj->message = php_http_message_init_env(obj->message, PHP_HTTP_RESPONSE), unexpected_val, return); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse___invoke, 0, 0, 1) @@ -1205,26 +1150,24 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvResponse, __invoke) { char *ob_str; - int ob_len; - long ob_flags = 0; + size_t ob_len; + zend_long ob_flags = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &ob_str, &ob_len, &ob_flags)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &ob_str, &ob_len, &ob_flags)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_ENV_RESPONSE_OBJECT_INIT(obj); if (!obj->body) { php_http_message_object_init_body_object(obj); } - php_http_message_body_append(obj->message->body, ob_str, ob_len); -#if PHP_VERSION_ID >= 50400 + if (ob_flags & PHP_OUTPUT_HANDLER_CLEAN) { php_stream_truncate_set_size(php_http_message_body_stream(obj->message->body), 0); + } else { + php_http_message_body_append(obj->message->body, ob_str, ob_len); } RETURN_TRUE; -#else - RETURN_EMPTY_STRING(); -#endif } } @@ -1235,9 +1178,9 @@ static PHP_METHOD(HttpEnvResponse, setEnvRequest) { zval *env_req = NULL; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|O", &env_req, php_http_message_class_entry), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|O", &env_req, php_http_message_class_entry), invalid_arg, return); - set_option(getThis(), ZEND_STRL("request"), IS_OBJECT, env_req, 0 TSRMLS_CC); + set_option(getThis(), ZEND_STRL("request"), IS_OBJECT, env_req, 0); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1247,11 +1190,11 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvResponse, setContentType) { char *ct_str = NULL; - int ct_len = 0; + size_t ct_len = 0; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &ct_str, &ct_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s!", &ct_str, &ct_len), invalid_arg, return); - set_option(getThis(), ZEND_STRL("contentType"), IS_STRING, ct_str, ct_len TSRMLS_CC); + set_option(getThis(), ZEND_STRL("contentType"), IS_STRING, ct_str, ct_len); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1262,9 +1205,9 @@ static PHP_METHOD(HttpEnvResponse, setContentDisposition) { zval *zdisposition; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &zdisposition), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "a", &zdisposition), invalid_arg, return); - zend_update_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("contentDisposition"), zdisposition TSRMLS_CC); + zend_update_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("contentDisposition"), zdisposition); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1273,11 +1216,11 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_setContentEncoding, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvResponse, setContentEncoding) { - long ce; + zend_long ce; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &ce), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "l", &ce), invalid_arg, return); - set_option(getThis(), ZEND_STRL("contentEncoding"), IS_LONG, &ce, 0 TSRMLS_CC); + set_option(getThis(), ZEND_STRL("contentEncoding"), IS_LONG, &ce, 0); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1287,11 +1230,11 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvResponse, setCacheControl) { char *cc_str = NULL; - int cc_len = 0; + size_t cc_len = 0; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &cc_str, &cc_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s!", &cc_str, &cc_len), invalid_arg, return); - set_option(getThis(), ZEND_STRL("cacheControl"), IS_STRING, cc_str, cc_len TSRMLS_CC); + set_option(getThis(), ZEND_STRL("cacheControl"), IS_STRING, cc_str, cc_len); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1300,11 +1243,11 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_setLastModified, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvResponse, setLastModified) { - long last_modified; + zend_long last_modified; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &last_modified), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "l", &last_modified), invalid_arg, return); - set_option(getThis(), ZEND_STRL("lastModified"), IS_LONG, &last_modified, 0 TSRMLS_CC); + set_option(getThis(), ZEND_STRL("lastModified"), IS_LONG, &last_modified, 0); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1314,15 +1257,15 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvResponse, isCachedByLastModified) { char *header_name_str = NULL; - int header_name_len = 0; + size_t header_name_len = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &header_name_str, &header_name_len)) { if (!header_name_str || !header_name_len) { header_name_str = "If-Modified-Since"; header_name_len = lenof("If-Modified-Since"); } - RETURN_LONG(php_http_env_is_response_cached_by_last_modified(getThis(), header_name_str, header_name_len, get_request(getThis() TSRMLS_CC) TSRMLS_CC)); + RETURN_LONG(php_http_env_is_response_cached_by_last_modified(getThis(), header_name_str, header_name_len, get_request(getThis()))); } } @@ -1332,11 +1275,11 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvResponse, setEtag) { char *etag_str = NULL; - int etag_len = 0; + size_t etag_len = 0; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &etag_str, &etag_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s!", &etag_str, &etag_len), invalid_arg, return); - set_option(getThis(), ZEND_STRL("etag"), IS_STRING, etag_str, etag_len TSRMLS_CC); + set_option(getThis(), ZEND_STRL("etag"), IS_STRING, etag_str, etag_len); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1346,14 +1289,14 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvResponse, isCachedByEtag) { char *header_name_str = NULL; - int header_name_len = 0; + size_t header_name_len = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &header_name_str, &header_name_len)) { if (!header_name_str || !header_name_len) { header_name_str = "If-None-Match"; header_name_len = lenof("If-None-Match"); } - RETURN_LONG(php_http_env_is_response_cached_by_etag(getThis(), header_name_str, header_name_len, get_request(getThis() TSRMLS_CC) TSRMLS_CC)); + RETURN_LONG(php_http_env_is_response_cached_by_etag(getThis(), header_name_str, header_name_len, get_request(getThis()))); } } @@ -1363,13 +1306,13 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_setThrottleRate, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvResponse, setThrottleRate) { - long chunk_size; + zend_long chunk_size; double delay = 1; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|d", &chunk_size, &delay), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "l|d", &chunk_size, &delay), invalid_arg, return); - set_option(getThis(), ZEND_STRL("throttleDelay"), IS_DOUBLE, &delay, 0 TSRMLS_CC); - set_option(getThis(), ZEND_STRL("throttleChunk"), IS_LONG, &chunk_size, 0 TSRMLS_CC); + set_option(getThis(), ZEND_STRL("throttleDelay"), IS_DOUBLE, &delay, 0); + set_option(getThis(), ZEND_STRL("throttleChunk"), IS_LONG, &chunk_size, 0); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1378,37 +1321,38 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvResponse_setCookie, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpEnvResponse, setCookie) { - zval *zcookie_new; + zval *zcookie_new, tmp; + zend_string *zs; zend_error_handling zeh; php_http_cookie_list_t *list = NULL; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zcookie_new), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zcookie_new), invalid_arg, return); - zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh); switch (Z_TYPE_P(zcookie_new)) { case IS_OBJECT: - if (instanceof_function(Z_OBJCE_P(zcookie_new), php_http_cookie_class_entry TSRMLS_CC)) { + if (instanceof_function(Z_OBJCE_P(zcookie_new), php_http_cookie_class_entry)) { Z_ADDREF_P(zcookie_new); break; } /* no break */ case IS_ARRAY: - list = php_http_cookie_list_from_struct(NULL, zcookie_new TSRMLS_CC); - MAKE_STD_ZVAL(zcookie_new); - ZVAL_OBJVAL(zcookie_new, php_http_cookie_object_new_ex(php_http_cookie_class_entry, list, NULL TSRMLS_CC), 0); + list = php_http_cookie_list_from_struct(NULL, zcookie_new); + zcookie_new = &tmp; + ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 0); break; default: - zcookie_new = php_http_ztyp(IS_STRING, zcookie_new); - list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(zcookie_new), Z_STRLEN_P(zcookie_new), 0, NULL TSRMLS_CC); - zval_ptr_dtor(&zcookie_new); - MAKE_STD_ZVAL(zcookie_new); - ZVAL_OBJVAL(zcookie_new, php_http_cookie_object_new_ex(php_http_cookie_class_entry, list, NULL TSRMLS_CC), 0); + zs = zval_get_string(zcookie_new); + list = php_http_cookie_list_parse(NULL, zs->val, zs->len, 0, NULL); + zend_string_release(zs); + zcookie_new = &tmp; + ZVAL_OBJECT(zcookie_new, &php_http_cookie_object_new_ex(php_http_cookie_class_entry, list)->zo, 0); } - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); - set_cookie(getThis(), zcookie_new TSRMLS_CC); - zval_ptr_dtor(&zcookie_new); + set_cookie(getThis(), zcookie_new); + zval_ptr_dtor(zcookie_new); RETVAL_ZVAL(getThis(), 1, 0); } @@ -1421,20 +1365,16 @@ static PHP_METHOD(HttpEnvResponse, send) zval *zstream = NULL; php_stream *s = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &zstream)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &zstream)) { /* first flush the output layer to avoid conflicting headers and output; * also, ob_start($thisEnvResponse) might have been called */ -#if PHP_VERSION_ID >= 50400 - php_output_end_all(TSRMLS_C); -#else - php_end_ob_buffers(1 TSRMLS_CC); -#endif + php_output_end_all(); if (zstream) { php_http_env_response_t *r; - php_stream_from_zval(s, &zstream); - r = php_http_env_response_init(NULL, getThis(), php_http_env_response_get_stream_ops(), s TSRMLS_CC); + php_stream_from_zval(s, zstream); + r = php_http_env_response_init(NULL, getThis(), php_http_env_response_get_stream_ops(), s); if (!r) { RETURN_FALSE; } @@ -1444,7 +1384,7 @@ static PHP_METHOD(HttpEnvResponse, send) } else { php_http_env_response_t r; - if (!php_http_env_response_init(&r, getThis(), NULL, NULL TSRMLS_CC)) { + if (!php_http_env_response_init(&r, getThis(), NULL, NULL)) { RETURN_FALSE; } @@ -1479,25 +1419,25 @@ PHP_MINIT_FUNCTION(http_env_response) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http\\Env", "Response", php_http_env_response_methods); - php_http_env_response_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry, NULL TSRMLS_CC); - - zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_ENCODING_NONE"), PHP_HTTP_CONTENT_ENCODING_NONE TSRMLS_CC); - zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_ENCODING_GZIP"), PHP_HTTP_CONTENT_ENCODING_GZIP TSRMLS_CC); - - zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CACHE_NO"), PHP_HTTP_CACHE_NO TSRMLS_CC); - zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CACHE_HIT"), PHP_HTTP_CACHE_HIT TSRMLS_CC); - zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CACHE_MISS"), PHP_HTTP_CACHE_MISS TSRMLS_CC); - - zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("request"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("cookies"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("contentType"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("contentDisposition"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("contentEncoding"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("cacheControl"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("etag"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("lastModified"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("throttleDelay"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("throttleChunk"), ZEND_ACC_PROTECTED TSRMLS_CC); + php_http_env_response_class_entry = zend_register_internal_class_ex(&ce, php_http_message_class_entry); + + zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_ENCODING_NONE"), PHP_HTTP_CONTENT_ENCODING_NONE); + zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_ENCODING_GZIP"), PHP_HTTP_CONTENT_ENCODING_GZIP); + + zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CACHE_NO"), PHP_HTTP_CACHE_NO); + zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CACHE_HIT"), PHP_HTTP_CACHE_HIT); + zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CACHE_MISS"), PHP_HTTP_CACHE_MISS); + + zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("request"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("cookies"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("contentType"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("contentDisposition"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("contentEncoding"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("cacheControl"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("etag"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("lastModified"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("throttleDelay"), ZEND_ACC_PROTECTED); + zend_declare_property_null(php_http_env_response_class_entry, ZEND_STRL("throttleChunk"), ZEND_ACC_PROTECTED); return SUCCESS; } diff --git a/src/php_http_env_response.h b/src/php_http_env_response.h index e6a112f..ae1441d 100644 --- a/src/php_http_env_response.h +++ b/src/php_http_env_response.h @@ -38,7 +38,7 @@ struct php_http_env_response { php_http_cookie_list_t *cookies; php_http_buffer_t *buffer; - zval *options; + zval options; struct { size_t chunk; @@ -60,19 +60,15 @@ struct php_http_env_response { } content; zend_bool done; - -#ifdef ZTS - void ***ts; -#endif }; -PHP_HTTP_API php_http_env_response_t *php_http_env_response_init(php_http_env_response_t *r, zval *options, php_http_env_response_ops_t *ops, void *ops_ctx TSRMLS_DC); +PHP_HTTP_API php_http_env_response_t *php_http_env_response_init(php_http_env_response_t *r, zval *options, php_http_env_response_ops_t *ops, void *ops_ctx); PHP_HTTP_API ZEND_RESULT_CODE php_http_env_response_send(php_http_env_response_t *r); PHP_HTTP_API void php_http_env_response_dtor(php_http_env_response_t *r); PHP_HTTP_API void php_http_env_response_free(php_http_env_response_t **r); -PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, const char *header_str, size_t header_len, php_http_message_t *request TSRMLS_DC); -PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *options, const char *header_str, size_t header_len, php_http_message_t *request TSRMLS_DC); +PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, const char *header_str, size_t header_len, php_http_message_t *request); +PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *options, const char *header_str, size_t header_len, php_http_message_t *request); PHP_HTTP_API zend_class_entry *php_http_env_response_class_entry; PHP_MINIT_FUNCTION(http_env_response); diff --git a/src/php_http_etag.c b/src/php_http_etag.c index 3604ad8..1ebddb3 100644 --- a/src/php_http_etag.c +++ b/src/php_http_etag.c @@ -20,7 +20,7 @@ #include #include -php_http_etag_t *php_http_etag_init(const char *mode TSRMLS_DC) +php_http_etag_t *php_http_etag_init(const char *mode) { void *ctx; php_http_etag_t *e; @@ -47,7 +47,6 @@ php_http_etag_t *php_http_etag_init(const char *mode TSRMLS_DC) e = emalloc(sizeof(*e)); e->ctx = ctx; e->mode = estrdup(mode); - TSRMLS_SET_CTX(e->ts); return e; } diff --git a/src/php_http_etag.h b/src/php_http_etag.h index bf6cf49..f208db7 100644 --- a/src/php_http_etag.h +++ b/src/php_http_etag.h @@ -16,13 +16,9 @@ typedef struct php_http_etag { void *ctx; char *mode; - -#ifdef ZTS - void ***ts; -#endif } php_http_etag_t; -PHP_HTTP_API php_http_etag_t *php_http_etag_init(const char *mode TSRMLS_DC); +PHP_HTTP_API php_http_etag_t *php_http_etag_init(const char *mode); PHP_HTTP_API size_t php_http_etag_update(php_http_etag_t *e, const char *data_ptr, size_t data_len); PHP_HTTP_API char *php_http_etag_finish(php_http_etag_t *e); diff --git a/src/php_http_exception.c b/src/php_http_exception.c index 25a33e6..bae09f9 100644 --- a/src/php_http_exception.c +++ b/src/php_http_exception.c @@ -19,10 +19,10 @@ #endif #if PHP_HTTP_DBG_EXCEPTIONS -static void php_http_exception_hook(zval *ex TSRMLS_DC) +static void php_http_exception_hook(zval *ex) { if (ex) { - zval *m = zend_read_property(Z_OBJCE_P(ex), ex, "message", lenof("message"), 0 TSRMLS_CC); + zval *m = zend_read_property(Z_OBJCE_P(ex), ex, "message", lenof("message"), 0); fprintf(stderr, "*** Threw exception '%s'\n", Z_STRVAL_P(m)); } else { fprintf(stderr, "*** Threw NULL exception\n"); @@ -46,7 +46,7 @@ PHP_MINIT_FUNCTION(http_exception) zend_class_entry *cep, ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http", "Exception", NULL); - php_http_exception_interface_class_entry = zend_register_internal_interface(&ce TSRMLS_CC); + php_http_exception_interface_class_entry = zend_register_internal_interface(&ce); /* * Would be great to only have a few exceptions and rather more identifying @@ -55,56 +55,56 @@ PHP_MINIT_FUNCTION(http_exception) memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "RuntimeException", NULL); - cep = zend_register_internal_class_ex(&ce, spl_ce_RuntimeException, NULL TSRMLS_CC); - zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry); + cep = zend_register_internal_class_ex(&ce, spl_ce_RuntimeException); + zend_class_implements(cep, 1, php_http_exception_interface_class_entry); php_http_exception_runtime_class_entry = cep; memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "UnexpectedValueException", NULL); - cep = zend_register_internal_class_ex(&ce, spl_ce_UnexpectedValueException, NULL TSRMLS_CC); - zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry); + cep = zend_register_internal_class_ex(&ce, spl_ce_UnexpectedValueException); + zend_class_implements(cep, 1, php_http_exception_interface_class_entry); php_http_exception_unexpected_val_class_entry = cep; memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadMethodCallException", NULL); - cep = zend_register_internal_class_ex(&ce, spl_ce_BadMethodCallException, NULL TSRMLS_CC); - zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry); + cep = zend_register_internal_class_ex(&ce, spl_ce_BadMethodCallException); + zend_class_implements(cep, 1, php_http_exception_interface_class_entry); php_http_exception_bad_method_call_class_entry = cep; memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "InvalidArgumentException", NULL); - cep = zend_register_internal_class_ex(&ce, spl_ce_InvalidArgumentException, NULL TSRMLS_CC); - zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry); + cep = zend_register_internal_class_ex(&ce, spl_ce_InvalidArgumentException); + zend_class_implements(cep, 1, php_http_exception_interface_class_entry); php_http_exception_invalid_arg_class_entry = cep; memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadHeaderException", NULL); - cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException, NULL TSRMLS_CC); - zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry); + cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException); + zend_class_implements(cep, 1, php_http_exception_interface_class_entry); php_http_exception_bad_header_class_entry = cep; memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadUrlException", NULL); - cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException, NULL TSRMLS_CC); - zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry); + cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException); + zend_class_implements(cep, 1, php_http_exception_interface_class_entry); php_http_exception_bad_url_class_entry = cep; memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadMessageException", NULL); - cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException, NULL TSRMLS_CC); - zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry); + cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException); + zend_class_implements(cep, 1, php_http_exception_interface_class_entry); php_http_exception_bad_message_class_entry = cep; memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadConversionException", NULL); - cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException, NULL TSRMLS_CC); - zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry); + cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException); + zend_class_implements(cep, 1, php_http_exception_interface_class_entry); php_http_exception_bad_conversion_class_entry = cep; memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "http\\Exception", "BadQueryStringException", NULL); - cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException, NULL TSRMLS_CC); - zend_class_implements(cep TSRMLS_CC, 1, php_http_exception_interface_class_entry); + cep = zend_register_internal_class_ex(&ce, spl_ce_DomainException); + zend_class_implements(cep, 1, php_http_exception_interface_class_entry); php_http_exception_bad_querystring_class_entry = cep; #if PHP_HTTP_DBG_EXCEPTIONS diff --git a/src/php_http_exception.h b/src/php_http_exception.h index 969a351..eaf7a13 100644 --- a/src/php_http_exception.h +++ b/src/php_http_exception.h @@ -15,18 +15,18 @@ /* short hand for zend_throw_exception_ex */ #define php_http_throw(e, fmt, ...) \ - zend_throw_exception_ex(php_http_exception_ ##e## _class_entry, 0 TSRMLS_CC, fmt, __VA_ARGS__) + zend_throw_exception_ex(php_http_exception_ ##e## _class_entry, 0, fmt, __VA_ARGS__) /* wrap a call with replaced zend_error_handling */ #define php_http_expect(test, e, fail) \ do { \ zend_error_handling __zeh; \ - zend_replace_error_handling(EH_THROW, php_http_exception_ ##e## _class_entry, &__zeh TSRMLS_CC); \ + zend_replace_error_handling(EH_THROW, php_http_exception_ ##e## _class_entry, &__zeh); \ if (!(test)) { \ - zend_restore_error_handling(&__zeh TSRMLS_CC); \ + zend_restore_error_handling(&__zeh); \ fail; \ } \ - zend_restore_error_handling(&__zeh TSRMLS_CC); \ + zend_restore_error_handling(&__zeh); \ } while(0) PHP_HTTP_API zend_class_entry *php_http_exception_interface_class_entry; diff --git a/src/php_http_filter.c b/src/php_http_filter.c index b6d967b..f145f02 100644 --- a/src/php_http_filter.c +++ b/src/php_http_filter.c @@ -18,7 +18,7 @@ PHP_MINIT_FUNCTION(http_filter) { - php_stream_filter_register_factory("http.*", &php_http_filter_factory TSRMLS_CC); + php_stream_filter_register_factory("http.*", &php_http_filter_factory); return SUCCESS; } @@ -27,8 +27,8 @@ PHP_MINIT_FUNCTION(http_filter) php_stream_filter *this, \ php_stream_bucket_brigade *buckets_in, \ php_stream_bucket_brigade *buckets_out, \ - size_t *bytes_consumed, int flags \ - TSRMLS_DC + size_t *bytes_consumed, \ + int flags #define PHP_HTTP_FILTER_OP(filter) \ http_filter_op_ ##filter #define PHP_HTTP_FILTER_OPS(filter) \ @@ -36,7 +36,7 @@ PHP_MINIT_FUNCTION(http_filter) #define PHP_HTTP_FILTER_DTOR(filter) \ http_filter_ ##filter## _dtor #define PHP_HTTP_FILTER_DESTRUCTOR(filter) \ - void PHP_HTTP_FILTER_DTOR(filter)(php_stream_filter *this TSRMLS_DC) + void PHP_HTTP_FILTER_DTOR(filter)(php_stream_filter *this) #define PHP_HTTP_FILTER_FUNC(filter) \ http_filter_ ##filter #define PHP_HTTP_FILTER_FUNCTION(filter) \ @@ -61,13 +61,13 @@ PHP_MINIT_FUNCTION(http_filter) } \ memcpy(__data, data, length); \ \ - __buck = php_stream_bucket_new(stream, __data, length, 1, this->is_persistent TSRMLS_CC); \ + __buck = php_stream_bucket_new(stream, __data, length, 1, this->is_persistent); \ if (!__buck) { \ pefree(__data, this->is_persistent); \ return PSFS_ERR_FATAL; \ } \ \ - php_stream_bucket_append(buckets_out, __buck TSRMLS_CC); \ + php_stream_bucket_append(buckets_out, __buck); \ } typedef struct _http_chunked_decode_filter_buffer_t { @@ -81,7 +81,7 @@ static PHP_HTTP_FILTER_FUNCTION(chunked_decode) { int out_avail = 0; php_stream_bucket *ptr, *nxt; - PHP_HTTP_FILTER_BUFFER(chunked_decode) *buffer = (PHP_HTTP_FILTER_BUFFER(chunked_decode) *) (this->abstract); + PHP_HTTP_FILTER_BUFFER(chunked_decode) *buffer = Z_PTR(this->abstract); if (bytes_consumed) { *bytes_consumed = 0; @@ -98,8 +98,8 @@ static PHP_HTTP_FILTER_FUNCTION(chunked_decode) } nxt = ptr->next; - php_stream_bucket_unlink(ptr TSRMLS_CC); - php_stream_bucket_delref(ptr TSRMLS_CC); + php_stream_bucket_unlink(ptr); + php_stream_bucket_delref(ptr); } if (!php_http_buffer_fix(PHP_HTTP_BUFFER(buffer))) { @@ -185,7 +185,7 @@ static PHP_HTTP_FILTER_FUNCTION(chunked_decode) php_http_buffer_cut(PHP_HTTP_BUFFER(buffer), 0, eolstr + eollen - PHP_HTTP_BUFFER(buffer)->data); /* buffer->hexlen is 0 now or contains the size of the next chunk */ if (!buffer->hexlen) { - php_stream_notify_info(stream->context, PHP_STREAM_NOTIFY_COMPLETED, NULL, 0); + php_stream_notify_info(PHP_STREAM_CONTEXT(stream), PHP_STREAM_NOTIFY_COMPLETED, NULL, 0); break; } /* continue */ @@ -211,7 +211,7 @@ static PHP_HTTP_FILTER_FUNCTION(chunked_decode) static PHP_HTTP_FILTER_DESTRUCTOR(chunked_decode) { - PHP_HTTP_FILTER_BUFFER(chunked_decode) *b = (PHP_HTTP_FILTER_BUFFER(chunked_decode) *) (this->abstract); + PHP_HTTP_FILTER_BUFFER(chunked_decode) *b = Z_PTR(this->abstract); php_http_buffer_dtor(PHP_HTTP_BUFFER(b)); pefree(b, this->is_persistent); @@ -239,7 +239,7 @@ static PHP_HTTP_FILTER_FUNCTION(chunked_encode) #endif nxt = ptr->next; - php_stream_bucket_unlink(ptr TSRMLS_CC); + php_stream_bucket_unlink(ptr); php_http_buffer_appendf(&buf, "%lx" PHP_HTTP_CRLF, (long unsigned int) ptr->buflen); php_http_buffer_append(&buf, ptr->buf, ptr->buflen); php_http_buffer_appends(&buf, PHP_HTTP_CRLF); @@ -248,7 +248,7 @@ static PHP_HTTP_FILTER_FUNCTION(chunked_encode) NEW_BUCKET(buf.data, buf.used); /* reset */ php_http_buffer_reset(&buf); - php_stream_bucket_delref(ptr TSRMLS_CC); + php_stream_bucket_delref(ptr); } /* free buffer */ @@ -281,7 +281,7 @@ static PHP_HTTP_FILTER_OPS(chunked_encode) = { static PHP_HTTP_FILTER_FUNCTION(zlib) { php_stream_bucket *ptr, *nxt; - PHP_HTTP_FILTER_BUFFER(zlib) *buffer = (PHP_HTTP_FILTER_BUFFER(zlib) *) this->abstract; + PHP_HTTP_FILTER_BUFFER(zlib) *buffer = Z_PTR(this->abstract); if (bytes_consumed) { *bytes_consumed = 0; @@ -301,7 +301,7 @@ static PHP_HTTP_FILTER_FUNCTION(zlib) #endif nxt = ptr->next; - php_stream_bucket_unlink(ptr TSRMLS_CC); + php_stream_bucket_unlink(ptr); php_http_encoding_stream_update(buffer, ptr->buf, ptr->buflen, &encoded, &encoded_len); #if DBG_FILTER @@ -314,7 +314,7 @@ static PHP_HTTP_FILTER_FUNCTION(zlib) } efree(encoded); } - php_stream_bucket_delref(ptr TSRMLS_CC); + php_stream_bucket_delref(ptr); } /* flush & close */ @@ -358,7 +358,7 @@ static PHP_HTTP_FILTER_FUNCTION(zlib) } static PHP_HTTP_FILTER_DESTRUCTOR(zlib) { - PHP_HTTP_FILTER_BUFFER(zlib) *buffer = (PHP_HTTP_FILTER_BUFFER(zlib) *) this->abstract; + PHP_HTTP_FILTER_BUFFER(zlib) *buffer = Z_PTR(this->abstract); php_http_encoding_stream_free(&buffer); } @@ -374,28 +374,22 @@ static PHP_HTTP_FILTER_OPS(inflate) = { "http.inflate" }; -static php_stream_filter *http_filter_create(const char *name, zval *params, int p TSRMLS_DC) +static php_stream_filter *http_filter_create(const char *name, zval *params, int p) { - zval **tmp = ¶ms; + zval *tmp = params; php_stream_filter *f = NULL; int flags = p ? PHP_HTTP_ENCODING_STREAM_PERSISTENT : 0; if (params) { switch (Z_TYPE_P(params)) { - case IS_ARRAY: - case IS_OBJECT: - if (SUCCESS != zend_hash_find(HASH_OF(params), "flags", sizeof("flags"), (void *) &tmp)) { - break; - } - /* no break */ - default: - { - zval *num = php_http_ztyp(IS_LONG, *tmp); - - flags |= (Z_LVAL_P(num) & 0x0fffffff); - zval_ptr_dtor(&num); - + case IS_ARRAY: + case IS_OBJECT: + if (!(tmp = zend_hash_str_find_ind(HASH_OF(params), ZEND_STRL("flags")))) { + break; } + /* no break */ + default: + flags |= zval_get_long(tmp) & 0x0fffffff; break; } } @@ -418,7 +412,7 @@ static php_stream_filter *http_filter_create(const char *name, zval *params, int if (!strcasecmp(name, "http.inflate")) { PHP_HTTP_FILTER_BUFFER(zlib) *b = NULL; - if ((b = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_inflate_ops(), flags TSRMLS_CC))) { + if ((b = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_inflate_ops(), flags))) { if (!(f = php_stream_filter_alloc(&PHP_HTTP_FILTER_OP(inflate), b, p))) { php_http_encoding_stream_free(&b); } @@ -428,7 +422,7 @@ static php_stream_filter *http_filter_create(const char *name, zval *params, int if (!strcasecmp(name, "http.deflate")) { PHP_HTTP_FILTER_BUFFER(zlib) *b = NULL; - if ((b = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), flags TSRMLS_CC))) { + if ((b = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), flags))) { if (!(f = php_stream_filter_alloc(&PHP_HTTP_FILTER_OP(deflate), b, p))) { php_http_encoding_stream_free(&b); } diff --git a/src/php_http_header.c b/src/php_http_header.c index 41601df..d4f2b51 100644 --- a/src/php_http_header.c +++ b/src/php_http_header.c @@ -12,20 +12,20 @@ #include "php_http_api.h" -ZEND_RESULT_CODE php_http_header_parse(const char *header, size_t length, HashTable *headers, php_http_info_callback_t callback_func, void **callback_data TSRMLS_DC) +ZEND_RESULT_CODE php_http_header_parse(const char *header, size_t length, HashTable *headers, php_http_info_callback_t callback_func, void **callback_data) { php_http_header_parser_t ctx; php_http_buffer_t buf; php_http_header_parser_state_t rs; if (!php_http_buffer_from_string_ex(&buf, header, length)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not allocate buffer"); + php_error_docref(NULL, E_WARNING, "Could not allocate buffer"); return FAILURE; } - if (!php_http_header_parser_init(&ctx TSRMLS_CC)) { + if (!php_http_header_parser_init(&ctx)) { php_http_buffer_dtor(&buf); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize header parser"); + php_error_docref(NULL, E_WARNING, "Could not initialize header parser"); return FAILURE; } @@ -36,18 +36,19 @@ ZEND_RESULT_CODE php_http_header_parse(const char *header, size_t length, HashTa return rs == PHP_HTTP_HEADER_PARSER_STATE_FAILURE ? FAILURE : SUCCESS; } -void php_http_header_to_callback(HashTable *headers, zend_bool crlf, php_http_pass_format_callback_t cb, void *cb_arg TSRMLS_DC) +void php_http_header_to_callback(HashTable *headers, zend_bool crlf, php_http_pass_format_callback_t cb, void *cb_arg) { - HashPosition pos1, pos2; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - zval **header, **single_header; - - FOREACH_HASH_KEYVAL(pos1, headers, key, header) { - if (key.type == HASH_KEY_IS_STRING) { - if (key.len == sizeof("Set-Cookie") && !strcasecmp(key.str, "Set-Cookie") && Z_TYPE_PP(header) == IS_ARRAY) { - FOREACH_VAL(pos2, *header, single_header) { - if (Z_TYPE_PP(single_header) == IS_ARRAY) { - php_http_cookie_list_t *cookie = php_http_cookie_list_from_struct(NULL, *single_header TSRMLS_CC); + php_http_arrkey_t key; + zval *header, *single_header; + + ZEND_HASH_FOREACH_KEY_VAL(headers, key.h, key.key, header) + { + if (key.key) { + if (zend_string_equals_literal(key.key, "Set-Cookie") && Z_TYPE_P(header) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(header), single_header) + { + if (Z_TYPE_P(single_header) == IS_ARRAY) { + php_http_cookie_list_t *cookie = php_http_cookie_list_from_struct(NULL, single_header); if (cookie) { char *buf; @@ -59,54 +60,60 @@ void php_http_header_to_callback(HashTable *headers, zend_bool crlf, php_http_pa efree(buf); } } else { - zval *strval = php_http_header_value_to_string(*single_header TSRMLS_CC); + zend_string *zs = php_http_header_value_to_string(single_header); - cb(cb_arg, crlf ? "Set-Cookie: %s" PHP_HTTP_CRLF : "Set-Cookie: %s", Z_STRVAL_P(strval)); - zval_ptr_dtor(&strval); + cb(cb_arg, crlf ? "Set-Cookie: %s" PHP_HTTP_CRLF : "Set-Cookie: %s", zs->val); + zend_string_release(zs); } } + ZEND_HASH_FOREACH_END(); } else { - zval *strval = php_http_header_value_to_string(*header TSRMLS_CC); + zend_string *zs = php_http_header_value_to_string(header); - cb(cb_arg, crlf ? "%s: %s" PHP_HTTP_CRLF : "%s: %s", key.str, Z_STRVAL_P(strval)); - zval_ptr_dtor(&strval); + cb(cb_arg, crlf ? "%s: %s" PHP_HTTP_CRLF : "%s: %s", key.key->val, zs->val); + zend_string_release(zs); } } } + ZEND_HASH_FOREACH_END(); } -void php_http_header_to_string(php_http_buffer_t *str, HashTable *headers TSRMLS_DC) +void php_http_header_to_string(php_http_buffer_t *str, HashTable *headers) { - php_http_header_to_callback(headers, 1, (php_http_pass_format_callback_t) php_http_buffer_appendf, str TSRMLS_CC); + php_http_header_to_callback(headers, 1, (php_http_pass_format_callback_t) php_http_buffer_appendf, str); } -zval *php_http_header_value_to_string(zval *header TSRMLS_DC) +zend_string *php_http_header_value_array_to_string(zval *header) { - zval *ret; - - if (Z_TYPE_P(header) == IS_BOOL) { - MAKE_STD_ZVAL(ret); - ZVAL_STRING(ret, Z_BVAL_P(header) ? "true" : "false", 1); - } else if (Z_TYPE_P(header) == IS_ARRAY) { - zval **val; - HashPosition pos; - php_http_buffer_t str; - - php_http_buffer_init(&str); - MAKE_STD_ZVAL(ret); - FOREACH_VAL(pos,header, val) { - zval *strval = php_http_header_value_to_string(*val TSRMLS_CC); - - php_http_buffer_appendf(&str, str.used ? ", %s":"%s", Z_STRVAL_P(strval)); - zval_ptr_dtor(&strval); - } - php_http_buffer_fix(&str); - ZVAL_STRINGL(ret, str.data, str.used, 0); - } else { - ret = php_http_zsep(1, IS_STRING, header); + zval *val; + php_http_buffer_t str; + + php_http_buffer_init(&str); + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(header), val) + { + zend_string *zs = php_http_header_value_to_string(val); + + php_http_buffer_appendf(&str, str.used ? ", %s":"%s", zs->val); + zend_string_release(zs); } + ZEND_HASH_FOREACH_END(); + php_http_buffer_fix(&str); - return ret; + return php_http_cs2zs(str.data, str.used); +} + +zend_string *php_http_header_value_to_string(zval *header) +{ + switch (Z_TYPE_P(header)) { + case IS_TRUE: + return zend_string_init(ZEND_STRL("true"), 0); + case IS_FALSE: + return zend_string_init(ZEND_STRL("false"), 0); + case IS_ARRAY: + return php_http_header_value_array_to_string(header); + default: + return zval_get_string(header); + } } ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader___construct, 0, 0, 0) @@ -116,17 +123,17 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpHeader, __construct) { char *name_str = NULL, *value_str = NULL; - int name_len = 0, value_len = 0; + size_t name_len = 0, value_len = 0; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!s!", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); if (name_str && name_len) { char *pretty_str = estrndup(name_str, name_len); - zend_update_property_stringl(php_http_header_class_entry, getThis(), ZEND_STRL("name"), php_http_pretty_key(pretty_str, name_len, 1, 1), name_len TSRMLS_CC); + zend_update_property_stringl(php_http_header_class_entry, getThis(), ZEND_STRL("name"), php_http_pretty_key(pretty_str, name_len, 1, 1), name_len); efree(pretty_str); } if (value_str && value_len) { - zend_update_property_stringl(php_http_header_class_entry, getThis(), ZEND_STRL("value"), value_str, value_len TSRMLS_CC); + zend_update_property_stringl(php_http_header_class_entry, getThis(), ZEND_STRL("value"), value_str, value_len); } } @@ -136,22 +143,24 @@ PHP_METHOD(HttpHeader, serialize) { if (SUCCESS == zend_parse_parameters_none()) { php_http_buffer_t buf; - zval *zname, *zvalue; + zend_string *zs; + zval name_tmp, value_tmp; php_http_buffer_init(&buf); - zname = php_http_ztyp(IS_STRING, zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("name"), 0 TSRMLS_CC)); - php_http_buffer_append(&buf, Z_STRVAL_P(zname), Z_STRLEN_P(zname)); - zval_ptr_dtor(&zname); - zvalue = php_http_ztyp(IS_STRING, zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0 TSRMLS_CC)); - if (Z_STRLEN_P(zvalue)) { + zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("name"), 0, &name_tmp)); + php_http_buffer_appendz(&buf, zs); + zend_string_release(zs); + + zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0, &value_tmp)); + if (zs->len) { php_http_buffer_appends(&buf, ": "); - php_http_buffer_append(&buf, Z_STRVAL_P(zvalue), Z_STRLEN_P(zvalue)); + php_http_buffer_appendz(&buf, zs); } else { php_http_buffer_appends(&buf, ":"); } - zval_ptr_dtor(&zvalue); + zend_string_release(zs); - RETURN_PHP_HTTP_BUFFER_VAL(&buf); + RETURN_STR(php_http_cs2zs(buf.data, buf.used)); } RETURN_EMPTY_STRING(); } @@ -162,34 +171,31 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpHeader, unserialize) { char *serialized_str; - int serialized_len; + size_t serialized_len; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &serialized_str, &serialized_len)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &serialized_str, &serialized_len)) { HashTable ht; zend_hash_init(&ht, 1, NULL, ZVAL_PTR_DTOR, 0); - if (SUCCESS == php_http_header_parse(serialized_str, serialized_len, &ht, NULL, NULL TSRMLS_CC)) { + if (SUCCESS == php_http_header_parse(serialized_str, serialized_len, &ht, NULL, NULL)) { if (zend_hash_num_elements(&ht)) { - zval **val, *cpy; - char *str; - uint len; - ulong idx; + zend_string *zs, *key; + zend_ulong idx; zend_hash_internal_pointer_reset(&ht); - switch (zend_hash_get_current_key_ex(&ht, &str, &len, &idx, 0, NULL)) { + switch (zend_hash_get_current_key(&ht, &key, &idx)) { case HASH_KEY_IS_STRING: - zend_update_property_stringl(php_http_header_class_entry, getThis(), ZEND_STRL("name"), str, len - 1 TSRMLS_CC); + zend_update_property_str(php_http_header_class_entry, getThis(), ZEND_STRL("name"), key); break; case HASH_KEY_IS_LONG: - zend_update_property_long(php_http_header_class_entry, getThis(), ZEND_STRL("name"), idx TSRMLS_CC); + zend_update_property_long(php_http_header_class_entry, getThis(), ZEND_STRL("name"), idx); break; default: break; } - zend_hash_get_current_data(&ht, (void *) &val); - cpy = php_http_zsep(1, IS_STRING, *val); - zend_update_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), cpy TSRMLS_CC); - zval_ptr_dtor(&cpy); + zs = zval_get_string(zend_hash_get_current_data(&ht)); + zend_update_property_str(php_http_header_class_entry, getThis(), ZEND_STRL("value"), zs); + zend_string_release(zs); } } zend_hash_destroy(&ht); @@ -204,17 +210,18 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpHeader, match) { char *val_str; - int val_len; - long flags = PHP_HTTP_MATCH_LOOSE; - zval *zvalue; + size_t val_len; + zend_long flags = PHP_HTTP_MATCH_LOOSE; + zend_string *zs; + zval value_tmp; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &val_str, &val_len, &flags)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|sl", &val_str, &val_len, &flags)) { return; } - zvalue = php_http_ztyp(IS_STRING, zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0 TSRMLS_CC)); - RETVAL_BOOL(php_http_match(Z_STRVAL_P(zvalue), val_str, flags)); - zval_ptr_dtor(&zvalue); + zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0, &value_tmp)); + RETVAL_BOOL(php_http_match(zs->val, val_str, flags)); + zend_string_release(zs); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_negotiate, 0, 0, 1) @@ -224,35 +231,37 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpHeader, negotiate) { HashTable *supported, *rs; - zval *zname, *zvalue, *rs_array = NULL; + zval name_tmp, value_tmp, *rs_array = NULL; + zend_string *zs; char *sep_str = NULL; size_t sep_len = 0; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "H|z", &supported, &rs_array)) { return; } if (rs_array) { + ZVAL_DEREF(rs_array); zval_dtor(rs_array); array_init(rs_array); } - zname = php_http_ztyp(IS_STRING, zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("name"), 0 TSRMLS_CC)); - if (!strcasecmp(Z_STRVAL_P(zname), "Accept")) { + zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("name"), 0, &name_tmp)); + if (zend_string_equals_literal(zs, "Accept")) { sep_str = "/"; sep_len = 1; - } else if (!strcasecmp(Z_STRVAL_P(zname), "Accept-Language")) { + } else if (zend_string_equals_literal(zs, "Accept-Language")) { sep_str = "-"; sep_len = 1; } - zval_ptr_dtor(&zname); + zend_string_release(zs); - zvalue = php_http_ztyp(IS_STRING, zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0 TSRMLS_CC)); - if ((rs = php_http_negotiate(Z_STRVAL_P(zvalue), Z_STRLEN_P(zvalue), supported, sep_str, sep_len TSRMLS_CC))) { + zs = zval_get_string(zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0, &value_tmp)); + if ((rs = php_http_negotiate(zs->val, zs->len, supported, sep_str, sep_len))) { PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array); } else { PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array); } - zval_ptr_dtor(&zvalue); + zend_string_release(zs); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_getParams, 0, 0, 0) @@ -263,24 +272,23 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_getParams, 0, 0, 0) ZEND_END_ARG_INFO(); PHP_METHOD(HttpHeader, getParams) { - zval zctor, *zparams_obj, **zargs = NULL; + zval value_tmp, zctor, zparams_obj, *zargs = NULL; - INIT_PZVAL(&zctor); - ZVAL_STRINGL(&zctor, "__construct", lenof("__construct"), 0); + ZVAL_STRINGL(&zctor, "__construct", lenof("__construct")); - MAKE_STD_ZVAL(zparams_obj); - object_init_ex(zparams_obj, php_http_params_class_entry); + object_init_ex(&zparams_obj, php_http_params_class_entry); - zargs = (zval **) ecalloc(ZEND_NUM_ARGS()+1, sizeof(zval *)); - zargs[0] = zend_read_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("value"), 0 TSRMLS_CC); + zargs = (zval *) ecalloc(ZEND_NUM_ARGS()+1, sizeof(zval)); + ZVAL_COPY_VALUE(&zargs[0], zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0, &value_tmp)); if (ZEND_NUM_ARGS()) { zend_get_parameters_array(ZEND_NUM_ARGS(), ZEND_NUM_ARGS(), &zargs[1]); } - if (SUCCESS == call_user_function(NULL, &zparams_obj, &zctor, return_value, ZEND_NUM_ARGS()+1, zargs TSRMLS_CC)) { - RETVAL_ZVAL(zparams_obj, 0, 1); + if (SUCCESS == call_user_function(NULL, &zparams_obj, &zctor, return_value, ZEND_NUM_ARGS()+1, zargs)) { + RETVAL_ZVAL(&zparams_obj, 0, 1); } + zval_ptr_dtor(&zctor); if (zargs) { efree(zargs); } @@ -293,47 +301,43 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpHeader, parse) { char *header_str; - int header_len; + size_t header_len; zend_class_entry *ce = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|C", &header_str, &header_len, &ce)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|C", &header_str, &header_len, &ce)) { array_init(return_value); - if (SUCCESS != php_http_header_parse(header_str, header_len, Z_ARRVAL_P(return_value), NULL, NULL TSRMLS_CC)) { + if (SUCCESS != php_http_header_parse(header_str, header_len, Z_ARRVAL_P(return_value), NULL, NULL)) { zval_dtor(return_value); RETURN_FALSE; } else { - if (ce && instanceof_function(ce, php_http_header_class_entry TSRMLS_CC)) { - HashPosition pos; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - zval **val; - - FOREACH_KEYVAL(pos, return_value, key, val) { - zval *zho, *zkey, *zvalue; + if (ce && instanceof_function(ce, php_http_header_class_entry)) { + php_http_arrkey_t key; + zval *val; - Z_ADDREF_PP(val); - zvalue = *val; + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(return_value), key.h, key.key, val) + { + zval zkey, zho; - MAKE_STD_ZVAL(zkey); - if (key.type == HASH_KEY_IS_LONG) { - ZVAL_LONG(zkey, key.num); + if (key.key) { + ZVAL_STR_COPY(&zkey, key.key); } else { - ZVAL_STRINGL(zkey, key.str, key.len - 1, 1); + ZVAL_LONG(&zkey, key.h); } - MAKE_STD_ZVAL(zho); - object_init_ex(zho, ce); - zend_call_method_with_2_params(&zho, ce, NULL, "__construct", NULL, zkey, zvalue); + object_init_ex(&zho, ce); + Z_TRY_ADDREF_P(val); + zend_call_method_with_2_params(&zho, ce, NULL, "__construct", NULL, &zkey, val); + zval_ptr_dtor(val); + zval_ptr_dtor(&zkey); - if (key.type == HASH_KEY_IS_LONG) { - zend_hash_index_update(Z_ARRVAL_P(return_value), key.num, (void *) &zho, sizeof(zval *), NULL); + if (key.key) { + add_assoc_zval_ex(return_value, key.key->val, key.key->len, &zho); } else { - zend_hash_update(Z_ARRVAL_P(return_value), key.str, key.len, (void *) &zho, sizeof(zval *), NULL); + add_index_zval(return_value, key.h, &zho); } - - zval_ptr_dtor(&zvalue); - zval_ptr_dtor(&zkey); } + ZEND_HASH_FOREACH_END(); } } } @@ -359,15 +363,15 @@ PHP_MINIT_FUNCTION(http_header) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http", "Header", php_http_header_methods); - php_http_header_class_entry = zend_register_internal_class(&ce TSRMLS_CC); - zend_class_implements(php_http_header_class_entry TSRMLS_CC, 1, zend_ce_serializable); - zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_LOOSE"), PHP_HTTP_MATCH_LOOSE TSRMLS_CC); - zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_CASE"), PHP_HTTP_MATCH_CASE TSRMLS_CC); - zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_WORD"), PHP_HTTP_MATCH_WORD TSRMLS_CC); - zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_FULL"), PHP_HTTP_MATCH_FULL TSRMLS_CC); - zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_STRICT"), PHP_HTTP_MATCH_STRICT TSRMLS_CC); - zend_declare_property_null(php_http_header_class_entry, ZEND_STRL("name"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_header_class_entry, ZEND_STRL("value"), ZEND_ACC_PUBLIC TSRMLS_CC); + php_http_header_class_entry = zend_register_internal_class(&ce); + zend_class_implements(php_http_header_class_entry, 1, zend_ce_serializable); + zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_LOOSE"), PHP_HTTP_MATCH_LOOSE); + zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_CASE"), PHP_HTTP_MATCH_CASE); + zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_WORD"), PHP_HTTP_MATCH_WORD); + zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_FULL"), PHP_HTTP_MATCH_FULL); + zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_STRICT"), PHP_HTTP_MATCH_STRICT); + zend_declare_property_null(php_http_header_class_entry, ZEND_STRL("name"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_header_class_entry, ZEND_STRL("value"), ZEND_ACC_PUBLIC); return SUCCESS; } diff --git a/src/php_http_header.h b/src/php_http_header.h index a2baecb..88ebd10 100644 --- a/src/php_http_header.h +++ b/src/php_http_header.h @@ -15,12 +15,13 @@ #include "php_http_info.h" -PHP_HTTP_API ZEND_RESULT_CODE php_http_header_parse(const char *header, size_t length, HashTable *headers, php_http_info_callback_t callback_func, void **callback_data TSRMLS_DC); +PHP_HTTP_API ZEND_RESULT_CODE php_http_header_parse(const char *header, size_t length, HashTable *headers, php_http_info_callback_t callback_func, void **callback_data); -PHP_HTTP_API void php_http_header_to_callback(HashTable *headers, zend_bool crlf, php_http_pass_format_callback_t cb, void *cb_arg TSRMLS_DC); -PHP_HTTP_API void php_http_header_to_string(php_http_buffer_t *str, HashTable *headers TSRMLS_DC); +PHP_HTTP_API void php_http_header_to_callback(HashTable *headers, zend_bool crlf, php_http_pass_format_callback_t cb, void *cb_arg); +PHP_HTTP_API void php_http_header_to_string(php_http_buffer_t *str, HashTable *headers); -PHP_HTTP_API zval *php_http_header_value_to_string(zval *header TSRMLS_DC); +PHP_HTTP_API zend_string *php_http_header_value_to_string(zval *header); +PHP_HTTP_API zend_string *php_http_header_value_array_to_string(zval *header); PHP_HTTP_API zend_class_entry *php_http_header_class_entry; PHP_MINIT_FUNCTION(http_header); diff --git a/src/php_http_header_parser.c b/src/php_http_header_parser.c index 46551e2..5dfaedd 100644 --- a/src/php_http_header_parser.c +++ b/src/php_http_header_parser.c @@ -30,15 +30,13 @@ static const php_http_header_parser_state_spec_t php_http_header_parser_states[] {PHP_HTTP_HEADER_PARSER_STATE_DONE, 0} }; -php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser TSRMLS_DC) +php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser) { if (!parser) { parser = emalloc(sizeof(*parser)); } memset(parser, 0, sizeof(*parser)); - TSRMLS_SET_CTX(parser->ts); - return parser; } @@ -97,19 +95,18 @@ void php_http_header_parser_free(php_http_header_parser_t **parser) } /* NOTE: 'str' has to be null terminated */ -static void php_http_header_parser_error(size_t valid_len, char *str, size_t len, const char *eol_str TSRMLS_DC) +static void php_http_header_parser_error(size_t valid_len, char *str, size_t len, const char *eol_str ) { - int escaped_len; - char *escaped_str; + zend_string *escaped_str = zend_string_init(str, len, 0); - escaped_str = php_addcslashes(str, len, &escaped_len, 0, ZEND_STRL("\x0..\x1F\x7F..\xFF") TSRMLS_CC); + escaped_str = php_addcslashes(escaped_str, 1, ZEND_STRL("\x0..\x1F\x7F..\xFF")); if (valid_len != len && (!eol_str || (str+valid_len) != eol_str)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse headers: unexpected character '\\%03o' at pos %zu of '%.*s'", str[valid_len], valid_len, escaped_len, escaped_str); + php_error_docref(NULL, E_WARNING, "Failed to parse headers: unexpected character '\\%03o' at pos %zu of '%s'", str[valid_len], valid_len, escaped_str->val); } else if (eol_str) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse headers: unexpected end of line at pos %zu of '%.*s'", eol_str - str, escaped_len, escaped_str); + php_error_docref(NULL, E_WARNING, "Failed to parse headers: unexpected end of line at pos %zu of '%s'", eol_str - str, escaped_str->val); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse headers: unexpected end of input at pos %zu of '%.*s'", len, escaped_len, escaped_str); + php_error_docref(NULL, E_WARNING, "Failed to parse headers: unexpected end of input at pos %zu of '%s'", len, escaped_str->val); } efree(escaped_str); @@ -117,8 +114,6 @@ static void php_http_header_parser_error(size_t valid_len, char *str, size_t len php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_parser_t *parser, php_http_buffer_t *buffer, unsigned flags, HashTable *headers, php_http_info_callback_t callback_func, void *callback_arg) { - TSRMLS_FETCH_FROM_CTX(parser->ts); - while (buffer->used || !php_http_header_parser_states[php_http_header_parser_state_is(parser)].need_data) { #if DBG_PARSER const char *state[] = {"START", "KEY", "VALUE", "VALUE_EX", "HEADER_DONE", "DONE"}; @@ -127,7 +122,7 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars #endif switch (php_http_header_parser_state_pop(parser)) { case PHP_HTTP_HEADER_PARSER_STATE_FAILURE: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse headers"); + php_error_docref(NULL, E_WARNING, "Failed to parse headers"); return php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_FAILURE); case PHP_HTTP_HEADER_PARSER_STATE_START: { @@ -153,10 +148,10 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars /* end of headers */ php_http_buffer_cut(buffer, 0, eol_len); php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_DONE); - } else if (php_http_info_parse(&parser->info, buffer->data TSRMLS_CC)) { + } else if (php_http_info_parse(&parser->info, buffer->data)) { /* new message starting with request/response line */ if (callback_func) { - callback_func(callback_arg, &headers, &parser->info TSRMLS_CC); + callback_func(callback_arg, &headers, &parser->info); } php_http_info_dtor(&parser->info); php_http_buffer_cut(buffer, 0, eol_str + eol_len - buffer->data); @@ -170,7 +165,7 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars valid_len = strspn(parser->_key.str, PHP_HTTP_HEADER_NAME_CHARS); if (valid_len != parser->_key.len) { - php_http_header_parser_error(valid_len, parser->_key.str, parser->_key.len, eol_str TSRMLS_CC); + php_http_header_parser_error(valid_len, parser->_key.str, parser->_key.len, eol_str); PTR_SET(parser->_key.str, NULL); return php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_FAILURE); } @@ -179,7 +174,7 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_VALUE); } else if (eol_str || (flags & PHP_HTTP_HEADER_PARSER_CLEANUP)) { /* neither reqeust/response line nor 'header:' string, or injected new line or NUL etc. */ - php_http_header_parser_error(strspn(buffer->data, PHP_HTTP_HEADER_NAME_CHARS), buffer->data, buffer->used, eol_str TSRMLS_CC); + php_http_header_parser_error(strspn(buffer->data, PHP_HTTP_HEADER_NAME_CHARS), buffer->data, buffer->used, eol_str); return php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_FAILURE); } else { /* keep feeding */ @@ -247,12 +242,12 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars case PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE: if (parser->_key.str && parser->_val.str) { - zval array, **exist; + zval tmp, *exist; size_t valid_len = strlen(parser->_val.str); /* check for truncation */ if (valid_len != parser->_val.len) { - php_http_header_parser_error(valid_len, parser->_val.str, parser->_val.len, NULL TSRMLS_CC); + php_http_header_parser_error(valid_len, parser->_val.str, parser->_val.len, NULL); PTR_SET(parser->_key.str, NULL); PTR_SET(parser->_val.str, NULL); @@ -261,16 +256,16 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars } if (!headers && callback_func) { - callback_func(callback_arg, &headers, NULL TSRMLS_CC); + callback_func(callback_arg, &headers, NULL); } - INIT_PZVAL_ARRAY(&array, headers); php_http_pretty_key(parser->_key.str, parser->_key.len, 1, 1); - if (SUCCESS == zend_symtable_find(headers, parser->_key.str, parser->_key.len + 1, (void *) &exist)) { - convert_to_array(*exist); - add_next_index_stringl(*exist, parser->_val.str, parser->_val.len, 0); + if ((exist = zend_symtable_str_find(headers, parser->_key.str, parser->_key.len))) { + convert_to_array(exist); + add_next_index_str(exist, php_http_cs2zs(parser->_val.str, parser->_val.len)); } else { - add_assoc_stringl_ex(&array, parser->_key.str, parser->_key.len + 1, parser->_val.str, parser->_val.len, 0); + ZVAL_STR(&tmp, php_http_cs2zs(parser->_val.str, parser->_val.len)); + zend_symtable_str_update(headers, parser->_key.str, parser->_key.len, &tmp); } parser->_val.str = NULL; } @@ -292,7 +287,6 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars php_http_header_parser_state_t php_http_header_parser_parse_stream(php_http_header_parser_t *parser, php_http_buffer_t *buf, php_stream *s, unsigned flags, HashTable *headers, php_http_info_callback_t callback_func, void *callback_arg) { php_http_header_parser_state_t state = PHP_HTTP_HEADER_PARSER_STATE_START; - TSRMLS_FETCH_FROM_CTX(parser->ts); if (!buf->data) { php_http_buffer_resize_ex(buf, 0x1000, 1, 0); @@ -342,39 +336,34 @@ php_http_header_parser_state_t php_http_header_parser_parse_stream(php_http_head zend_class_entry *php_http_header_parser_class_entry; static zend_object_handlers php_http_header_parser_object_handlers; -zend_object_value php_http_header_parser_object_new(zend_class_entry *ce TSRMLS_DC) +zend_object *php_http_header_parser_object_new(zend_class_entry *ce) { - return php_http_header_parser_object_new_ex(ce, NULL, NULL TSRMLS_CC); + return &php_http_header_parser_object_new_ex(ce, NULL)->zo; } -zend_object_value php_http_header_parser_object_new_ex(zend_class_entry *ce, php_http_header_parser_t *parser, php_http_header_parser_object_t **ptr TSRMLS_DC) +php_http_header_parser_object_t *php_http_header_parser_object_new_ex(zend_class_entry *ce, php_http_header_parser_t *parser) { php_http_header_parser_object_t *o; - o = ecalloc(1, sizeof(php_http_header_parser_object_t)); - zend_object_std_init((zend_object *) o, ce TSRMLS_CC); - object_properties_init((zend_object *) o, ce); - - if (ptr) { - *ptr = o; - } + o = ecalloc(1, sizeof(php_http_header_parser_object_t) + zend_object_properties_size(ce)); + zend_object_std_init(&o->zo, ce); + object_properties_init(&o->zo, ce); if (parser) { o->parser = parser; } else { - o->parser = php_http_header_parser_init(NULL TSRMLS_CC); + o->parser = php_http_header_parser_init(NULL); } o->buffer = php_http_buffer_new(); - o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_header_parser_object_free, NULL TSRMLS_CC); - o->zv.handlers = &php_http_header_parser_object_handlers; + o->zo.handlers = &php_http_header_parser_object_handlers; - return o->zv; + return o; } -void php_http_header_parser_object_free(void *object TSRMLS_DC) +void php_http_header_parser_object_free(zend_object *object) { - php_http_header_parser_object_t *o = (php_http_header_parser_object_t *) object; + php_http_header_parser_object_t *o = PHP_HTTP_OBJ(object, NULL); if (o->parser) { php_http_header_parser_free(&o->parser); @@ -382,15 +371,14 @@ void php_http_header_parser_object_free(void *object TSRMLS_DC) if (o->buffer) { php_http_buffer_free(&o->buffer); } - zend_object_std_dtor((zend_object *) o TSRMLS_CC); - efree(o); + zend_object_std_dtor(object); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeaderParser_getState, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpHeaderParser, getState) { - php_http_header_parser_object_t *parser_obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_header_parser_object_t *parser_obj = PHP_HTTP_OBJ(NULL, getThis()); zend_parse_parameters_none(); /* always return the real state */ @@ -407,16 +395,17 @@ static PHP_METHOD(HttpHeaderParser, parse) php_http_header_parser_object_t *parser_obj; zval *zmsg; char *data_str; - int data_len; - long flags; + size_t data_len; + zend_long flags; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "slz", &data_str, &data_len, &flags, &zmsg), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "slz", &data_str, &data_len, &flags, &zmsg), invalid_arg, return); + ZVAL_DEREF(zmsg); if (Z_TYPE_P(zmsg) != IS_ARRAY) { zval_dtor(zmsg); array_init(zmsg); } - parser_obj = zend_object_store_get_object(getThis() TSRMLS_CC); + parser_obj = PHP_HTTP_OBJ(NULL, getThis()); php_http_buffer_append(parser_obj->buffer, data_str, data_len); RETVAL_LONG(php_http_header_parser_parse(parser_obj->parser, parser_obj->buffer, flags, Z_ARRVAL_P(zmsg), NULL, NULL)); } @@ -432,19 +421,20 @@ static PHP_METHOD(HttpHeaderParser, stream) zend_error_handling zeh; zval *zmsg, *zstream; php_stream *s; - long flags; + zend_long flags; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &zstream, &flags, &zmsg), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "rlz", &zstream, &flags, &zmsg), invalid_arg, return); - zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh TSRMLS_CC); - php_stream_from_zval(s, &zstream); - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh); + php_stream_from_zval(s, zstream); + zend_restore_error_handling(&zeh); + ZVAL_DEREF(zmsg); if (Z_TYPE_P(zmsg) != IS_ARRAY) { zval_dtor(zmsg); array_init(zmsg); } - parser_obj = zend_object_store_get_object(getThis() TSRMLS_CC); + parser_obj = PHP_HTTP_OBJ(NULL, getThis()); RETVAL_LONG(php_http_header_parser_parse_stream(parser_obj->parser, parser_obj->buffer, s, flags, Z_ARRVAL_P(zmsg), NULL, NULL)); } @@ -460,20 +450,22 @@ PHP_MINIT_FUNCTION(http_header_parser) zend_class_entry ce; INIT_NS_CLASS_ENTRY(ce, "http\\Header", "Parser", php_http_header_parser_methods); - php_http_header_parser_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_http_header_parser_class_entry = zend_register_internal_class(&ce); memcpy(&php_http_header_parser_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_header_parser_class_entry->create_object = php_http_header_parser_object_new; + php_http_header_parser_object_handlers.offset = XtOffsetOf(php_http_header_parser_object_t, zo); php_http_header_parser_object_handlers.clone_obj = NULL; + php_http_header_parser_object_handlers.free_obj = php_http_header_parser_object_free; - zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("CLEANUP"), PHP_HTTP_HEADER_PARSER_CLEANUP TSRMLS_CC); + zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("CLEANUP"), PHP_HTTP_HEADER_PARSER_CLEANUP); - zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_FAILURE"), PHP_HTTP_HEADER_PARSER_STATE_FAILURE TSRMLS_CC); - zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_START"), PHP_HTTP_HEADER_PARSER_STATE_START TSRMLS_CC); - zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_KEY"), PHP_HTTP_HEADER_PARSER_STATE_KEY TSRMLS_CC); - zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_VALUE"), PHP_HTTP_HEADER_PARSER_STATE_VALUE TSRMLS_CC); - zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_VALUE_EX"), PHP_HTTP_HEADER_PARSER_STATE_VALUE_EX TSRMLS_CC); - zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_HEADER_DONE"), PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE TSRMLS_CC); - zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_DONE"), PHP_HTTP_HEADER_PARSER_STATE_DONE TSRMLS_CC); + zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_FAILURE"), PHP_HTTP_HEADER_PARSER_STATE_FAILURE); + zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_START"), PHP_HTTP_HEADER_PARSER_STATE_START); + zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_KEY"), PHP_HTTP_HEADER_PARSER_STATE_KEY); + zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_VALUE"), PHP_HTTP_HEADER_PARSER_STATE_VALUE); + zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_VALUE_EX"), PHP_HTTP_HEADER_PARSER_STATE_VALUE_EX); + zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_HEADER_DONE"), PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE); + zend_declare_class_constant_long(php_http_header_parser_class_entry, ZEND_STRL("STATE_DONE"), PHP_HTTP_HEADER_PARSER_STATE_DONE); return SUCCESS; } diff --git a/src/php_http_header_parser.h b/src/php_http_header_parser.h index ed9ecaf..33707bd 100644 --- a/src/php_http_header_parser.h +++ b/src/php_http_header_parser.h @@ -38,12 +38,9 @@ typedef struct php_http_header_parser { char *str; size_t len; } _val; -#ifdef ZTS - void ***ts; -#endif } php_http_header_parser_t; -PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser TSRMLS_DC); +PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser); PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_push(php_http_header_parser_t *parser, unsigned argc, ...); PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_is(php_http_header_parser_t *parser); PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_pop(php_http_header_parser_t *parser); @@ -53,19 +50,18 @@ PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_parse(php_htt PHP_HTTP_API php_http_header_parser_state_t php_http_headerparser_parse_stream(php_http_header_parser_t *parser, php_http_buffer_t *buffer, php_stream *s, unsigned flags, HashTable *headers, php_http_info_callback_t callback_func, void *callback_arg); typedef struct php_http_header_parser_object { - zend_object zo; - zend_object_value zv; php_http_buffer_t *buffer; php_http_header_parser_t *parser; + zend_object zo; } php_http_header_parser_object_t; PHP_HTTP_API zend_class_entry *php_http_header_parser_class_entry; PHP_MINIT_FUNCTION(http_header_parser); -zend_object_value php_http_header_parser_object_new(zend_class_entry *ce TSRMLS_DC); -zend_object_value php_http_header_parser_object_new_ex(zend_class_entry *ce, php_http_header_parser_t *parser, php_http_header_parser_object_t **ptr TSRMLS_DC); -void php_http_header_parser_object_free(void *object TSRMLS_DC); +zend_object *php_http_header_parser_object_new(zend_class_entry *ce); +php_http_header_parser_object_t *php_http_header_parser_object_new_ex(zend_class_entry *ce, php_http_header_parser_t *parser); +void php_http_header_parser_object_free(zend_object *object); #endif /* PHP_HTTP_HEADER_PARSER_H */ diff --git a/src/php_http_info.c b/src/php_http_info.c index 4fb067f..6eef822 100644 --- a/src/php_http_info.c +++ b/src/php_http_info.c @@ -12,7 +12,7 @@ #include "php_http_api.h" -php_http_info_t *php_http_info_init(php_http_info_t *i TSRMLS_DC) +php_http_info_t *php_http_info_init(php_http_info_t *i) { if (!i) { i = emalloc(sizeof(*i)); @@ -49,7 +49,7 @@ void php_http_info_free(php_http_info_t **i) } } -php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header TSRMLS_DC) +php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header) { const char *end, *http; zend_bool free_info = !info; @@ -69,10 +69,10 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head return NULL; } - info = php_http_info_init(info TSRMLS_CC); + info = php_http_info_init(info); /* and nothing than SPACE or NUL after HTTP/X.x */ - if (!php_http_version_parse(&info->http.version, http TSRMLS_CC) + if (!php_http_version_parse(&info->http.version, http) || (http[lenof("HTTP/X.x")] && (!PHP_HTTP_IS_CTYPE(space, http[lenof("HTTP/X.x")])))) { if (free_info) { php_http_info_free(&info); @@ -93,7 +93,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head const char *status = NULL, *code = http + sizeof("HTTP/X.x"); info->type = PHP_HTTP_RESPONSE; - while (' ' == *code) ++code; + while (code < end && ' ' == *code) ++code; if (code && end > code) { /* rfc7230#3.1.2 The status-code element is a 3-digit integer code */ PHP_HTTP_INFO(info).response.code = 100*(*code++ - '0'); @@ -135,9 +135,9 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head if (http > url) { /* CONNECT presents an authority only */ if (strcasecmp(PHP_HTTP_INFO(info).request.method, "CONNECT")) { - PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, ~0 TSRMLS_CC); + PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, ~0); } else { - PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, ~0 TSRMLS_CC); + PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, ~0); } if (!PHP_HTTP_INFO(info).request.url) { PTR_SET(PHP_HTTP_INFO(info).request.method, NULL); diff --git a/src/php_http_info.h b/src/php_http_info.h index 4f02908..8a52ee2 100644 --- a/src/php_http_info.h +++ b/src/php_http_info.h @@ -41,6 +41,8 @@ typedef struct php_http_info_data { php_http_version_t version; } php_http_info_data_t; +#undef PHP_HTTP_REQUEST +#undef PHP_HTTP_RESPONSE typedef enum php_http_info_type { PHP_HTTP_NONE = 0, PHP_HTTP_REQUEST, @@ -56,10 +58,10 @@ typedef struct php_http_info { PHP_HTTP_INFO_IMPL(http, type) } php_http_info_t; -typedef zend_bool (*php_http_info_callback_t)(void **callback_data, HashTable **headers, php_http_info_t *info TSRMLS_DC); +typedef zend_bool (*php_http_info_callback_t)(void **callback_data, HashTable **headers, php_http_info_t *info); -PHP_HTTP_API php_http_info_t *php_http_info_init(php_http_info_t *info TSRMLS_DC); -PHP_HTTP_API php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header TSRMLS_DC); +PHP_HTTP_API php_http_info_t *php_http_info_init(php_http_info_t *info); +PHP_HTTP_API php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header); PHP_HTTP_API void php_http_info_dtor(php_http_info_t *info); PHP_HTTP_API void php_http_info_free(php_http_info_t **info); diff --git a/src/php_http_message.c b/src/php_http_message.c index c6b03ff..e6cdbc8 100644 --- a/src/php_http_message.c +++ b/src/php_http_message.c @@ -14,13 +14,13 @@ static void message_headers(php_http_message_t *msg, php_http_buffer_t *str); -zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable **headers, php_http_info_t *info TSRMLS_DC) +zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable **headers, php_http_info_t *info) { php_http_message_t *old = *message; /* advance message */ if (!old || old->type || zend_hash_num_elements(&old->hdrs)) { - (*message) = php_http_message_init(NULL, 0, NULL TSRMLS_CC); + (*message) = php_http_message_init(NULL, 0, NULL); (*message)->parent = old; if (headers) { (*headers) = &((*message)->hdrs); @@ -34,24 +34,23 @@ zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable return old != *message; } -php_http_message_t *php_http_message_init(php_http_message_t *message, php_http_message_type_t type, php_http_message_body_t *body TSRMLS_DC) +php_http_message_t *php_http_message_init(php_http_message_t *message, php_http_message_type_t type, php_http_message_body_t *body) { if (!message) { message = emalloc(sizeof(*message)); } memset(message, 0, sizeof(*message)); - TSRMLS_SET_CTX(message->ts); php_http_message_set_type(message, type); message->http.version.major = 1; message->http.version.minor = 1; zend_hash_init(&message->hdrs, 0, NULL, ZVAL_PTR_DTOR, 0); - message->body = body ? body : php_http_message_body_init(NULL, NULL TSRMLS_CC); + message->body = body ? body : php_http_message_body_init(NULL, NULL); return message; } -php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_http_message_type_t type TSRMLS_DC) +php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_http_message_type_t type) { int free_msg = !message; zval *sval, tval; @@ -59,59 +58,44 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h switch (type) { case PHP_HTTP_REQUEST: - mbody = php_http_env_get_request_body(TSRMLS_C); + mbody = php_http_env_get_request_body(); php_http_message_body_addref(mbody); - message = php_http_message_init(message, type, mbody TSRMLS_CC); - if ((sval = php_http_env_get_server_var(ZEND_STRL("SERVER_PROTOCOL"), 1 TSRMLS_CC)) && !strncmp(Z_STRVAL_P(sval), "HTTP/", lenof("HTTP/"))) { - php_http_version_parse(&message->http.version, Z_STRVAL_P(sval) TSRMLS_CC); + message = php_http_message_init(message, type, mbody); + if ((sval = php_http_env_get_server_var(ZEND_STRL("SERVER_PROTOCOL"), 1)) && !strncmp(Z_STRVAL_P(sval), "HTTP/", lenof("HTTP/"))) { + php_http_version_parse(&message->http.version, Z_STRVAL_P(sval)); } - if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_METHOD"), 1 TSRMLS_CC))) { + if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_METHOD"), 1))) { message->http.info.request.method = estrdup(Z_STRVAL_P(sval)); } - if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_URI"), 1 TSRMLS_CC))) { - message->http.info.request.url = php_http_url_parse(Z_STRVAL_P(sval), Z_STRLEN_P(sval), ~0 TSRMLS_CC); + if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_URI"), 1))) { + message->http.info.request.url = php_http_url_parse(Z_STRVAL_P(sval), Z_STRLEN_P(sval), ~0); } - php_http_env_get_request_headers(&message->hdrs TSRMLS_CC); + php_http_env_get_request_headers(&message->hdrs); break; case PHP_HTTP_RESPONSE: - message = php_http_message_init(NULL, type, NULL TSRMLS_CC); - if (!SG(sapi_headers).http_status_line || !php_http_info_parse((php_http_info_t *) &message->http, SG(sapi_headers).http_status_line TSRMLS_CC)) { + message = php_http_message_init(NULL, type, NULL); + if (!SG(sapi_headers).http_status_line || !php_http_info_parse((php_http_info_t *) &message->http, SG(sapi_headers).http_status_line)) { if (!(message->http.info.response.code = SG(sapi_headers).http_response_code)) { message->http.info.response.code = 200; } message->http.info.response.status = estrdup(php_http_env_get_response_status_for_code(message->http.info.response.code)); } - php_http_env_get_response_headers(&message->hdrs TSRMLS_CC); -#if PHP_VERSION_ID >= 50400 - if (php_output_get_level(TSRMLS_C)) { - if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_SENT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch response body, output has already been sent at %s:%d", php_output_get_start_filename(TSRMLS_C), php_output_get_start_lineno(TSRMLS_C)); + php_http_env_get_response_headers(&message->hdrs); + if (php_output_get_level()) { + if (php_output_get_status() & PHP_OUTPUT_SENT) { + php_error_docref(NULL, E_WARNING, "Could not fetch response body, output has already been sent at %s:%d", php_output_get_start_filename(), php_output_get_start_lineno()); goto error; - } else if (SUCCESS != php_output_get_contents(&tval TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch response body"); + } else if (SUCCESS != php_output_get_contents(&tval)) { + php_error_docref(NULL, E_WARNING, "Could not fetch response body"); goto error; } else { php_http_message_body_append(message->body, Z_STRVAL(tval), Z_STRLEN(tval)); zval_dtor(&tval); } } -#else - if (OG(ob_nesting_level)) { - if (php_get_output_start_filename(TSRMLS_C)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch response body, output has already been sent at %s:%d", php_get_output_start_filename(TSRMLS_C), php_get_output_start_lineno(TSRMLS_C)); - goto error; - } else if (SUCCESS != php_ob_get_buffer(&tval TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch response body"); - goto error; - } else { - php_http_message_body_append(message->body, Z_STRVAL(tval), Z_STRLEN(tval)); - zval_dtor(&tval); - } - } -#endif break; default: @@ -129,7 +113,7 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h return message; } -php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len, zend_bool greedy TSRMLS_DC) +php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len, zend_bool greedy) { php_http_message_parser_t p; php_http_buffer_t buf; @@ -137,10 +121,10 @@ php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char * int free_msg; php_http_buffer_from_string_ex(&buf, str, len); - php_http_message_parser_init(&p TSRMLS_CC); + php_http_message_parser_init(&p); if ((free_msg = !msg)) { - msg = php_http_message_init(NULL, 0, NULL TSRMLS_CC); + msg = php_http_message_init(NULL, 0, NULL); } if (greedy) { @@ -159,27 +143,19 @@ php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char * return msg; } -zval *php_http_message_header(php_http_message_t *msg, const char *key_str, size_t key_len, int join) +zval *php_http_message_header(php_http_message_t *msg, const char *key_str, size_t key_len) { - zval *ret = NULL, **header; + zval *ret; char *key; ALLOCA_FLAG(free_key); key = do_alloca(key_len + 1, free_key); + memcpy(key, key_str, key_len); key[key_len] = '\0'; php_http_pretty_key(key, key_len, 1, 1); - if (SUCCESS == zend_symtable_find(&msg->hdrs, key, key_len + 1, (void *) &header)) { - if (join && Z_TYPE_PP(header) == IS_ARRAY) { - TSRMLS_FETCH_FROM_CTX(msg->ts); - - ret = php_http_header_value_to_string(*header TSRMLS_CC); - } else { - Z_ADDREF_PP(header); - ret = *header; - } - } + ret = zend_symtable_str_find(&msg->hdrs, key, key_len); free_alloca(key, free_key); @@ -188,9 +164,8 @@ zval *php_http_message_header(php_http_message_t *msg, const char *key_str, size zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary) { - zval *ct = php_http_message_header(msg, ZEND_STRL("Content-Type"), 1); + zend_string *ct = php_http_message_header_string(msg, ZEND_STRL("Content-Type")); zend_bool is_multipart = 0; - TSRMLS_FETCH_FROM_CTX(msg->ts); if (ct) { php_http_params_opts_t popts; @@ -198,47 +173,49 @@ zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary ZEND_INIT_SYMTABLE(¶ms); php_http_params_opts_default_get(&popts); - popts.input.str = Z_STRVAL_P(ct); - popts.input.len = Z_STRLEN_P(ct); + popts.input.str = ct->val; + popts.input.len = ct->len; - if (php_http_params_parse(¶ms, &popts TSRMLS_CC)) { - zval **cur, **arg; - char *ct_str; + if (php_http_params_parse(¶ms, &popts)) { + zval *cur, *arg; + zend_string *ct_str; + zend_ulong index; zend_hash_internal_pointer_reset(¶ms); - if (SUCCESS == zend_hash_get_current_data(¶ms, (void *) &cur) - && Z_TYPE_PP(cur) == IS_ARRAY - && HASH_KEY_IS_STRING == zend_hash_get_current_key(¶ms, &ct_str, NULL, 0) + if ((cur = zend_hash_get_current_data(¶ms)) + && (Z_TYPE_P(cur) == IS_ARRAY) + && (HASH_KEY_IS_STRING == zend_hash_get_current_key(¶ms, &ct_str, &index)) ) { - if (php_http_match(ct_str, "multipart", PHP_HTTP_MATCH_WORD)) { + if (php_http_match(ct_str->val, "multipart", PHP_HTTP_MATCH_WORD)) { is_multipart = 1; /* get boundary */ if (boundary - && SUCCESS == zend_hash_find(Z_ARRVAL_PP(cur), ZEND_STRS("arguments"), (void *) &arg) - && Z_TYPE_PP(arg) == IS_ARRAY + && (arg = zend_hash_str_find(Z_ARRVAL_P(cur), ZEND_STRL("arguments"))) + && Z_TYPE_P(arg) == IS_ARRAY ) { - zval **val; - HashPosition pos; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); + zval *val; + php_http_arrkey_t key; - FOREACH_KEYVAL(pos, *arg, key, val) { - if (key.type == HASH_KEY_IS_STRING && !strcasecmp(key.str, "boundary")) { - zval *bnd = php_http_ztyp(IS_STRING, *val); + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(arg), key.h, key.key, val) + { + if (key.key && key.key->len == lenof("boundary") && !strcasecmp(key.key->val, "boundary")) { + zend_string *bnd = zval_get_string(val); - if (Z_STRLEN_P(bnd)) { - *boundary = estrndup(Z_STRVAL_P(bnd), Z_STRLEN_P(bnd)); + if (bnd->len) { + *boundary = estrndup(bnd->val, bnd->len); } - zval_ptr_dtor(&bnd); + zend_string_release(bnd); } } + ZEND_HASH_FOREACH_END(); } } } } zend_hash_destroy(¶ms); - zval_ptr_dtor(&ct); + zend_string_release(ct); } return is_multipart; @@ -292,52 +269,48 @@ void php_http_message_set_info(php_http_message_t *message, php_http_info_t *inf void php_http_message_update_headers(php_http_message_t *msg) { - zval *h; + zval h; size_t size; + zend_string *cl; if (php_http_message_body_stream(msg->body)->readfilters.head) { /* if a read stream filter is attached to the body the caller must also care for the headers */ - } else if ((h = php_http_message_header(msg, ZEND_STRL("Content-Range"), 0))) { + } else if (php_http_message_header(msg, ZEND_STRL("Content-Range"))) { /* don't mess around with a Content-Range message */ - zval_ptr_dtor(&h); } else if ((size = php_http_message_body_size(msg->body))) { - MAKE_STD_ZVAL(h); - ZVAL_LONG(h, size); - zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), &h, sizeof(zval *), NULL); + ZVAL_LONG(&h, size); + zend_hash_str_update(&msg->hdrs, "Content-Length", lenof("Content-Length"), &h); if (msg->body->boundary) { char *str; size_t len; + zend_string *ct; - if (!(h = php_http_message_header(msg, ZEND_STRL("Content-Type"), 1))) { + if (!(ct = php_http_message_header_string(msg, ZEND_STRL("Content-Type")))) { len = spprintf(&str, 0, "multipart/form-data; boundary=\"%s\"", msg->body->boundary); - MAKE_STD_ZVAL(h); - ZVAL_STRINGL(h, str, len, 0); - zend_hash_update(&msg->hdrs, "Content-Type", sizeof("Content-Type"), &h, sizeof(zval *), NULL); - } else if (!php_http_match(Z_STRVAL_P(h), "boundary=", PHP_HTTP_MATCH_WORD)) { - zval_dtor(h); - Z_STRLEN_P(h) = spprintf(&Z_STRVAL_P(h), 0, "%s; boundary=\"%s\"", Z_STRVAL_P(h), msg->body->boundary); - zend_hash_update(&msg->hdrs, "Content-Type", sizeof("Content-Type"), &h, sizeof(zval *), NULL); + ZVAL_STR(&h, php_http_cs2zs(str, len)); + zend_hash_str_update(&msg->hdrs, "Content-Type", lenof("Content-Type"), &h); + } else if (!php_http_match(ct->val, "boundary=", PHP_HTTP_MATCH_WORD)) { + len = spprintf(&str, 0, "%s; boundary=\"%s\"", ct->val, msg->body->boundary); + ZVAL_STR(&h, php_http_cs2zs(str, len)); + zend_hash_str_update(&msg->hdrs, "Content-Type", lenof("Content-Type"), &h); + zend_string_release(ct); } else { - zval_ptr_dtor(&h); + zend_string_release(ct); } } - } else if ((h = php_http_message_header(msg, ZEND_STRL("Content-Length"), 1))) { - zval *h_cpy = php_http_ztyp(IS_LONG, h); - - zval_ptr_dtor(&h); - if (Z_LVAL_P(h_cpy)) { + } else if ((cl = php_http_message_header_string(msg, ZEND_STRL("Content-Length")))) { + if (!zend_string_equals_literal(cl, "0")) { /* body->size == 0, so get rid of old Content-Length */ - zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length")); + zend_hash_str_del(&msg->hdrs, ZEND_STRL("Content-Length")); } - zval_ptr_dtor(&h_cpy); + zend_string_release(cl); } } static void message_headers(php_http_message_t *msg, php_http_buffer_t *str) { char *tmp = NULL; - TSRMLS_FETCH_FROM_CTX(msg->ts); switch (msg->type) { case PHP_HTTP_REQUEST: @@ -355,7 +328,7 @@ static void message_headers(php_http_message_t *msg, php_http_buffer_t *str) } php_http_message_update_headers(msg); - php_http_header_to_string(str, &msg->hdrs TSRMLS_CC); + php_http_header_to_string(str, &msg->hdrs); } void php_http_message_to_callback(php_http_message_t *msg, php_http_pass_callback_t cb, void *cb_arg) @@ -418,9 +391,7 @@ void php_http_message_serialize(php_http_message_t *message, char **string, size php_http_message_t *php_http_message_reverse(php_http_message_t *msg) { - int i, c = 0; - - php_http_message_count(c, msg); + size_t i, c = php_http_message_count(msg); if (c > 1) { php_http_message_t *tmp = msg, **arr; @@ -442,11 +413,11 @@ php_http_message_t *php_http_message_reverse(php_http_message_t *msg) return msg; } -php_http_message_t *php_http_message_zip(php_http_message_t *one, php_http_message_t *two) +php_http_message_t *php_http_message_zip(php_http_message_t *dst, php_http_message_t *src) { - php_http_message_t *dst = php_http_message_copy(one, NULL), *src = php_http_message_copy(two, NULL), *tmp_dst, *tmp_src, *ret = dst; + php_http_message_t *tmp_dst, *tmp_src, *ret = dst; - while(dst && src) { + while (dst && src) { tmp_dst = dst->parent; tmp_src = src->parent; dst->parent = src; @@ -464,23 +435,22 @@ php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_ { php_http_message_t *temp, *copy = NULL; php_http_info_t info; - TSRMLS_FETCH_FROM_CTX(from->ts); if (from) { info.type = from->type; info.http = from->http; - copy = temp = php_http_message_init(to, 0, php_http_message_body_copy(from->body, NULL) TSRMLS_CC); + copy = temp = php_http_message_init(to, 0, php_http_message_body_copy(from->body, NULL)); php_http_message_set_info(temp, &info); - zend_hash_copy(&temp->hdrs, &from->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + zend_hash_copy(&temp->hdrs, &from->hdrs, (copy_ctor_func_t) zval_add_ref); if (parents) while (from->parent) { info.type = from->parent->type; info.http = from->parent->http; - temp->parent = php_http_message_init(NULL, 0, php_http_message_body_copy(from->parent->body, NULL) TSRMLS_CC); + temp->parent = php_http_message_init(NULL, 0, php_http_message_body_copy(from->parent->body, NULL)); php_http_message_set_info(temp->parent, &info); - zend_hash_copy(&temp->parent->hdrs, &from->parent->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + array_copy(&from->parent->hdrs, &temp->parent->hdrs); temp = temp->parent; from = from->parent; @@ -490,11 +460,6 @@ php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_ return copy; } -php_http_message_t *php_http_message_copy(php_http_message_t *from, php_http_message_t *to) -{ - return php_http_message_copy_ex(from, to, 1); -} - void php_http_message_dtor(php_http_message_t *message) { if (message) { @@ -529,14 +494,18 @@ void php_http_message_free(php_http_message_t **message) } } -static zval *php_http_message_object_read_prop(zval *object, zval *member, int type PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC); -static void php_http_message_object_write_prop(zval *object, zval *member, zval *value PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC); -static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC); +static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *rv); +static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot); static zend_object_handlers php_http_message_object_handlers; static HashTable php_http_message_object_prophandlers; -typedef void (*php_http_message_object_prophandler_func_t)(php_http_message_object_t *o, zval *v TSRMLS_DC); +static void php_http_message_object_prophandler_hash_dtor(zval *pData) +{ + pefree(Z_PTR_P(pData), 1); +} + +typedef void (*php_http_message_object_prophandler_func_t)(php_http_message_object_t *o, zval *v); typedef struct php_http_message_object_prophandler { php_http_message_object_prophandler_func_t read; @@ -545,125 +514,133 @@ typedef struct php_http_message_object_prophandler { static ZEND_RESULT_CODE php_http_message_object_add_prophandler(const char *prop_str, size_t prop_len, php_http_message_object_prophandler_func_t read, php_http_message_object_prophandler_func_t write) { php_http_message_object_prophandler_t h = { read, write }; - return zend_hash_add(&php_http_message_object_prophandlers, prop_str, prop_len + 1, (void *) &h, sizeof(h), NULL); + if (!zend_hash_str_add_mem(&php_http_message_object_prophandlers, prop_str, prop_len, (void *) &h, sizeof(h))) { + return FAILURE; + } + return SUCCESS; } -static ZEND_RESULT_CODE php_http_message_object_get_prophandler(const char *prop_str, size_t prop_len, php_http_message_object_prophandler_t **handler) { - return zend_hash_find(&php_http_message_object_prophandlers, prop_str, prop_len + 1, (void *) handler); +static php_http_message_object_prophandler_t *php_http_message_object_get_prophandler(zend_string *name_str) { + return zend_hash_str_find_ptr(&php_http_message_object_prophandlers, name_str->val, name_str->len); } -static void php_http_message_object_prophandler_get_type(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { +static void php_http_message_object_prophandler_get_type(php_http_message_object_t *obj, zval *return_value) { RETVAL_LONG(obj->message->type); } -static void php_http_message_object_prophandler_set_type(php_http_message_object_t *obj, zval *value TSRMLS_DC) { - zval *cpy = php_http_ztyp(IS_LONG, value); - php_http_message_set_type(obj->message, Z_LVAL_P(cpy)); - zval_ptr_dtor(&cpy); +static void php_http_message_object_prophandler_set_type(php_http_message_object_t *obj, zval *value) { + php_http_message_set_type(obj->message, zval_get_long(value)); } -static void php_http_message_object_prophandler_get_request_method(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { +static void php_http_message_object_prophandler_get_request_method(php_http_message_object_t *obj, zval *return_value) { if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message) && obj->message->http.info.request.method) { - RETVAL_STRING(obj->message->http.info.request.method, 1); + RETVAL_STRING(obj->message->http.info.request.method); } else { RETVAL_NULL(); } } -static void php_http_message_object_prophandler_set_request_method(php_http_message_object_t *obj, zval *value TSRMLS_DC) { +static void php_http_message_object_prophandler_set_request_method(php_http_message_object_t *obj, zval *value) { if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) { - zval *cpy = php_http_ztyp(IS_STRING, value); - PTR_SET(obj->message->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); - zval_ptr_dtor(&cpy); + zend_string *zs = zval_get_string(value); + PTR_SET(obj->message->http.info.request.method, estrndup(zs->val, zs->len)); + zend_string_release(zs); } } -static void php_http_message_object_prophandler_get_request_url(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { +static void php_http_message_object_prophandler_get_request_url(php_http_message_object_t *obj, zval *return_value) { char *url_str; size_t url_len; if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message) && obj->message->http.info.request.url && php_http_url_to_string(obj->message->http.info.request.url, &url_str, &url_len, 0)) { - RETVAL_STRINGL(url_str, url_len, 0); + RETVAL_STR(php_http_cs2zs(url_str, url_len)); } else { RETVAL_NULL(); } } -static void php_http_message_object_prophandler_set_request_url(php_http_message_object_t *obj, zval *value TSRMLS_DC) { +static void php_http_message_object_prophandler_set_request_url(php_http_message_object_t *obj, zval *value) { if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) { - PTR_SET(obj->message->http.info.request.url, php_http_url_from_zval(value, ~0 TSRMLS_CC)); + PTR_SET(obj->message->http.info.request.url, php_http_url_from_zval(value, ~0)); } } -static void php_http_message_object_prophandler_get_response_status(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { +static void php_http_message_object_prophandler_get_response_status(php_http_message_object_t *obj, zval *return_value) { if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, obj->message) && obj->message->http.info.response.status) { - RETVAL_STRING(obj->message->http.info.response.status, 1); + RETVAL_STRING(obj->message->http.info.response.status); } else { RETVAL_NULL(); } } -static void php_http_message_object_prophandler_set_response_status(php_http_message_object_t *obj, zval *value TSRMLS_DC) { +static void php_http_message_object_prophandler_set_response_status(php_http_message_object_t *obj, zval *value) { if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, obj->message)) { - zval *cpy = php_http_ztyp(IS_STRING, value); - PTR_SET(obj->message->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); - zval_ptr_dtor(&cpy); + zend_string *zs = zval_get_string(value); + PTR_SET(obj->message->http.info.response.status, estrndup(zs->val, zs->len)); + zend_string_release(zs); } } -static void php_http_message_object_prophandler_get_response_code(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { +static void php_http_message_object_prophandler_get_response_code(php_http_message_object_t *obj, zval *return_value) { if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, obj->message)) { RETVAL_LONG(obj->message->http.info.response.code); } else { RETVAL_NULL(); } } -static void php_http_message_object_prophandler_set_response_code(php_http_message_object_t *obj, zval *value TSRMLS_DC) { +static void php_http_message_object_prophandler_set_response_code(php_http_message_object_t *obj, zval *value) { if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, obj->message)) { - zval *cpy = php_http_ztyp(IS_LONG, value); - obj->message->http.info.response.code = Z_LVAL_P(cpy); + obj->message->http.info.response.code = zval_get_long(value); PTR_SET(obj->message->http.info.response.status, estrdup(php_http_env_get_response_status_for_code(obj->message->http.info.response.code))); - zval_ptr_dtor(&cpy); } } -static void php_http_message_object_prophandler_get_http_version(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { +static void php_http_message_object_prophandler_get_http_version(php_http_message_object_t *obj, zval *return_value) { char *version_str; size_t version_len; - php_http_version_to_string(&obj->message->http.version, &version_str, &version_len, NULL, NULL TSRMLS_CC); - RETVAL_STRINGL(version_str, version_len, 0); + php_http_version_to_string(&obj->message->http.version, &version_str, &version_len, NULL, NULL); + RETVAL_STR(php_http_cs2zs(version_str, version_len)); } -static void php_http_message_object_prophandler_set_http_version(php_http_message_object_t *obj, zval *value TSRMLS_DC) { - zval *cpy = php_http_ztyp(IS_STRING, value); - php_http_version_parse(&obj->message->http.version, Z_STRVAL_P(cpy) TSRMLS_CC); - zval_ptr_dtor(&cpy); +static void php_http_message_object_prophandler_set_http_version(php_http_message_object_t *obj, zval *value) { + zend_string *zs = zval_get_string(value); + php_http_version_parse(&obj->message->http.version, zs->val); + zend_string_release(zs); } -static void php_http_message_object_prophandler_get_headers(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { +static void php_http_message_object_prophandler_get_headers(php_http_message_object_t *obj, zval *return_value ) { array_init(return_value); - zend_hash_copy(Z_ARRVAL_P(return_value), &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + array_copy(&obj->message->hdrs, Z_ARRVAL_P(return_value)); } -static void php_http_message_object_prophandler_set_headers(php_http_message_object_t *obj, zval *value TSRMLS_DC) { - zval *cpy = php_http_ztyp(IS_ARRAY, value); +static void php_http_message_object_prophandler_set_headers(php_http_message_object_t *obj, zval *value) { + HashTable *headers; + zval *orig_value = value; + + if (Z_TYPE_P(value) != IS_ARRAY && Z_TYPE_P(value) != IS_OBJECT) { + convert_to_array_ex(value); + } + headers = HASH_OF(value); zend_hash_clean(&obj->message->hdrs); - zend_hash_copy(&obj->message->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - zval_ptr_dtor(&cpy); + array_copy(headers, &obj->message->hdrs); + + if (orig_value != value) { + zval_ptr_dtor(value); + } } -static void php_http_message_object_prophandler_get_body(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { +static void php_http_message_object_prophandler_get_body(php_http_message_object_t *obj, zval *return_value) { if (obj->body) { - RETVAL_OBJVAL(obj->body->zv, 1); + RETVAL_OBJECT(&obj->body->zo, 1); } else { RETVAL_NULL(); } } -static void php_http_message_object_prophandler_set_body(php_http_message_object_t *obj, zval *value TSRMLS_DC) { - php_http_message_object_set_body(obj, value TSRMLS_CC); +static void php_http_message_object_prophandler_set_body(php_http_message_object_t *obj, zval *value) { + php_http_message_object_set_body(obj, value); } -static void php_http_message_object_prophandler_get_parent_message(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) { +static void php_http_message_object_prophandler_get_parent_message(php_http_message_object_t *obj, zval *return_value) { if (obj->message->parent) { - RETVAL_OBJVAL(obj->parent->zv, 1); + RETVAL_OBJECT(&obj->parent->zo, 1); } else { RETVAL_NULL(); } } -static void php_http_message_object_prophandler_set_parent_message(php_http_message_object_t *obj, zval *value TSRMLS_DC) { - if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), php_http_message_class_entry TSRMLS_CC)) { - php_http_message_object_t *parent_obj = zend_object_store_get_object(value TSRMLS_CC); +static void php_http_message_object_prophandler_set_parent_message(php_http_message_object_t *obj, zval *value) { + if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), php_http_message_class_entry)) { + php_http_message_object_t *parent_obj = PHP_HTTP_OBJ(NULL, value); if (obj->message->parent) { - zend_objects_store_del_ref_by_handle(obj->parent->zv.handle TSRMLS_CC); + zend_objects_store_del(&obj->parent->zo); } - Z_OBJ_ADDREF_P(value); + Z_ADDREF_P(value); obj->parent = parent_obj; obj->message->parent = parent_obj->message; } @@ -672,20 +649,20 @@ static void php_http_message_object_prophandler_set_parent_message(php_http_mess #define PHP_HTTP_MESSAGE_OBJECT_INIT(obj) \ do { \ if (!obj->message) { \ - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); \ + obj->message = php_http_message_init(NULL, 0, NULL); \ } \ } while(0) -void php_http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC) +void php_http_message_object_reverse(zval *zmsg, zval *return_value) { - int i = 0; - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + size_t i; + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, zmsg); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); /* count */ - php_http_message_count(i, obj->message); + i = php_http_message_count(obj->message); if (i > 1) { php_http_message_object_t **objects; @@ -711,24 +688,21 @@ void php_http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_D objects[0]->parent = NULL; /* add ref, because we previously have not been a parent message */ - Z_OBJ_ADDREF_P(getThis()); - RETVAL_OBJVAL(objects[last]->zv, 0); + Z_ADDREF_P(zmsg); + /* no addref, because we've been a parent message previously */ + RETVAL_OBJECT(&objects[last]->zo, 0); efree(objects); } else { - RETURN_ZVAL(getThis(), 1, 0); + RETURN_ZVAL(zmsg, 1, 0); } } -void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool top TSRMLS_DC) +void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool top) { - zval m; php_http_message_t *save_parent_msg = NULL; - php_http_message_object_t *save_parent_obj = NULL, *obj = zend_object_store_get_object(this_ptr TSRMLS_CC); - php_http_message_object_t *prepend_obj = zend_object_store_get_object(prepend TSRMLS_CC); - - INIT_PZVAL(&m); - m.type = IS_OBJECT; + php_http_message_object_t *save_parent_obj = NULL, *obj = PHP_HTTP_OBJ(NULL, this_ptr); + php_http_message_object_t *prepend_obj = PHP_HTTP_OBJ(NULL, prepend); if (!top) { save_parent_obj = obj->parent; @@ -745,7 +719,7 @@ void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool to obj->message->parent = prepend_obj->message; /* add ref */ - zend_objects_store_add_ref(prepend TSRMLS_CC); + Z_ADDREF_P(prepend); if (!top) { prepend_obj->parent = save_parent_obj; @@ -753,17 +727,16 @@ void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool to } } -ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *msg_obj, zval *zbody TSRMLS_DC) +ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *msg_obj, zval *zbody) { - zval *tmp = NULL; php_stream *s; - zend_object_value ov; + zend_string *body_str; php_http_message_body_t *body; php_http_message_body_object_t *body_obj; switch (Z_TYPE_P(zbody)) { case IS_RESOURCE: - php_stream_from_zval_no_verify(s, &zbody); + php_stream_from_zval_no_verify(s, zbody); if (!s) { php_http_throw(unexpected_val, "The stream is not a valid resource", NULL); return FAILURE; @@ -771,112 +744,98 @@ ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *msg is_resource: - body = php_http_message_body_init(NULL, s TSRMLS_CC); - if (SUCCESS != php_http_new(&ov, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, body, NULL TSRMLS_CC)) { + body = php_http_message_body_init(NULL, s); + if (!(body_obj = php_http_message_body_object_new_ex(php_http_message_body_class_entry, body))) { php_http_message_body_free(&body); return FAILURE; } - MAKE_STD_ZVAL(tmp); - ZVAL_OBJVAL(tmp, ov, 0); - zbody = tmp; break; case IS_OBJECT: - if (instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry TSRMLS_CC)) { - Z_OBJ_ADDREF_P(zbody); + if (instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry)) { + Z_ADDREF_P(zbody); + body_obj = PHP_HTTP_OBJ(NULL, zbody); break; } /* no break */ default: - tmp = php_http_ztyp(IS_STRING, zbody); + body_str = zval_get_string(zbody); s = php_stream_temp_new(); - php_stream_write(s, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); - zval_ptr_dtor(&tmp); - tmp = NULL; + php_stream_write(s, body_str->val, body_str->len); + zend_string_release(body_str); goto is_resource; } - body_obj = zend_object_store_get_object(zbody TSRMLS_CC); if (!body_obj->body) { - body_obj->body = php_http_message_body_init(NULL, NULL TSRMLS_CC); + body_obj->body = php_http_message_body_init(NULL, NULL); } if (msg_obj->body) { - zend_objects_store_del_ref_by_handle(msg_obj->body->zv.handle TSRMLS_CC); + zend_objects_store_del(&msg_obj->body->zo); } if (msg_obj->message) { php_http_message_body_free(&msg_obj->message->body); - msg_obj->message->body = php_http_message_body_init(&body_obj->body, NULL TSRMLS_CC); + msg_obj->message->body = body_obj->body; } else { - msg_obj->message = php_http_message_init(NULL, 0, php_http_message_body_init(&body_obj->body, NULL TSRMLS_CC) TSRMLS_CC); + msg_obj->message = php_http_message_init(NULL, 0, body_obj->body); } + php_http_message_body_addref(body_obj->body); msg_obj->body = body_obj; - if (tmp) { - FREE_ZVAL(tmp); - } return SUCCESS; } ZEND_RESULT_CODE php_http_message_object_init_body_object(php_http_message_object_t *obj) { - TSRMLS_FETCH_FROM_CTX(obj->message->ts); - php_http_message_body_addref(obj->message->body); - return php_http_new(NULL, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, obj->message->body, (void *) &obj->body TSRMLS_CC); + return php_http_new((void *) &obj->body, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, obj->message->body); } -zend_object_value php_http_message_object_new(zend_class_entry *ce TSRMLS_DC) +zend_object *php_http_message_object_new(zend_class_entry *ce) { - return php_http_message_object_new_ex(ce, NULL, NULL TSRMLS_CC); + return &php_http_message_object_new_ex(ce, NULL)->zo; } -zend_object_value php_http_message_object_new_ex(zend_class_entry *ce, php_http_message_t *msg, php_http_message_object_t **ptr TSRMLS_DC) +php_http_message_object_t *php_http_message_object_new_ex(zend_class_entry *ce, php_http_message_t *msg) { php_http_message_object_t *o; - o = ecalloc(1, sizeof(php_http_message_object_t)); - zend_object_std_init((zend_object *) o, ce TSRMLS_CC); - object_properties_init((zend_object *) o, ce); - - if (ptr) { - *ptr = o; - } + o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); + zend_object_std_init(&o->zo, ce); + object_properties_init(&o->zo, ce); if (msg) { o->message = msg; if (msg->parent) { - php_http_message_object_new_ex(ce, msg->parent, &o->parent TSRMLS_CC); + o->parent = php_http_message_object_new_ex(ce, msg->parent); } - php_http_message_body_object_new_ex(php_http_message_body_class_entry, php_http_message_body_init(&msg->body, NULL TSRMLS_CC), &o->body TSRMLS_CC); + o->body = php_http_message_body_object_new_ex(php_http_message_body_class_entry, php_http_message_body_init(&msg->body, NULL)); } - o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_object_free, NULL TSRMLS_CC); - o->zv.handlers = &php_http_message_object_handlers; + o->zo.handlers = &php_http_message_object_handlers; - return o->zv; + return o; } -zend_object_value php_http_message_object_clone(zval *this_ptr TSRMLS_DC) +zend_object *php_http_message_object_clone(zval *this_ptr) { - zend_object_value new_ov; php_http_message_object_t *new_obj = NULL; - php_http_message_object_t *old_obj = zend_object_store_get_object(this_ptr TSRMLS_CC); + php_http_message_object_t *old_obj = PHP_HTTP_OBJ(NULL, this_ptr); - new_ov = php_http_message_object_new_ex(old_obj->zo.ce, php_http_message_copy(old_obj->message, NULL), &new_obj TSRMLS_CC); - zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + new_obj = php_http_message_object_new_ex(old_obj->zo.ce, php_http_message_copy(old_obj->message, NULL)); + zend_objects_clone_members(&new_obj->zo, &old_obj->zo); - return new_ov; + return &new_obj->zo; } -void php_http_message_object_free(void *object TSRMLS_DC) +void php_http_message_object_free(zend_object *object) { - php_http_message_object_t *o = (php_http_message_object_t *) object; + php_http_message_object_t *o = PHP_HTTP_OBJ(object, NULL); - if (o->iterator) { + if (!Z_ISUNDEF(o->iterator)) { zval_ptr_dtor(&o->iterator); - o->iterator = NULL; + ZVAL_UNDEF(&o->iterator); } if (o->message) { /* do NOT free recursivly */ @@ -885,146 +844,147 @@ void php_http_message_object_free(void *object TSRMLS_DC) o->message = NULL; } if (o->parent) { - zend_objects_store_del_ref_by_handle(o->parent->zv.handle TSRMLS_CC); + if (GC_REFCOUNT(&o->parent->zo) == 1) { + zend_objects_store_del(&o->parent->zo); + } + zend_objects_store_del(&o->parent->zo); o->parent = NULL; } if (o->body) { - zend_objects_store_del_ref_by_handle(o->body->zv.handle TSRMLS_CC); + if (GC_REFCOUNT(&o->body->zo) == 1) { + zend_objects_store_del(&o->body->zo); + } + zend_objects_store_del(&o->body->zo); o->body = NULL; } - zend_object_std_dtor((zend_object *) o TSRMLS_CC); - efree(o); + zend_object_std_dtor(object); } -static zval *php_http_message_object_read_prop(zval *object, zval *member, int type PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC) +static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *tmp) { - php_http_message_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); - php_http_message_object_prophandler_t *handler; - zval *return_value, *copy = php_http_ztyp(IS_STRING, member); + zval *return_value; + zend_string *member_name = zval_get_string(member); + php_http_message_object_prophandler_t *handler = php_http_message_object_get_prophandler(member_name); - PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + if (!handler || type == BP_VAR_R || type == BP_VAR_IS) { + return_value = zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp); - if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) { - ALLOC_ZVAL(return_value); - Z_SET_REFCOUNT_P(return_value, 0); - Z_UNSET_ISREF_P(return_value); + if (handler) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object); - if (type == BP_VAR_R) { - handler->read(obj, return_value TSRMLS_CC); - } else { - php_property_proxy_t *proxy = php_property_proxy_init(object, Z_STRVAL_P(copy), Z_STRLEN_P(copy) TSRMLS_CC); - RETVAL_OBJVAL(php_property_proxy_object_new_ex(php_property_proxy_get_class_entry(), proxy, NULL TSRMLS_CC), 0); + PHP_HTTP_MESSAGE_OBJECT_INIT(obj); + handler->read(obj, tmp); + + zval_ptr_dtor(return_value); + ZVAL_COPY_VALUE(return_value, tmp); } + zend_string_release(member_name); + return return_value; } else { - return_value = zend_get_std_object_handlers()->read_property(object, member, type PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC); - } + php_property_proxy_t *proxy; + php_property_proxy_object_t *proxy_obj; - zval_ptr_dtor(©); + proxy = php_property_proxy_init(object, member_name); + proxy_obj = php_property_proxy_object_new_ex(NULL, proxy); - return return_value; + ZVAL_OBJ(tmp, &proxy_obj->zo); + zend_string_release(member_name); + return tmp; + } } -static void php_http_message_object_write_prop(zval *object, zval *member, zval *value PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC) +static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot) { - php_http_message_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object); php_http_message_object_prophandler_t *handler; - zval *copy = php_http_ztyp(IS_STRING, member); + zend_string *member_name = zval_get_string(member); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) { - handler->write(obj, value TSRMLS_CC); + if ((handler = php_http_message_object_get_prophandler(member_name))) { + handler->write(obj, value); } else { - zend_get_std_object_handlers()->write_property(object, member, value PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC); + zend_get_std_object_handlers()->write_property(object, member, value, cache_slot); } - zval_ptr_dtor(©); + zend_string_release(member_name); } -static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC) +static HashTable *php_http_message_object_get_debug_info(zval *object, int *is_temp) { - zval *headers; - php_http_message_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); - HashTable *props = zend_get_std_object_handlers()->get_properties(object TSRMLS_CC); - zval array, *parent, *body; + zval tmp; + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object); + HashTable *props = zend_get_std_object_handlers()->get_properties(object); char *ver_str, *url_str = NULL; size_t ver_len, url_len = 0; PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - INIT_PZVAL_ARRAY(&array, props); + *is_temp = 0; -#define ASSOC_PROP(ptype, n, val) \ - do { \ - zend_property_info *pi; \ - if (SUCCESS == zend_hash_find(&obj->zo.ce->properties_info, n, sizeof(n), (void *) &pi)) { \ - add_assoc_ ##ptype## _ex(&array, pi->name, pi->name_length + 1, val); \ - } \ - } while(0) \ - -#define ASSOC_STRING(name, val) ASSOC_STRINGL(name, val, strlen(val)) -#define ASSOC_STRINGL(name, val, len) ASSOC_STRINGL_EX(name, val, len, 1) -#define ASSOC_STRINGL_EX(n, val, len, cpy) \ +#define UPDATE_PROP(name_str, action_with_tmp) \ do { \ zend_property_info *pi; \ - if (SUCCESS == zend_hash_find(&obj->zo.ce->properties_info, n, sizeof(n), (void *) &pi)) { \ - add_assoc_stringl_ex(&array, pi->name, pi->name_length + 1, val, len, cpy); \ + if ((pi = zend_hash_str_find_ptr(&obj->zo.ce->properties_info, name_str, lenof(name_str)))) { \ + action_with_tmp; \ + zend_hash_update_ind(props, pi->name, &tmp); \ } \ } while(0) - ASSOC_PROP(long, "type", obj->message->type); + UPDATE_PROP("type", ZVAL_LONG(&tmp, obj->message->type)); + ver_len = spprintf(&ver_str, 0, "%u.%u", obj->message->http.version.major, obj->message->http.version.minor); - ASSOC_STRINGL_EX("httpVersion", ver_str, ver_len, 0); + UPDATE_PROP("httpVersion", ZVAL_STR(&tmp, php_http_cs2zs(ver_str, ver_len))); switch (obj->message->type) { case PHP_HTTP_REQUEST: - ASSOC_PROP(long, "responseCode", 0); - ASSOC_STRINGL("responseStatus", "", 0); - ASSOC_STRING("requestMethod", STR_PTR(obj->message->http.info.request.method)); + UPDATE_PROP("responseCode", ZVAL_LONG(&tmp, 0)); + UPDATE_PROP("responseStatus", ZVAL_EMPTY_STRING(&tmp)); + UPDATE_PROP("requestMethod", ZVAL_STRING(&tmp, STR_PTR(obj->message->http.info.request.method))); if (obj->message->http.info.request.url) { php_http_url_to_string(obj->message->http.info.request.url, &url_str, &url_len, 0); - ASSOC_STRINGL_EX("requestUrl", url_str, url_len, 0); + UPDATE_PROP("requestUrl", ZVAL_STR(&tmp, php_http_cs2zs(url_str, url_len))); } else { - ASSOC_STRINGL("requestUrl", "", 0); + UPDATE_PROP("requestUrl", ZVAL_EMPTY_STRING(&tmp)); } break; case PHP_HTTP_RESPONSE: - ASSOC_PROP(long, "responseCode", obj->message->http.info.response.code); - ASSOC_STRING("responseStatus", STR_PTR(obj->message->http.info.response.status)); - ASSOC_STRINGL("requestMethod", "", 0); - ASSOC_STRINGL("requestUrl", "", 0); + UPDATE_PROP("responseCode", ZVAL_LONG(&tmp, obj->message->http.info.response.code)); + UPDATE_PROP("responseStatus", ZVAL_STRING(&tmp, STR_PTR(obj->message->http.info.response.status))); + UPDATE_PROP("requestMethod", ZVAL_EMPTY_STRING(&tmp)); + UPDATE_PROP("requestUrl", ZVAL_EMPTY_STRING(&tmp)); break; case PHP_HTTP_NONE: default: - ASSOC_PROP(long, "responseCode", 0); - ASSOC_STRINGL("responseStatus", "", 0); - ASSOC_STRINGL("requestMethod", "", 0); - ASSOC_STRINGL("requestUrl", "", 0); + UPDATE_PROP("responseCode", ZVAL_LONG(&tmp, 0)); + UPDATE_PROP("responseStatus", ZVAL_EMPTY_STRING(&tmp)); + UPDATE_PROP("requestMethod", ZVAL_EMPTY_STRING(&tmp)); + UPDATE_PROP("requestUrl", ZVAL_EMPTY_STRING(&tmp)); break; } - MAKE_STD_ZVAL(headers); - array_init(headers); - zend_hash_copy(Z_ARRVAL_P(headers), &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - ASSOC_PROP(zval, "headers", headers); + UPDATE_PROP("headers", + array_init(&tmp); + array_copy(&obj->message->hdrs, Z_ARRVAL(tmp)); + ); - MAKE_STD_ZVAL(body); - if (obj->body) { - ZVAL_OBJVAL(body, obj->body->zv, 1); - } else { - ZVAL_NULL(body); - } - ASSOC_PROP(zval, "body", body); + UPDATE_PROP("body", + if (obj->body) { + ZVAL_OBJECT(&tmp, &obj->body->zo, 1); + } else { + ZVAL_NULL(&tmp); + } + ); - MAKE_STD_ZVAL(parent); - if (obj->message->parent) { - ZVAL_OBJVAL(parent, obj->parent->zv, 1); - } else { - ZVAL_NULL(parent); - } - ASSOC_PROP(zval, "parentMessage", parent); + UPDATE_PROP("parentMessage", + if (obj->message->parent) { + ZVAL_OBJECT(&tmp, &obj->parent->zo, 1); + } else { + ZVAL_NULL(&tmp); + } + ); return props; } @@ -1038,22 +998,22 @@ static PHP_METHOD(HttpMessage, __construct) zend_bool greedy = 1; zval *zmessage = NULL; php_http_message_t *msg = NULL; - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); zend_error_handling zeh; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!b", &zmessage, &greedy), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z!b", &zmessage, &greedy), invalid_arg, return); - zend_replace_error_handling(EH_THROW, php_http_exception_bad_message_class_entry, &zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_bad_message_class_entry, &zeh); if (zmessage && Z_TYPE_P(zmessage) == IS_RESOURCE) { php_stream *s; php_http_message_parser_t p; zend_error_handling zeh; - zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh TSRMLS_CC); - php_stream_from_zval(s, &zmessage); - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh); + php_stream_from_zval(s, zmessage); + zend_restore_error_handling(&zeh); - if (s && php_http_message_parser_init(&p TSRMLS_CC)) { + if (s && php_http_message_parser_init(&p)) { unsigned flags = (greedy ? PHP_HTTP_MESSAGE_PARSER_GREEDY : 0); php_http_buffer_t buf; @@ -1071,23 +1031,24 @@ static PHP_METHOD(HttpMessage, __construct) php_http_throw(bad_message, "Empty message received from stream", NULL); } } else if (zmessage) { - zmessage = php_http_ztyp(IS_STRING, zmessage); - msg = php_http_message_parse(NULL, Z_STRVAL_P(zmessage), Z_STRLEN_P(zmessage), greedy TSRMLS_CC); + zend_string *zs_msg = zval_get_string(zmessage); + + msg = php_http_message_parse(NULL, zs_msg->val, zs_msg->len, greedy); if (!msg && !EG(exception)) { - php_http_throw(bad_message, "Could not parse message: %.*s", MIN(25, Z_STRLEN_P(zmessage)), Z_STRVAL_P(zmessage)); + php_http_throw(bad_message, "Could not parse message: %.*s", MIN(25, zs_msg->len), zs_msg->val); } - zval_ptr_dtor(&zmessage); + zend_string_release(zs_msg); } if (msg) { php_http_message_dtor(obj->message); obj->message = msg; if (obj->message->parent) { - php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, &obj->parent TSRMLS_CC); + obj->parent = php_http_message_object_new_ex(obj->zo.ce, obj->message->parent); } } - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); } @@ -1099,8 +1060,7 @@ static PHP_METHOD(HttpMessage, getBody) php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (!obj->body) { @@ -1108,7 +1068,7 @@ static PHP_METHOD(HttpMessage, getBody) } if (obj->body) { - RETVAL_OBJVAL(obj->body->zv, 1); + RETVAL_OBJECT(&obj->body->zo, 1); } } @@ -1119,11 +1079,11 @@ static PHP_METHOD(HttpMessage, setBody) { zval *zbody; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zbody, php_http_message_body_class_entry)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &zbody, php_http_message_body_class_entry)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - php_http_message_object_prophandler_set_body(obj, zbody TSRMLS_CC); + php_http_message_object_prophandler_set_body(obj, zbody); } RETVAL_ZVAL(getThis(), 1, 0); } @@ -1135,9 +1095,9 @@ static PHP_METHOD(HttpMessage, addBody) { zval *new_body; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &new_body, php_http_message_body_class_entry)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - php_http_message_body_object_t *new_obj = zend_object_store_get_object(new_body TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &new_body, php_http_message_body_class_entry)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); + php_http_message_body_object_t *new_obj = PHP_HTTP_OBJ(NULL, new_body); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_body_to_callback(new_obj->body, (php_http_pass_callback_t) php_http_message_body_append, obj->message->body, 0, 0); @@ -1152,39 +1112,36 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, getHeader) { char *header_str; - int header_len; + size_t header_len; zend_class_entry *header_ce = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|C!", &header_str, &header_len, &header_ce)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|C!", &header_str, &header_len, &header_ce)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); zval *header; PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - if ((header = php_http_message_header(obj->message, header_str, header_len, 0))) { + if ((header = php_http_message_header(obj->message, header_str, header_len))) { if (!header_ce) { - RETURN_ZVAL(header, 1, 1); - } else if (instanceof_function(header_ce, php_http_header_class_entry TSRMLS_CC)) { + RETURN_ZVAL(header, 1, 0); + } else if (instanceof_function(header_ce, php_http_header_class_entry)) { php_http_object_method_t cb; - zval *header_name, **argv[2]; - - MAKE_STD_ZVAL(header_name); - ZVAL_STRINGL(header_name, header_str, header_len, 1); + zval argv[2]; - argv[0] = &header_name; - argv[1] = &header; + ZVAL_STRINGL(&argv[0], header_str, header_len); + ZVAL_COPY(&argv[1], header); object_init_ex(return_value, header_ce); - php_http_object_method_init(&cb, return_value, ZEND_STRL("__construct") TSRMLS_CC); - php_http_object_method_call(&cb, return_value, NULL, 2, argv TSRMLS_CC); + php_http_object_method_init(&cb, return_value, ZEND_STRL("__construct")); + php_http_object_method_call(&cb, return_value, NULL, 2, argv); php_http_object_method_dtor(&cb); - zval_ptr_dtor(&header_name); - zval_ptr_dtor(&header); + zval_ptr_dtor(&argv[0]); + zval_ptr_dtor(&argv[1]); return; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Class '%s' is not as descendant of http\\Header", header_ce->name); + php_error_docref(NULL, E_WARNING, "Class '%s' is not as descendant of http\\Header", header_ce->name->val); } } } @@ -1196,7 +1153,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, getHeaders) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); @@ -1213,19 +1170,19 @@ static PHP_METHOD(HttpMessage, setHeader) { zval *zvalue = NULL; char *name_str; - int name_len; + size_t name_len; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z!", &name_str, &name_len, &zvalue)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|z!", &name_str, &name_len, &zvalue)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (!zvalue) { - zend_symtable_del(&obj->message->hdrs, name, name_len + 1); + zend_symtable_str_del(&obj->message->hdrs, name, name_len); } else { - Z_ADDREF_P(zvalue); - zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &zvalue, sizeof(void *), NULL); + Z_TRY_ADDREF_P(zvalue); + zend_symtable_str_update(&obj->message->hdrs, name, name_len, zvalue); } efree(name); } @@ -1239,8 +1196,8 @@ static PHP_METHOD(HttpMessage, setHeaders) { zval *new_headers = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &new_headers)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "a/!", &new_headers)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); @@ -1260,22 +1217,21 @@ static PHP_METHOD(HttpMessage, addHeader) { zval *zvalue; char *name_str; - int name_len; + size_t name_len; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &name_str, &name_len, &zvalue)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "sz", &name_str, &name_len, &zvalue)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1); zval *header; PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - Z_ADDREF_P(zvalue); - if ((header = php_http_message_header(obj->message, name, name_len, 0))) { + Z_TRY_ADDREF_P(zvalue); + if ((header = php_http_message_header(obj->message, name, name_len))) { convert_to_array(header); - zend_hash_next_index_insert(Z_ARRVAL_P(header), &zvalue, sizeof(void *), NULL); - zval_ptr_dtor(&header); + zend_hash_next_index_insert(Z_ARRVAL_P(header), zvalue); } else { - zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &zvalue, sizeof(void *), NULL); + zend_symtable_str_update(&obj->message->hdrs, name, name_len, zvalue); } efree(name); } @@ -1291,8 +1247,8 @@ static PHP_METHOD(HttpMessage, addHeaders) zval *new_headers; zend_bool append = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", &new_headers, &append)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "a|b", &new_headers, &append)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); @@ -1306,7 +1262,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, getType) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); @@ -1319,10 +1275,10 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setType, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, setType) { - long type; + zend_long type; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "l", &type)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); @@ -1336,26 +1292,27 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, getInfo) { if (SUCCESS == zend_parse_parameters_none()) { - char *tmp = NULL; - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + char *str, *tmp = NULL; + size_t len; + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); switch (obj->message->type) { case PHP_HTTP_REQUEST: - Z_STRLEN_P(return_value) = spprintf(&Z_STRVAL_P(return_value), 0, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&obj->message->http, tmp, "")); + len = spprintf(&str, 0, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&obj->message->http, tmp, "")); PTR_FREE(tmp); break; case PHP_HTTP_RESPONSE: - Z_STRLEN_P(return_value) = spprintf(&Z_STRVAL_P(return_value), 0, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&obj->message->http, tmp, "")); + len = spprintf(&str, 0, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&obj->message->http, tmp, "")); PTR_FREE(tmp); break; default: RETURN_NULL(); break; } - Z_TYPE_P(return_value) = IS_STRING; - return; + + RETVAL_STR(php_http_cs2zs(str, len)); } } @@ -1365,16 +1322,16 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, setInfo) { char *str; - int len; + size_t len; php_http_message_object_t *obj; php_http_info_t inf; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &len), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - if (!php_http_info_parse(&inf, str TSRMLS_CC)) { + if (!php_http_info_parse(&inf, str)) { php_http_throw(bad_header, "Could not parse message info '%s'", str); return; } @@ -1392,12 +1349,12 @@ static PHP_METHOD(HttpMessage, getHttpVersion) if (SUCCESS == zend_parse_parameters_none()) { char *str; size_t len; - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - php_http_version_to_string(&obj->message->http.version, &str, &len, NULL, NULL TSRMLS_CC); - RETURN_STRINGL(str, len, 0); + php_http_version_to_string(&obj->message->http.version, &str, &len, NULL, NULL); + RETURN_STR(php_http_cs2zs(str, len)); } } @@ -1407,16 +1364,16 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, setHttpVersion) { char *v_str; - int v_len; + size_t v_len; php_http_version_t version; php_http_message_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &v_str, &v_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &v_str, &v_len), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - php_http_expect(php_http_version_parse(&version, v_str TSRMLS_CC), unexpected_val, return); + php_http_expect(php_http_version_parse(&version, v_str), unexpected_val, return); obj->message->http.version = version; @@ -1428,12 +1385,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, getResponseCode) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->type != PHP_HTTP_RESPONSE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "http\\Message is not if type response"); + php_error_docref(NULL, E_WARNING, "http\\Message is not if type response"); RETURN_FALSE; } @@ -1447,14 +1404,13 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_setResponseCode, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, setResponseCode) { - long code; + zend_long code; zend_bool strict = 1; php_http_message_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|b", &code, &strict), invalid_arg, return); - - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "l|b", &code, &strict), invalid_arg, return); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->type != PHP_HTTP_RESPONSE) { @@ -1478,16 +1434,16 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, getResponseStatus) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->type != PHP_HTTP_RESPONSE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "http\\Message is not of type response"); + php_error_docref(NULL, E_WARNING, "http\\Message is not of type response"); } if (obj->message->http.info.response.status) { - RETURN_STRING(obj->message->http.info.response.status, 1); + RETURN_STRING(obj->message->http.info.response.status); } else { RETURN_EMPTY_STRING(); } @@ -1500,12 +1456,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, setResponseStatus) { char *status; - int status_len; + size_t status_len; php_http_message_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &status, &status_len), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); @@ -1522,17 +1478,17 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, getRequestMethod) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->type != PHP_HTTP_REQUEST) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "http\\Message is not of type request"); + php_error_docref(NULL, E_WARNING, "http\\Message is not of type request"); RETURN_FALSE; } if (obj->message->http.info.request.method) { - RETURN_STRING(obj->message->http.info.request.method, 1); + RETURN_STRING(obj->message->http.info.request.method); } else { RETURN_EMPTY_STRING(); } @@ -1545,12 +1501,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, setRequestMethod) { char *method; - int method_len; + size_t method_len; php_http_message_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &method, &method_len), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); @@ -1573,12 +1529,12 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, getRequestUrl) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (obj->message->type != PHP_HTTP_REQUEST) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "http\\Message is not of type request"); + php_error_docref(NULL, E_WARNING, "http\\Message is not of type request"); RETURN_FALSE; } @@ -1587,7 +1543,7 @@ static PHP_METHOD(HttpMessage, getRequestUrl) size_t url_len; php_http_url_to_string(obj->message->http.info.request.url, &url_str, &url_len, 0); - RETURN_STRINGL(url_str, url_len, 0); + RETURN_STR(php_http_cs2zs(url_str, url_len)); } else { RETURN_EMPTY_STRING(); } @@ -1604,9 +1560,9 @@ static PHP_METHOD(HttpMessage, setRequestUrl) php_http_message_object_t *obj; zend_error_handling zeh; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zurl), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z", &zurl), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); @@ -1615,9 +1571,9 @@ static PHP_METHOD(HttpMessage, setRequestUrl) return; } - zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC); - url = php_http_url_from_zval(zurl, ~0 TSRMLS_CC); - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh); + url = php_http_url_from_zval(zurl, ~0); + zend_restore_error_handling(&zeh); if (url && php_http_url_is_empty(url)) { php_http_url_free(&url); @@ -1637,8 +1593,7 @@ static PHP_METHOD(HttpMessage, getParentMessage) php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (!obj->message->parent) { @@ -1646,7 +1601,7 @@ static PHP_METHOD(HttpMessage, getParentMessage) return; } - RETVAL_OBJVAL(obj->parent->zv, 1); + RETVAL_OBJECT(&obj->parent->zo, 1); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage___toString, 0, 0, 0) @@ -1658,8 +1613,8 @@ static PHP_METHOD(HttpMessage, toString) { zend_bool include_parent = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &include_parent)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &include_parent)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); char *string; size_t length; @@ -1671,22 +1626,12 @@ static PHP_METHOD(HttpMessage, toString) php_http_message_to_string(obj->message, &string, &length); } if (string) { - RETURN_STRINGL(string, length, 0); + RETURN_STR(php_http_cs2zs(string, length)); } } RETURN_EMPTY_STRING(); } -#ifdef ZTS -static size_t write_to_stream(void *s, const char *str, size_t len) -{ - TSRMLS_FETCH(); - return php_stream_write(s, str, len); -} -#else -# define write_to_stream (php_http_pass_callback_t)_php_stream_write -#endif - ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_toStream, 0, 0, 1) ZEND_ARG_INFO(0, stream) ZEND_END_ARG_INFO(); @@ -1694,14 +1639,14 @@ static PHP_METHOD(HttpMessage, toStream) { zval *zstream; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zstream)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); php_stream *s; PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - php_stream_from_zval(s, &zstream); - php_http_message_to_callback(obj->message, write_to_stream, s); + php_stream_from_zval(s, zstream); + php_http_message_to_callback(obj->message, (php_http_pass_callback_t) _php_stream_write, s); } } @@ -1712,19 +1657,16 @@ static PHP_METHOD(HttpMessage, toCallback) { php_http_pass_fcall_arg_t fcd; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f", &fcd.fci, &fcd.fcc)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "f", &fcd.fci, &fcd.fcc)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - fcd.fcz = getThis(); - Z_ADDREF_P(fcd.fcz); - TSRMLS_SET_CTX(fcd.ts); - + ZVAL_COPY(&fcd.fcz, getThis()); php_http_message_to_callback(obj->message, php_http_pass_fcall_callback, &fcd); zend_fcall_info_args_clear(&fcd.fci, 1); - zval_ptr_dtor(&fcd.fcz); + RETURN_ZVAL(getThis(), 1, 0); } } @@ -1734,14 +1676,14 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, serialize) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); char *string; size_t length; PHP_HTTP_MESSAGE_OBJECT_INIT(obj); php_http_message_serialize(obj->message, &string, &length); - RETURN_STRINGL(string, length, 0); + RETURN_STR(php_http_cs2zs(string, length)); } RETURN_EMPTY_STRING(); } @@ -1751,22 +1693,23 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_unserialize, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, unserialize) { - int length; + size_t length; char *serialized; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &serialized, &length)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &serialized, &length)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); php_http_message_t *msg; if (obj->message) { + /* do not free recursively */ php_http_message_dtor(obj->message); efree(obj->message); } - if ((msg = php_http_message_parse(NULL, serialized, (size_t) length, 1 TSRMLS_CC))) { + if ((msg = php_http_message_parse(NULL, serialized, length, 1))) { obj->message = msg; } else { - obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not unserialize http\\Message"); + obj->message = php_http_message_init(NULL, 0, NULL); + php_error_docref(NULL, E_ERROR, "Could not unserialize http\\Message"); } } } @@ -1775,15 +1718,18 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_detach, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, detach) { - php_http_message_object_t *obj; + php_http_message_object_t *obj, *new_obj; + php_http_message_t *msg_cpy; php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - RETVAL_OBJVAL(php_http_message_object_new_ex(obj->zo.ce, php_http_message_copy_ex(obj->message, NULL, 0), NULL TSRMLS_CC), 0); + msg_cpy = php_http_message_copy_ex(obj->message, NULL, 0); + new_obj = php_http_message_object_new_ex(obj->zo.ce, msg_cpy); + + RETVAL_OBJ(&new_obj->zo); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_prepend, 0, 0, 1) @@ -1797,11 +1743,11 @@ static PHP_METHOD(HttpMessage, prepend) php_http_message_t *msg[2]; php_http_message_object_t *obj, *prepend_obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|b", &prepend, php_http_message_class_entry, &top), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O|b", &prepend, php_http_message_class_entry, &top), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - prepend_obj = zend_object_store_get_object(prepend TSRMLS_CC); + prepend_obj = PHP_HTTP_OBJ(NULL, prepend); PHP_HTTP_MESSAGE_OBJECT_INIT(prepend_obj); /* safety check */ @@ -1814,7 +1760,7 @@ static PHP_METHOD(HttpMessage, prepend) } } - php_http_message_object_prepend(getThis(), prepend, top TSRMLS_CC); + php_http_message_object_prepend(getThis(), prepend, top); RETURN_ZVAL(getThis(), 1, 0); } @@ -1824,7 +1770,7 @@ static PHP_METHOD(HttpMessage, reverse) { php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - php_http_message_object_reverse(getThis(), return_value TSRMLS_CC); + php_http_message_object_reverse(getThis(), return_value); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_isMultipart, 0, 0, 0) @@ -1834,17 +1780,22 @@ static PHP_METHOD(HttpMessage, isMultipart) { zval *zboundary = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &zboundary)) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z!", &zboundary)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); char *boundary = NULL; PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - RETVAL_BOOL(php_http_message_is_multipart(obj->message, zboundary ? &boundary : NULL)); + if (php_http_message_is_multipart(obj->message, zboundary ? &boundary : NULL)) { + RETVAL_TRUE; + } else { + RETVAL_FALSE; + } if (zboundary && boundary) { + ZVAL_DEREF(zboundary); zval_dtor(zboundary); - ZVAL_STRING(zboundary, boundary, 0); + ZVAL_STR(zboundary, php_http_cs2zs(boundary, strlen(boundary))); } } } @@ -1859,8 +1810,7 @@ static PHP_METHOD(HttpMessage, splitMultipartBody) php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); if (!php_http_message_is_multipart(obj->message, &boundary)) { @@ -1872,23 +1822,21 @@ static PHP_METHOD(HttpMessage, splitMultipartBody) PTR_FREE(boundary); - RETURN_OBJVAL(php_http_message_object_new_ex(php_http_message_class_entry, msg, NULL TSRMLS_CC), 0); + RETURN_OBJ(&php_http_message_object_new_ex(obj->zo.ce, msg)->zo); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_count, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, count) { - long count_mode = -1; + zend_long count_mode = -1; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &count_mode)) { - long i = 0; - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &count_mode)) { + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_OBJECT_INIT(obj); - php_http_message_count(i, obj->message); - RETURN_LONG(i); + RETURN_LONG(php_http_message_count(obj->message)); } } @@ -1898,13 +1846,12 @@ static PHP_METHOD(HttpMessage, rewind) { if (SUCCESS == zend_parse_parameters_none()) { zval *zobj = getThis(); - php_http_message_object_t *obj = zend_object_store_get_object(zobj TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); - if (obj->iterator) { + if (!Z_ISUNDEF(obj->iterator)) { zval_ptr_dtor(&obj->iterator); } - Z_ADDREF_P(zobj); - obj->iterator = zobj; + ZVAL_COPY(&obj->iterator, zobj); } } @@ -1913,9 +1860,9 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, valid) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); - RETURN_BOOL(obj->iterator != NULL); + RETURN_BOOL(!Z_ISUNDEF(obj->iterator)); } } @@ -1924,19 +1871,20 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, next) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); - if (obj->iterator) { - php_http_message_object_t *itr = zend_object_store_get_object(obj->iterator TSRMLS_CC); + if (!Z_ISUNDEF(obj->iterator)) { + php_http_message_object_t *itr = PHP_HTTP_OBJ(NULL, &obj->iterator); - if (itr && itr->parent) { - zval *old = obj->iterator; - MAKE_STD_ZVAL(obj->iterator); - ZVAL_OBJVAL(obj->iterator, itr->parent->zv, 1); - zval_ptr_dtor(&old); + if (itr->parent) { + zval tmp; + + ZVAL_OBJECT(&tmp, &itr->parent->zo, 1); + zval_ptr_dtor(&obj->iterator); + obj->iterator = tmp; } else { zval_ptr_dtor(&obj->iterator); - obj->iterator = NULL; + ZVAL_UNDEF(&obj->iterator); } } } @@ -1947,9 +1895,9 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, key) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); - RETURN_LONG(obj->iterator ? obj->iterator->value.obj.handle:0); + RETURN_LONG(Z_ISUNDEF(obj->iterator) ? 0 : Z_OBJ_HANDLE(obj->iterator)); } } @@ -1958,10 +1906,10 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessage, current) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); - if (obj->iterator) { - RETURN_ZVAL(obj->iterator, 1, 0); + if (!Z_ISUNDEF(obj->iterator)) { + RETURN_ZVAL(&obj->iterator, 1, 0); } } } @@ -2029,40 +1977,42 @@ PHP_MINIT_FUNCTION(http_message) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http", "Message", php_http_message_methods); - php_http_message_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_http_message_class_entry = zend_register_internal_class(&ce); php_http_message_class_entry->create_object = php_http_message_object_new; memcpy(&php_http_message_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_http_message_object_handlers.offset = XtOffsetOf(php_http_message_object_t, zo); php_http_message_object_handlers.clone_obj = php_http_message_object_clone; + php_http_message_object_handlers.free_obj = php_http_message_object_free; php_http_message_object_handlers.read_property = php_http_message_object_read_prop; php_http_message_object_handlers.write_property = php_http_message_object_write_prop; - php_http_message_object_handlers.get_properties = php_http_message_object_get_props; + php_http_message_object_handlers.get_debug_info = php_http_message_object_get_debug_info; php_http_message_object_handlers.get_property_ptr_ptr = NULL; - zend_class_implements(php_http_message_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator); + zend_class_implements(php_http_message_class_entry, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator); - zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, NULL, 1); - zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("type"), PHP_HTTP_NONE, ZEND_ACC_PROTECTED TSRMLS_CC); + zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, php_http_message_object_prophandler_hash_dtor, 1); + zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("type"), PHP_HTTP_NONE, ZEND_ACC_PROTECTED); php_http_message_object_add_prophandler(ZEND_STRL("type"), php_http_message_object_prophandler_get_type, php_http_message_object_prophandler_set_type); - zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("body"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("body"), ZEND_ACC_PROTECTED); php_http_message_object_add_prophandler(ZEND_STRL("body"), php_http_message_object_prophandler_get_body, php_http_message_object_prophandler_set_body); - zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestMethod"), "", ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestMethod"), "", ZEND_ACC_PROTECTED); php_http_message_object_add_prophandler(ZEND_STRL("requestMethod"), php_http_message_object_prophandler_get_request_method, php_http_message_object_prophandler_set_request_method); - zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestUrl"), "", ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestUrl"), "", ZEND_ACC_PROTECTED); php_http_message_object_add_prophandler(ZEND_STRL("requestUrl"), php_http_message_object_prophandler_get_request_url, php_http_message_object_prophandler_set_request_url); - zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("responseStatus"), "", ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("responseStatus"), "", ZEND_ACC_PROTECTED); php_http_message_object_add_prophandler(ZEND_STRL("responseStatus"), php_http_message_object_prophandler_get_response_status, php_http_message_object_prophandler_set_response_status); - zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("responseCode"), 0, ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("responseCode"), 0, ZEND_ACC_PROTECTED); php_http_message_object_add_prophandler(ZEND_STRL("responseCode"), php_http_message_object_prophandler_get_response_code, php_http_message_object_prophandler_set_response_code); - zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("httpVersion"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("httpVersion"), ZEND_ACC_PROTECTED); php_http_message_object_add_prophandler(ZEND_STRL("httpVersion"), php_http_message_object_prophandler_get_http_version, php_http_message_object_prophandler_set_http_version); - zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("headers"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("headers"), ZEND_ACC_PROTECTED); php_http_message_object_add_prophandler(ZEND_STRL("headers"), php_http_message_object_prophandler_get_headers, php_http_message_object_prophandler_set_headers); - zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("parentMessage"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("parentMessage"), ZEND_ACC_PROTECTED); php_http_message_object_add_prophandler(ZEND_STRL("parentMessage"), php_http_message_object_prophandler_get_parent_message, php_http_message_object_prophandler_set_parent_message); - zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_NONE"), PHP_HTTP_NONE TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_REQUEST"), PHP_HTTP_REQUEST TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_RESPONSE"), PHP_HTTP_RESPONSE TSRMLS_CC); + zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_NONE"), PHP_HTTP_NONE); + zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_REQUEST"), PHP_HTTP_REQUEST); + zend_declare_class_constant_long(php_http_message_class_entry, ZEND_STRL("TYPE_RESPONSE"), PHP_HTTP_RESPONSE); return SUCCESS; } diff --git a/src/php_http_message.h b/src/php_http_message.h index 780ea68..2f99507 100644 --- a/src/php_http_message.h +++ b/src/php_http_message.h @@ -14,6 +14,7 @@ #define PHP_HTTP_MESSAGE_H #include "php_http_message_body.h" +#include "php_http_header.h" /* required minimum length of an HTTP message "HTTP/1.1" */ #define PHP_HTTP_MESSAGE_MIN_SIZE 8 @@ -28,17 +29,18 @@ struct php_http_message { php_http_message_body_t *body; php_http_message_t *parent; void *opaque; -#ifdef ZTS - void ***ts; -#endif }; -PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable **headers, php_http_info_t *info TSRMLS_DC); +PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable **headers, php_http_info_t *info); -PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *m, php_http_message_type_t t, php_http_message_body_t *body TSRMLS_DC); -PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m, php_http_message_type_t t TSRMLS_DC); -PHP_HTTP_API php_http_message_t *php_http_message_copy(php_http_message_t *from, php_http_message_t *to); +PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *m, php_http_message_type_t t, php_http_message_body_t *body); +PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m, php_http_message_type_t t); PHP_HTTP_API php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_message_t *to, zend_bool parents); +static inline php_http_message_t *php_http_message_copy(php_http_message_t *from, php_http_message_t *to) +{ + return php_http_message_copy_ex(from, to, 1); +} + PHP_HTTP_API void php_http_message_dtor(php_http_message_t *message); PHP_HTTP_API void php_http_message_free(php_http_message_t **message); @@ -47,7 +49,18 @@ PHP_HTTP_API void php_http_message_set_info(php_http_message_t *message, php_htt PHP_HTTP_API void php_http_message_update_headers(php_http_message_t *msg); -PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, const char *key_str, size_t key_len, int join); +PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, const char *key_str, size_t key_len); + +static inline zend_string *php_http_message_header_string(php_http_message_t *msg, const char *key_str, size_t key_len) +{ + zval *header; + + if ((header = php_http_message_header(msg, key_str, key_len))) { + return php_http_header_value_to_string(header); + } + return NULL; +} + PHP_HTTP_API zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary); PHP_HTTP_API void php_http_message_to_string(php_http_message_t *msg, char **string, size_t *length); @@ -58,21 +71,25 @@ PHP_HTTP_API void php_http_message_serialize(php_http_message_t *message, char * PHP_HTTP_API php_http_message_t *php_http_message_reverse(php_http_message_t *msg); PHP_HTTP_API php_http_message_t *php_http_message_zip(php_http_message_t *one, php_http_message_t *two); -#define php_http_message_count(c, m) \ -{ \ - php_http_message_t *__tmp_msg = (m); \ - for (c = 0; __tmp_msg; __tmp_msg = __tmp_msg->parent, ++(c)); \ +static inline size_t php_http_message_count(php_http_message_t *m) +{ + size_t c = 1; + + while ((m = m->parent)) { + ++c; + } + + return c; } -PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len, zend_bool greedy TSRMLS_DC); +PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len, zend_bool greedy); typedef struct php_http_message_object { - zend_object zo; - zend_object_value zv; php_http_message_t *message; struct php_http_message_object *parent; php_http_message_body_object_t *body; - zval *iterator; + zval iterator; + zend_object zo; } php_http_message_object_t; PHP_HTTP_API zend_class_entry *php_http_message_class_entry; @@ -80,15 +97,15 @@ PHP_HTTP_API zend_class_entry *php_http_message_class_entry; PHP_MINIT_FUNCTION(http_message); PHP_MSHUTDOWN_FUNCTION(http_message); -void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool top /* = 1 */ TSRMLS_DC); -void php_http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC); -ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *obj, zval *zbody TSRMLS_DC); +void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool top /* = 1 */); +void php_http_message_object_reverse(zval *this_ptr, zval *return_value); +ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *obj, zval *zbody); ZEND_RESULT_CODE php_http_message_object_init_body_object(php_http_message_object_t *obj); -zend_object_value php_http_message_object_new(zend_class_entry *ce TSRMLS_DC); -zend_object_value php_http_message_object_new_ex(zend_class_entry *ce, php_http_message_t *msg, php_http_message_object_t **ptr TSRMLS_DC); -zend_object_value php_http_message_object_clone(zval *object TSRMLS_DC); -void php_http_message_object_free(void *object TSRMLS_DC); +zend_object *php_http_message_object_new(zend_class_entry *ce); +php_http_message_object_t *php_http_message_object_new_ex(zend_class_entry *ce, php_http_message_t *msg); +zend_object *php_http_message_object_clone(zval *object); +void php_http_message_object_free(zend_object *object); #endif diff --git a/src/php_http_message_body.c b/src/php_http_message_body.c index c80c238..d629ae5 100644 --- a/src/php_http_message_body.c +++ b/src/php_http_message_body.c @@ -28,16 +28,16 @@ #define BOUNDARY_CLOSE(body) \ php_http_message_body_appendf(body, PHP_HTTP_CRLF "--%s--" PHP_HTTP_CRLF, php_http_message_body_boundary(body)) -static ZEND_RESULT_CODE add_recursive_fields(php_http_message_body_t *body, const char *name, zval *value); -static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const char *name, zval *value); +static ZEND_RESULT_CODE add_recursive_fields(php_http_message_body_t *body, const char *name, HashTable *fields); +static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const char *name, HashTable *files); -php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **body_ptr, php_stream *stream TSRMLS_DC) +php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **body_ptr, php_stream *stream) { php_http_message_body_t *body; if (body_ptr && *body_ptr) { body = *body_ptr; - ++body->refcount; + php_http_message_body_addref(body); return body; } @@ -45,15 +45,13 @@ php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **bo body->refcount = 1; if (stream) { - php_stream_auto_cleanup(stream); - body->stream_id = php_stream_get_resource_id(stream); - zend_list_addref(body->stream_id); + body->res = stream->res; + ++GC_REFCOUNT(body->res); } else { stream = php_stream_temp_create(TEMP_STREAM_DEFAULT, 0xffff); - php_stream_auto_cleanup(stream); - body->stream_id = php_stream_get_resource_id(stream); + body->res = stream->res; } - TSRMLS_SET_CTX(body->ts); + php_stream_auto_cleanup(stream); if (body_ptr) { *body_ptr = body; @@ -70,12 +68,10 @@ unsigned php_http_message_body_addref(php_http_message_body_t *body) php_http_message_body_t *php_http_message_body_copy(php_http_message_body_t *from, php_http_message_body_t *to) { if (from) { - TSRMLS_FETCH_FROM_CTX(from->ts); - if (to) { php_stream_truncate_set_size(php_http_message_body_stream(to), 0); } else { - to = php_http_message_body_init(NULL, NULL TSRMLS_CC); + to = php_http_message_body_init(NULL, NULL); } php_http_message_body_to_stream(from, php_http_message_body_stream(to), 0, 0); @@ -97,9 +93,7 @@ void php_http_message_body_free(php_http_message_body_t **body_ptr) php_http_message_body_t *body = *body_ptr; if (!--body->refcount) { - TSRMLS_FETCH_FROM_CTX(body->ts); - /* NOFIXME: shows leakinfo in DEBUG mode */ - zend_list_delete(body->stream_id); + zend_list_delete(body->res); PTR_FREE(body->boundary); efree(body); } @@ -109,7 +103,6 @@ void php_http_message_body_free(php_http_message_body_t **body_ptr) const php_stream_statbuf *php_http_message_body_stat(php_http_message_body_t *body) { - TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_stat(php_http_message_body_stream(body), &body->ssb); return &body->ssb; } @@ -118,9 +111,8 @@ const char *php_http_message_body_boundary(php_http_message_body_t *body) { if (!body->boundary) { union { double dbl; int num[2]; } data; - TSRMLS_FETCH_FROM_CTX(body->ts); - data.dbl = php_combined_lcg(TSRMLS_C); + data.dbl = php_combined_lcg(); spprintf(&body->boundary, 0, "%x.%x", data.num[0], data.num[1]); } return body->boundary; @@ -130,7 +122,6 @@ char *php_http_message_body_etag(php_http_message_body_t *body) { php_http_etag_t *etag; php_stream *s = php_http_message_body_stream(body); - TSRMLS_FETCH_FROM_CTX(body->ts); /* real file or temp buffer ? */ if (s->ops != &php_stream_temp_ops && s->ops != &php_stream_memory_ops) { @@ -145,7 +136,7 @@ char *php_http_message_body_etag(php_http_message_body_t *body) } /* content based */ - if ((etag = php_http_etag_init(PHP_HTTP_G->env.etag_mode TSRMLS_CC))) { + if ((etag = php_http_etag_init(PHP_HTTP_G->env.etag_mode))) { php_http_message_body_to_callback(body, (php_http_pass_callback_t) php_http_etag_update, etag, 0, 0); return php_http_etag_finish(etag); } @@ -153,22 +144,20 @@ char *php_http_message_body_etag(php_http_message_body_t *body) return NULL; } -void php_http_message_body_to_string(php_http_message_body_t *body, char **buf, size_t *len, off_t offset, size_t forlen) +zend_string *php_http_message_body_to_string(php_http_message_body_t *body, off_t offset, size_t forlen) { php_stream *s = php_http_message_body_stream(body); - TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_seek(s, offset, SEEK_SET); if (!forlen) { forlen = -1; } - *len = php_stream_copy_to_mem(s, buf, forlen, 0); + return php_stream_copy_to_mem(s, forlen, 0); } ZEND_RESULT_CODE php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *dst, off_t offset, size_t forlen) { php_stream *s = php_http_message_body_stream(body); - TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_seek(s, offset, SEEK_SET); @@ -182,7 +171,6 @@ ZEND_RESULT_CODE php_http_message_body_to_callback(php_http_message_body_t *body { php_stream *s = php_http_message_body_stream(body); char *buf = emalloc(0x1000); - TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_seek(s, offset, SEEK_SET); @@ -215,7 +203,6 @@ size_t php_http_message_body_append(php_http_message_body_t *body, const char *b { php_stream *s; size_t written; - TSRMLS_FETCH_FROM_CTX(body->ts); if (!(s = php_http_message_body_stream(body))) { return -1; @@ -228,7 +215,7 @@ size_t php_http_message_body_append(php_http_message_body_t *body, const char *b written = php_stream_write(s, buf, len); if (written != len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to append %zu bytes to body; wrote %zu", len, written); + php_error_docref(NULL, E_WARNING, "Failed to append %zu bytes to body; wrote %zu", len, written); } return len; @@ -252,17 +239,13 @@ size_t php_http_message_body_appendf(php_http_message_body_t *body, const char * ZEND_RESULT_CODE php_http_message_body_add_form(php_http_message_body_t *body, HashTable *fields, HashTable *files) { - zval tmp; - if (fields) { - INIT_PZVAL_ARRAY(&tmp, fields); - if (SUCCESS != add_recursive_fields(body, NULL, &tmp)) { + if (SUCCESS != add_recursive_fields(body, NULL, fields)) { return FAILURE; } } if (files) { - INIT_PZVAL_ARRAY(&tmp, files); - if (SUCCESS != add_recursive_files(body, NULL, &tmp)) { + if (SUCCESS != add_recursive_files(body, NULL, files)) { return FAILURE; } } @@ -272,8 +255,6 @@ ZEND_RESULT_CODE php_http_message_body_add_form(php_http_message_body_t *body, H void php_http_message_body_add_part(php_http_message_body_t *body, php_http_message_t *part) { - TSRMLS_FETCH_FROM_CTX(body->ts); - BOUNDARY_OPEN(body); php_http_message_to_callback(part, (php_http_pass_callback_t) php_http_message_body_append, body); BOUNDARY_CLOSE(body); @@ -282,34 +263,32 @@ void php_http_message_body_add_part(php_http_message_body_t *body, php_http_mess ZEND_RESULT_CODE php_http_message_body_add_form_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len) { - char *safe_name; - TSRMLS_FETCH_FROM_CTX(body->ts); + zend_string *safe_name = zend_string_init(name, strlen(name), 0); - safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC); + safe_name = php_addslashes(safe_name, 1); BOUNDARY_OPEN(body); php_http_message_body_appendf( body, "Content-Disposition: form-data; name=\"%s\"" PHP_HTTP_CRLF "" PHP_HTTP_CRLF, - safe_name + safe_name->val ); php_http_message_body_append(body, value_str, value_len); BOUNDARY_CLOSE(body); - efree(safe_name); + zend_string_release(safe_name); return SUCCESS; } ZEND_RESULT_CODE php_http_message_body_add_form_file(php_http_message_body_t *body, const char *name, const char *ctype, const char *path, php_stream *in) { - char *safe_name, *path_dup = estrdup(path), *bname; - size_t bname_len; - TSRMLS_FETCH_FROM_CTX(body->ts); + size_t path_len = strlen(path); + char *path_dup = estrndup(path, path_len); + zend_string *base_name, *safe_name = zend_string_init(name, strlen(name), 0); - safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC); - - php_basename(path_dup, strlen(path_dup), NULL, 0, &bname, &bname_len TSRMLS_CC); + safe_name = php_addslashes(safe_name, 1); + base_name = php_basename(path_dup, path_len, NULL, 0); BOUNDARY_OPEN(body); php_http_message_body_appendf( @@ -318,29 +297,29 @@ ZEND_RESULT_CODE php_http_message_body_add_form_file(php_http_message_body_t *bo "Content-Transfer-Encoding: binary" PHP_HTTP_CRLF "Content-Type: %s" PHP_HTTP_CRLF PHP_HTTP_CRLF, - safe_name, bname, ctype + safe_name->val, base_name->val, ctype ); php_stream_copy_to_stream_ex(in, php_http_message_body_stream(body), PHP_STREAM_COPY_ALL, NULL); BOUNDARY_CLOSE(body); - efree(safe_name); + zend_string_release(safe_name); + zend_string_release(base_name); efree(path_dup); - efree(bname); return SUCCESS; } -static inline char *format_key(uint type, char *str, ulong num, const char *prefix) { +static inline char *format_key(php_http_arrkey_t *key, const char *prefix) { char *new_key = NULL; if (prefix && *prefix) { - if (type == HASH_KEY_IS_STRING) { - spprintf(&new_key, 0, "%s[%s]", prefix, str); + if (key->key) { + spprintf(&new_key, 0, "%s[%s]", prefix, key->key->val); } else { - spprintf(&new_key, 0, "%s[%lu]", prefix, num); + spprintf(&new_key, 0, "%s[%lu]", prefix, key->h); } - } else if (type == HASH_KEY_IS_STRING) { - new_key = estrdup(str); + } else if (key->key) { + new_key = estrdup(key->key->val); } else { new_key = estrdup(""); } @@ -348,106 +327,108 @@ static inline char *format_key(uint type, char *str, ulong num, const char *pref return new_key; } -static ZEND_RESULT_CODE add_recursive_fields(php_http_message_body_t *body, const char *name, zval *value) +static ZEND_RESULT_CODE add_recursive_field_value(php_http_message_body_t *body, const char *name, zval *value) { - if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) { - zval **val; - HashTable *ht; - HashPosition pos; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - TSRMLS_FETCH_FROM_CTX(body->ts); + zend_string *zs = zval_get_string(value); + ZEND_RESULT_CODE rc = php_http_message_body_add_form_field(body, name, zs->val, zs->len); + zend_string_release(zs); + return rc; +} - ht = HASH_OF(value); - if (!ht->nApplyCount) { - ++ht->nApplyCount; - FOREACH_KEYVAL(pos, value, key, val) { - char *str = format_key(key.type, key.str, key.num, name); - if (SUCCESS != add_recursive_fields(body, str, *val)) { +static ZEND_RESULT_CODE add_recursive_fields(php_http_message_body_t *body, const char *name, HashTable *fields) +{ + zval *val; + php_http_arrkey_t key; + + if (!ZEND_HASH_GET_APPLY_COUNT(fields)) { + ZEND_HASH_INC_APPLY_COUNT(fields); + ZEND_HASH_FOREACH_KEY_VAL_IND(fields, key.h, key.key, val) + { + char *str = format_key(&key, name); + + if (Z_TYPE_P(val) != IS_ARRAY && Z_TYPE_P(val) != IS_OBJECT) { + if (SUCCESS != add_recursive_field_value(body, str, val)) { efree(str); - ht->nApplyCount--; + ZEND_HASH_DEC_APPLY_COUNT(fields); return FAILURE; } + } else if (SUCCESS != add_recursive_fields(body, str, HASH_OF(val))) { efree(str); + ZEND_HASH_DEC_APPLY_COUNT(fields); + return FAILURE; } - --ht->nApplyCount; + efree(str); } - } else { - zval *cpy = php_http_ztyp(IS_STRING, value); - php_http_message_body_add_form_field(body, name, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)); - zval_ptr_dtor(&cpy); + ZEND_HASH_FOREACH_END(); + ZEND_HASH_DEC_APPLY_COUNT(fields); } return SUCCESS; } -static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const char *name, zval *value) +static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const char *name, HashTable *files) { - zval **zdata = NULL, **zfile, **zname, **ztype; - HashTable *ht; - TSRMLS_FETCH_FROM_CTX(body->ts); + zval *zdata = NULL, *zfile, *zname, *ztype; - if (Z_TYPE_P(value) != IS_ARRAY && Z_TYPE_P(value) != IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array or object (name, type, file) for message body file to add"); - return FAILURE; - } - - ht = HASH_OF(value); - - if ((SUCCESS != zend_hash_find(ht, ZEND_STRS("name"), (void *) &zname)) - || (SUCCESS != zend_hash_find(ht, ZEND_STRS("type"), (void *) &ztype)) - || (SUCCESS != zend_hash_find(ht, ZEND_STRS("file"), (void *) &zfile)) + /* single entry */ + if (!(zname = zend_hash_str_find(files, ZEND_STRL("name"))) + || !(ztype = zend_hash_str_find(files, ZEND_STRL("type"))) + || !(zfile = zend_hash_str_find(files, ZEND_STRL("file"))) ) { - zval **val; - HashPosition pos; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); + zval *val; + php_http_arrkey_t key; - if (!ht->nApplyCount) { - ++ht->nApplyCount; - FOREACH_HASH_KEYVAL(pos, ht, key, val) { - if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) { - char *str = format_key(key.type, key.str, key.num, name); + if (!ZEND_HASH_GET_APPLY_COUNT(files)) { + ZEND_HASH_INC_APPLY_COUNT(files); + ZEND_HASH_FOREACH_KEY_VAL_IND(files, key.h, key.key, val) + { + if (Z_TYPE_P(val) == IS_ARRAY || Z_TYPE_P(val) == IS_OBJECT) { + char *str = format_key(&key, name); - if (SUCCESS != add_recursive_files(body, str, *val)) { + if (SUCCESS != add_recursive_files(body, str, HASH_OF(val))) { efree(str); - --ht->nApplyCount; + ZEND_HASH_DEC_APPLY_COUNT(files); return FAILURE; } efree(str); } } - --ht->nApplyCount; + ZEND_HASH_FOREACH_END(); + ZEND_HASH_DEC_APPLY_COUNT(files); } return SUCCESS; } else { + /* stream entry */ php_stream *stream; - zval *zfc = php_http_ztyp(IS_STRING, *zfile); + zend_string *zfc = zval_get_string(zfile); - if (SUCCESS == zend_hash_find(ht, ZEND_STRS("data"), (void *) &zdata)) { - if (Z_TYPE_PP(zdata) == IS_RESOURCE) { + if ((zdata = zend_hash_str_find(files, ZEND_STRL("data")))) { + if (Z_TYPE_P(zdata) == IS_RESOURCE) { php_stream_from_zval_no_verify(stream, zdata); } else { - zval *tmp = php_http_ztyp(IS_STRING, *zdata); + zend_string *tmp = zval_get_string(zdata); - stream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); - zval_ptr_dtor(&tmp); + stream = php_stream_memory_open(TEMP_STREAM_READONLY, tmp->val, tmp->len); + zend_string_release(tmp); } } else { - stream = php_stream_open_wrapper(Z_STRVAL_P(zfc), "r", REPORT_ERRORS|USE_PATH, NULL); + stream = php_stream_open_wrapper(zfc->val, "r", REPORT_ERRORS|USE_PATH, NULL); } if (!stream) { - zval_ptr_dtor(&zfc); + zend_string_release(zfc); return FAILURE; } else { - zval *znc = php_http_ztyp(IS_STRING, *zname), *ztc = php_http_ztyp(IS_STRING, *ztype); - char *key = format_key(HASH_KEY_IS_STRING, Z_STRVAL_P(znc), 0, name); - ZEND_RESULT_CODE ret = php_http_message_body_add_form_file(body, key, Z_STRVAL_P(ztc), Z_STRVAL_P(zfc), stream); + zend_string *znc = zval_get_string(zname), *ztc = zval_get_string(ztype); + php_http_arrkey_t arrkey = {0, znc}; + char *key = format_key(&arrkey, name); + ZEND_RESULT_CODE ret = php_http_message_body_add_form_file(body, key, ztc->val, zfc->val, stream); efree(key); - zval_ptr_dtor(&znc); - zval_ptr_dtor(&ztc); - zval_ptr_dtor(&zfc); - if (!zdata || Z_TYPE_PP(zdata) != IS_RESOURCE) { + zend_string_release(znc); + zend_string_release(ztc); + zend_string_release(zfc); + if (!zdata || Z_TYPE_P(zdata) != IS_RESOURCE) { php_stream_close(stream); } return ret; @@ -464,7 +445,7 @@ struct splitbody_arg { size_t consumed; }; -static size_t splitbody(void *opaque, char *buf, size_t len TSRMLS_DC) +static size_t splitbody(void *opaque, char *buf, size_t len) { struct splitbody_arg *arg = opaque; const char *boundary = NULL; @@ -507,7 +488,7 @@ static size_t splitbody(void *opaque, char *buf, size_t len TSRMLS_DC) /* advance messages */ php_http_message_t *msg; - msg = php_http_message_init(NULL, 0, NULL TSRMLS_CC); + msg = php_http_message_init(NULL, 0, NULL); msg->parent = arg->parser->message; arg->parser->message = msg; } @@ -519,7 +500,7 @@ static size_t splitbody(void *opaque, char *buf, size_t len TSRMLS_DC) len = 0; } else { /* let this be garbage */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Malformed multipart boundary at pos %zu", consumed); + php_error_docref(NULL, E_WARNING, "Malformed multipart boundary at pos %zu", consumed); return -1; } } @@ -543,16 +524,15 @@ php_http_message_t *php_http_message_body_split(php_http_message_body_t *body, c php_http_buffer_t *tmp = NULL; php_http_message_t *msg = NULL; struct splitbody_arg arg; - TSRMLS_FETCH_FROM_CTX(body->ts); php_http_buffer_init(&arg.buf); - arg.parser = php_http_message_parser_init(NULL TSRMLS_CC); + arg.parser = php_http_message_parser_init(NULL); arg.boundary_len = spprintf(&arg.boundary_str, 0, "\n--%s", boundary); arg.consumed = 0; php_stream_rewind(s); while (!php_stream_eof(s)) { - php_http_buffer_passthru(&tmp, 0x1000, (php_http_buffer_pass_func_t) _php_stream_read, s, splitbody, &arg TSRMLS_CC); + php_http_buffer_passthru(&tmp, 0x1000, (php_http_buffer_pass_func_t) _php_stream_read, s, splitbody, &arg); } msg = arg.parser->message; @@ -568,59 +548,52 @@ php_http_message_t *php_http_message_body_split(php_http_message_body_t *body, c static zend_object_handlers php_http_message_body_object_handlers; -zend_object_value php_http_message_body_object_new(zend_class_entry *ce TSRMLS_DC) +zend_object *php_http_message_body_object_new(zend_class_entry *ce) { - return php_http_message_body_object_new_ex(ce, NULL, NULL TSRMLS_CC); + return &php_http_message_body_object_new_ex(ce, NULL)->zo; } -zend_object_value php_http_message_body_object_new_ex(zend_class_entry *ce, php_http_message_body_t *body, php_http_message_body_object_t **ptr TSRMLS_DC) +php_http_message_body_object_t *php_http_message_body_object_new_ex(zend_class_entry *ce, php_http_message_body_t *body) { php_http_message_body_object_t *o; - o = ecalloc(1, sizeof(php_http_message_body_object_t)); - zend_object_std_init((zend_object *) o, php_http_message_body_class_entry TSRMLS_CC); - object_properties_init((zend_object *) o, ce); - - if (ptr) { - *ptr = o; - } + o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); + zend_object_std_init(&o->zo, php_http_message_body_class_entry); + object_properties_init(&o->zo, ce); if (body) { o->body = body; } - o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_body_object_free, NULL TSRMLS_CC); - o->zv.handlers = &php_http_message_body_object_handlers; + o->zo.handlers = &php_http_message_body_object_handlers; - return o->zv; + return o; } -zend_object_value php_http_message_body_object_clone(zval *object TSRMLS_DC) +zend_object *php_http_message_body_object_clone(zval *object) { - zend_object_value new_ov; php_http_message_body_object_t *new_obj = NULL; - php_http_message_body_object_t *old_obj = zend_object_store_get_object(object TSRMLS_CC); + php_http_message_body_object_t *old_obj = PHP_HTTP_OBJ(NULL, object); php_http_message_body_t *body = php_http_message_body_copy(old_obj->body, NULL); - new_ov = php_http_message_body_object_new_ex(old_obj->zo.ce, body, &new_obj TSRMLS_CC); - zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(object) TSRMLS_CC); + new_obj = php_http_message_body_object_new_ex(old_obj->zo.ce, body); + zend_objects_clone_members(&new_obj->zo, &old_obj->zo); - return new_ov; + return &new_obj->zo; } -void php_http_message_body_object_free(void *object TSRMLS_DC) +void php_http_message_body_object_free(zend_object *object) { - php_http_message_body_object_t *obj = object; + php_http_message_body_object_t *obj = PHP_HTTP_OBJ(object, NULL); php_http_message_body_free(&obj->body); - zend_object_std_dtor((zend_object *) obj TSRMLS_CC); - efree(obj); + zend_object_std_dtor(object); } #define PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj) \ do { \ if (!obj->body) { \ - obj->body = php_http_message_body_init(NULL, NULL TSRMLS_CC); \ + obj->body = php_http_message_body_init(NULL, NULL); \ } \ } while(0) @@ -629,19 +602,19 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody___construct, 0, 0, 0) ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, __construct) { - php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); zval *zstream = NULL; php_stream *stream; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &zstream), invalid_arg, return); if (zstream) { - php_http_expect(php_stream_from_zval_no_verify(stream, &zstream), unexpected_val, return); + php_http_expect(php_stream_from_zval_no_verify(stream, zstream), unexpected_val, return); if (obj->body) { php_http_message_body_free(&obj->body); } - obj->body = php_http_message_body_init(NULL, stream TSRMLS_CC); + obj->body = php_http_message_body_init(NULL, stream); } } @@ -650,15 +623,14 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, __toString) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - char *str; - size_t len; + php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); + zend_string *zs; PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); - php_http_message_body_to_string(obj->body, &str, &len, 0, 0); - if (str) { - RETURN_STRINGL(str, len, 0); + zs = php_http_message_body_to_string(obj->body, 0, 0); + if (zs) { + RETURN_STR(zs); } } RETURN_EMPTY_STRING(); @@ -670,13 +642,13 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, unserialize) { char *us_str; - int us_len; + size_t us_len; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &us_str, &us_len)) { - php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &us_str, &us_len)) { + php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); php_stream *s = php_stream_memory_open(0, us_str, us_len); - obj->body = php_http_message_body_init(NULL, s TSRMLS_CC); + obj->body = php_http_message_body_init(NULL, s); } } @@ -688,15 +660,15 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, toStream) { zval *zstream; - long offset = 0, forlen = 0; + zend_long offset = 0, forlen = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|ll", &zstream, &offset, &forlen)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "r|ll", &zstream, &offset, &forlen)) { php_stream *stream; - php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); - php_stream_from_zval(stream, &zstream); + php_stream_from_zval(stream, zstream); php_http_message_body_to_stream(obj->body, stream, offset, forlen); RETURN_ZVAL(getThis(), 1, 0); } @@ -710,20 +682,16 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, toCallback) { php_http_pass_fcall_arg_t fcd; - long offset = 0, forlen = 0; + zend_long offset = 0, forlen = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f|ll", &fcd.fci, &fcd.fcc, &offset, &forlen)) { - php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "f|ll", &fcd.fci, &fcd.fcc, &offset, &forlen)) { + php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); - fcd.fcz = getThis(); - Z_ADDREF_P(fcd.fcz); - TSRMLS_SET_CTX(fcd.ts); - + ZVAL_COPY(&fcd.fcz, getThis()); php_http_message_body_to_callback(obj->body, php_http_pass_fcall_callback, &fcd, offset, forlen); zend_fcall_info_args_clear(&fcd.fci, 1); - zval_ptr_dtor(&fcd.fcz); RETURN_ZVAL(getThis(), 1, 0); } @@ -734,12 +702,12 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, getResource) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); - zend_list_addref(obj->body->stream_id); - RETVAL_RESOURCE(obj->body->stream_id); + ++GC_REFCOUNT(obj->body->res); + RETVAL_RES(obj->body->res); } } @@ -748,12 +716,12 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, getBoundary) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_body_object_t * obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_body_object_t * obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); if (obj->body->boundary) { - RETURN_STRING(obj->body->boundary, 1); + RETURN_STRING(obj->body->boundary); } } } @@ -764,13 +732,12 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, append) { char *str; - int len; + size_t len; php_http_message_body_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len), invalid_arg, return); - - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &len), invalid_arg, return); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); php_http_expect(len == php_http_message_body_append(obj->body, str, len), runtime, return); @@ -787,10 +754,9 @@ PHP_METHOD(HttpMessageBody, addForm) HashTable *fields = NULL, *files = NULL; php_http_message_body_object_t *obj; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|h!h!", &fields, &files), invalid_arg, return); - - obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|h!h!", &fields, &files), invalid_arg, return); + obj = PHP_HTTP_OBJ(NULL, getThis()); PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); php_http_expect(SUCCESS == php_http_message_body_add_form(obj->body, fields, files), runtime, return); @@ -808,16 +774,16 @@ PHP_METHOD(HttpMessageBody, addPart) php_http_message_object_t *mobj; zend_error_handling zeh; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zobj, php_http_message_class_entry), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O", &zobj, php_http_message_class_entry), invalid_arg, return); - obj = zend_object_store_get_object(getThis() TSRMLS_CC); - mobj = zend_object_store_get_object(zobj TSRMLS_CC); + obj = PHP_HTTP_OBJ(NULL, getThis()); + mobj = PHP_HTTP_OBJ(NULL, zobj); PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); - zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh); php_http_message_body_add_part(obj->body, mobj->message); - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); if (!EG(exception)) { RETURN_ZVAL(getThis(), 1, 0); @@ -829,13 +795,13 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, etag) { if (SUCCESS == zend_parse_parameters_none()) { - php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); char *etag; PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); if ((etag = php_http_message_body_etag(obj->body))) { - RETURN_STRING(etag, 0); + RETURN_STR(php_http_cs2zs(etag, strlen(etag))); } else { RETURN_FALSE; } @@ -848,10 +814,10 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, stat) { char *field_str = NULL; - int field_len = 0; + size_t field_len = 0; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &field_str, &field_len)) { - php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &field_str, &field_len)) { + php_http_message_body_object_t *obj = PHP_HTTP_OBJ(NULL, getThis()); const php_stream_statbuf *sb; PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); @@ -876,15 +842,15 @@ PHP_METHOD(HttpMessageBody, stat) RETURN_LONG(sb->sb.st_ctime); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown stat field: '%s' (should be one of [s]ize, [a]time, [m]time or [c]time)", field_str); + php_error_docref(NULL, E_WARNING, "Unknown stat field: '%s' (should be one of [s]ize, [a]time, [m]time or [c]time)", field_str); break; } } else { object_init(return_value); - add_property_long_ex(return_value, ZEND_STRS("size"), sb->sb.st_size TSRMLS_CC); - add_property_long_ex(return_value, ZEND_STRS("atime"), sb->sb.st_atime TSRMLS_CC); - add_property_long_ex(return_value, ZEND_STRS("mtime"), sb->sb.st_mtime TSRMLS_CC); - add_property_long_ex(return_value, ZEND_STRS("ctime"), sb->sb.st_ctime TSRMLS_CC); + add_property_long_ex(return_value, ZEND_STRL("size"), sb->sb.st_size); + add_property_long_ex(return_value, ZEND_STRL("atime"), sb->sb.st_atime); + add_property_long_ex(return_value, ZEND_STRL("mtime"), sb->sb.st_mtime); + add_property_long_ex(return_value, ZEND_STRL("ctime"), sb->sb.st_ctime); } } } @@ -915,11 +881,13 @@ PHP_MINIT_FUNCTION(http_message_body) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http\\Message", "Body", php_http_message_body_methods); - php_http_message_body_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_http_message_body_class_entry = zend_register_internal_class(&ce); php_http_message_body_class_entry->create_object = php_http_message_body_object_new; memcpy(&php_http_message_body_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_http_message_body_object_handlers.offset = XtOffsetOf(php_http_message_body_object_t, zo); php_http_message_body_object_handlers.clone_obj = php_http_message_body_object_clone; - zend_class_implements(php_http_message_body_class_entry TSRMLS_CC, 1, zend_ce_serializable); + php_http_message_body_object_handlers.free_obj = php_http_message_body_object_free; + zend_class_implements(php_http_message_body_class_entry, 1, zend_ce_serializable); return SUCCESS; } diff --git a/src/php_http_message_body.h b/src/php_http_message_body.h index dc2c7a2..92353f7 100644 --- a/src/php_http_message_body.h +++ b/src/php_http_message_body.h @@ -14,18 +14,15 @@ #define PHP_HTTP_MESSAGE_BODY_H typedef struct php_http_message_body { - int stream_id; php_stream_statbuf ssb; + zend_resource *res; char *boundary; unsigned refcount; -#ifdef ZTS - void ***ts; -#endif } php_http_message_body_t; struct php_http_message; -PHP_HTTP_API php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **body, php_stream *stream TSRMLS_DC); +PHP_HTTP_API php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **body, php_stream *stream); PHP_HTTP_API unsigned php_http_message_body_addref(php_http_message_body_t *body); PHP_HTTP_API php_http_message_body_t *php_http_message_body_copy(php_http_message_body_t *from, php_http_message_body_t *to); PHP_HTTP_API ZEND_RESULT_CODE php_http_message_body_add_form(php_http_message_body_t *body, HashTable *fields, HashTable *files); @@ -34,36 +31,42 @@ PHP_HTTP_API ZEND_RESULT_CODE php_http_message_body_add_form_file(php_http_messa PHP_HTTP_API void php_http_message_body_add_part(php_http_message_body_t *body, struct php_http_message *part); PHP_HTTP_API size_t php_http_message_body_append(php_http_message_body_t *body, const char *buf, size_t len); PHP_HTTP_API size_t php_http_message_body_appendf(php_http_message_body_t *body, const char *fmt, ...); -PHP_HTTP_API void php_http_message_body_to_string(php_http_message_body_t *body, char **buf, size_t *len, off_t offset, size_t forlen); +PHP_HTTP_API zend_string *php_http_message_body_to_string(php_http_message_body_t *body, off_t offset, size_t forlen); PHP_HTTP_API ZEND_RESULT_CODE php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *s, off_t offset, size_t forlen); PHP_HTTP_API ZEND_RESULT_CODE php_http_message_body_to_callback(php_http_message_body_t *body, php_http_pass_callback_t cb, void *cb_arg, off_t offset, size_t forlen); PHP_HTTP_API void php_http_message_body_free(php_http_message_body_t **body); PHP_HTTP_API const php_stream_statbuf *php_http_message_body_stat(php_http_message_body_t *body); -#define php_http_message_body_size(b) (php_http_message_body_stat((b))->sb.st_size) -#define php_http_message_body_mtime(b) (php_http_message_body_stat((b))->sb.st_mtime) PHP_HTTP_API char *php_http_message_body_etag(php_http_message_body_t *body); PHP_HTTP_API const char *php_http_message_body_boundary(php_http_message_body_t *body); PHP_HTTP_API struct php_http_message *php_http_message_body_split(php_http_message_body_t *body, const char *boundary); +static inline size_t php_http_message_body_size(php_http_message_body_t *b) +{ + return php_http_message_body_stat(b)->sb.st_size; +} + +static inline time_t php_http_message_body_mtime(php_http_message_body_t *b) +{ + return php_http_message_body_stat(b)->sb.st_mtime; +} + static inline php_stream *php_http_message_body_stream(php_http_message_body_t *body) { - TSRMLS_FETCH_FROM_CTX(body->ts); - return zend_fetch_resource(NULL TSRMLS_CC, body->stream_id, "stream", NULL, 2, php_file_le_stream(), php_file_le_pstream()); + return body->res->ptr; } typedef struct php_http_message_body_object { - zend_object zo; - zend_object_value zv; php_http_message_body_t *body; + zend_object zo; } php_http_message_body_object_t; PHP_HTTP_API zend_class_entry *php_http_message_body_class_entry; PHP_MINIT_FUNCTION(http_message_body); -zend_object_value php_http_message_body_object_new(zend_class_entry *ce TSRMLS_DC); -zend_object_value php_http_message_body_object_new_ex(zend_class_entry *ce, php_http_message_body_t *body, php_http_message_body_object_t **ptr TSRMLS_DC); -zend_object_value php_http_message_body_object_clone(zval *object TSRMLS_DC); -void php_http_message_body_object_free(void *object TSRMLS_DC); +zend_object *php_http_message_body_object_new(zend_class_entry *ce); +php_http_message_body_object_t *php_http_message_body_object_new_ex(zend_class_entry *ce, php_http_message_body_t *body); +zend_object *php_http_message_body_object_clone(zval *object); +void php_http_message_body_object_free(zend_object *object); #endif diff --git a/src/php_http_message_parser.c b/src/php_http_message_parser.c index fae16f1..535a2b3 100644 --- a/src/php_http_message_parser.c +++ b/src/php_http_message_parser.c @@ -45,16 +45,14 @@ const char *php_http_message_parser_state_name(php_http_message_parser_state_t s } #endif -php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser TSRMLS_DC) +php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser) { if (!parser) { parser = emalloc(sizeof(*parser)); } memset(parser, 0, sizeof(*parser)); - TSRMLS_SET_CTX(parser->ts); - - php_http_header_parser_init(&parser->header TSRMLS_CC); + php_http_header_parser_init(&parser->header); return parser; } @@ -121,7 +119,6 @@ void php_http_message_parser_free(php_http_message_parser_t **parser) php_http_message_parser_state_t php_http_message_parser_parse_stream(php_http_message_parser_t *parser, php_http_buffer_t *buf, php_stream *s, unsigned flags, php_http_message_t **message) { php_http_message_parser_state_t state = PHP_HTTP_MESSAGE_PARSER_STATE_START; - TSRMLS_FETCH_FROM_CTX(parser->ts); if (!buf->data) { php_http_buffer_resize_ex(buf, 0x1000, 1, 0); @@ -212,7 +209,6 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p char *str = NULL; size_t len = 0; size_t cut = 0; - TSRMLS_FETCH_FROM_CTX(parser->ts); while (buffer->used || !php_http_message_parser_states[php_http_message_parser_state_is(parser)].need_data) { #if DBG_PARSER @@ -270,32 +266,38 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE: { - zval *h, *h_loc = NULL, *h_con = NULL, **h_cl = NULL, **h_cr = NULL, **h_te = NULL; + zval h, *h_ptr, *h_loc = NULL, *h_con = NULL, *h_ce; + zend_bool chunked = 0; + zend_long content_length = -1; + zend_string *content_range = NULL; /* Content-Range has higher precedence than Content-Length, * and content-length denotes the original length of the entity, * so let's *NOT* remove CR/CL, because that would fundamentally * change the meaning of the whole message */ - if ((h = php_http_message_header(*message, ZEND_STRL("Transfer-Encoding"), 1))) { - zend_hash_update(&(*message)->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &h, sizeof(zval *), (void *) &h_te); - zend_hash_del(&(*message)->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding")); + if ((h_ptr = php_http_message_header(*message, ZEND_STRL("Transfer-Encoding")))) { + zend_string *zs = zval_get_string(h_ptr); + + chunked = zend_string_equals_literal(zs, "chunked"); + zend_string_release(zs); + + Z_TRY_ADDREF_P(h_ptr); + zend_hash_str_update(&(*message)->hdrs, "X-Original-Transfer-Encoding", lenof("X-Original-Transfer-Encoding"), h_ptr); + zend_hash_str_del(&(*message)->hdrs, "Transfer-Encoding", lenof("Transfer-Encoding")); /* reset */ - MAKE_STD_ZVAL(h); - ZVAL_LONG(h, 0); - zend_hash_update(&(*message)->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &h, sizeof(zval *), NULL); - } else if ((h = php_http_message_header(*message, ZEND_STRL("Content-Length"), 1))) { - zend_hash_update(&(*message)->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), (void *) &h, sizeof(zval *), (void *) &h_cl); + ZVAL_LONG(&h, 0); + zend_hash_str_update(&(*message)->hdrs, "Content-Length", lenof("Content-Length"), &h); + } else if ((h_ptr = php_http_message_header(*message, ZEND_STRL("Content-Length")))) { + content_length = zval_get_long(h_ptr); + Z_TRY_ADDREF_P(h_ptr); + zend_hash_str_update(&(*message)->hdrs, "X-Original-Content-Length", lenof("X-Original-Content-Length"), h_ptr); } - if ((h = php_http_message_header(*message, ZEND_STRL("Content-Range"), 1))) { - zend_hash_find(&(*message)->hdrs, ZEND_STRS("Content-Range"), (void *) &h_cr); - if (h != *h_cr) { - zend_hash_update(&(*message)->hdrs, "Content-Range", sizeof("Content-Range"), &h, sizeof(zval *), (void *) &h_cr); - } else { - zval_ptr_dtor(&h); - } + if ((content_range = php_http_message_header_string(*message, ZEND_STRL("Content-Range")))) { + ZVAL_STR_COPY(&h, content_range); + zend_hash_str_update(&(*message)->hdrs, "Content-Range", lenof("Content-Range"), &h); } /* so, if curl sees a 3xx code, a Location header and a Connection:close header @@ -304,62 +306,58 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p if ((flags & PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS) && (*message)->type == PHP_HTTP_RESPONSE && (*message)->http.info.response.code/100 == 3 - && (h_loc = php_http_message_header(*message, ZEND_STRL("Location"), 1)) - && (h_con = php_http_message_header(*message, ZEND_STRL("Connection"), 1)) + && (h_loc = php_http_message_header(*message, ZEND_STRL("Location"))) + && (h_con = php_http_message_header(*message, ZEND_STRL("Connection"))) ) { - if (php_http_match(Z_STRVAL_P(h_con), "close", PHP_HTTP_MATCH_WORD)) { + zend_string *con = zval_get_string(h_con); + + if (php_http_match(con->val, "close", PHP_HTTP_MATCH_WORD)) { + zend_string_release(con); php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_DONE); - zval_ptr_dtor(&h_loc); - zval_ptr_dtor(&h_con); break; } + zend_string_release(con); } - if (h_loc) { - zval_ptr_dtor(&h_loc); - } - if (h_con) { - zval_ptr_dtor(&h_con); - } - if ((h = php_http_message_header(*message, ZEND_STRL("Content-Encoding"), 1))) { - if (php_http_match(Z_STRVAL_P(h), "gzip", PHP_HTTP_MATCH_WORD) - || php_http_match(Z_STRVAL_P(h), "x-gzip", PHP_HTTP_MATCH_WORD) - || php_http_match(Z_STRVAL_P(h), "deflate", PHP_HTTP_MATCH_WORD) + if ((h_ce = php_http_message_header(*message, ZEND_STRL("Content-Encoding")))) { + zend_string *ce = zval_get_string(h_ce); + + if (php_http_match(ce->val, "gzip", PHP_HTTP_MATCH_WORD) + || php_http_match(ce->val, "x-gzip", PHP_HTTP_MATCH_WORD) + || php_http_match(ce->val, "deflate", PHP_HTTP_MATCH_WORD) ) { if (parser->inflate) { php_http_encoding_stream_reset(&parser->inflate); } else { - parser->inflate = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_inflate_ops(), 0 TSRMLS_CC); + parser->inflate = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_inflate_ops(), 0); } - zend_hash_update(&(*message)->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), &h, sizeof(zval *), NULL); - zend_hash_del(&(*message)->hdrs, "Content-Encoding", sizeof("Content-Encoding")); - } else { - zval_ptr_dtor(&h); + Z_TRY_ADDREF_P(h_ce); + zend_hash_str_update(&(*message)->hdrs, "X-Original-Content-Encoding", lenof("X-Original-Content-Encoding"), h_ce); + zend_hash_str_del(&(*message)->hdrs, "Content-Encoding", lenof("Content-Encoding")); } + zend_string_release(ce); } if ((flags & PHP_HTTP_MESSAGE_PARSER_DUMB_BODIES)) { php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB); } else { - if (h_te) { - if (strstr(Z_STRVAL_PP(h_te), "chunked")) { - parser->dechunk = php_http_encoding_stream_init(parser->dechunk, php_http_encoding_stream_get_dechunk_ops(), 0 TSRMLS_CC); - php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED); - break; - } + if (chunked) { + parser->dechunk = php_http_encoding_stream_init(parser->dechunk, php_http_encoding_stream_get_dechunk_ops(), 0); + php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED); + break; } - if (h_cr) { + if (content_range) { ulong total = 0, start = 0, end = 0; - if (!strncasecmp(Z_STRVAL_PP(h_cr), "bytes", lenof("bytes")) - && ( Z_STRVAL_PP(h_cr)[lenof("bytes")] == ':' - || Z_STRVAL_PP(h_cr)[lenof("bytes")] == ' ' - || Z_STRVAL_PP(h_cr)[lenof("bytes")] == '=' + if (!strncasecmp(content_range->val, "bytes", lenof("bytes")) + && ( content_range->val[lenof("bytes")] == ':' + || content_range->val[lenof("bytes")] == ' ' + || content_range->val[lenof("bytes")] == '=' ) ) { char *total_at = NULL, *end_at = NULL; - char *start_at = Z_STRVAL_PP(h_cr) + sizeof("bytes"); + char *start_at = content_range->val + sizeof("bytes"); start = strtoul(start_at, &end_at, 10); if (end_at) { @@ -371,27 +369,19 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p if (end >= start && (!total || end <= total)) { parser->body_length = end + 1 - start; php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH); + zend_string_release(content_range); break; } } } - } - if (h_cl) { - char *stop; - - if (Z_TYPE_PP(h_cl) == IS_STRING) { - parser->body_length = strtoul(Z_STRVAL_PP(h_cl), &stop, 10); + zend_string_release(content_range); + } - if (stop != Z_STRVAL_PP(h_cl)) { - php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH); - break; - } - } else if (Z_TYPE_PP(h_cl) == IS_LONG) { - parser->body_length = Z_LVAL_PP(h_cl); - php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH); - break; - } + if (content_length >= 0) { + parser->body_length = content_length; + php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH); + break; } if ((*message)->type == PHP_HTTP_REQUEST) { @@ -406,7 +396,6 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p case PHP_HTTP_MESSAGE_PARSER_STATE_BODY: { if (len) { - /* FIXME: what if we re-use the parser? */ if (parser->inflate) { char *dec_str = NULL; size_t dec_len; @@ -423,7 +412,6 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p } php_stream_write(php_http_message_body_stream((*message)->body), str, len); - } if (cut) { @@ -518,10 +506,10 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p case PHP_HTTP_MESSAGE_PARSER_STATE_UPDATE_CL: { - zval *zcl; - MAKE_STD_ZVAL(zcl); - ZVAL_LONG(zcl, php_http_message_body_size((*message)->body)); - zend_hash_update(&(*message)->hdrs, "Content-Length", sizeof("Content-Length"), &zcl, sizeof(zval *), NULL); + zval zcl; + + ZVAL_LONG(&zcl, php_http_message_body_size((*message)->body)); + zend_hash_str_update(&(*message)->hdrs, "Content-Length", lenof("Content-Length"), &zcl); break; } @@ -549,55 +537,46 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p zend_class_entry *php_http_message_parser_class_entry; static zend_object_handlers php_http_message_parser_object_handlers; -zend_object_value php_http_message_parser_object_new(zend_class_entry *ce TSRMLS_DC) +zend_object *php_http_message_parser_object_new(zend_class_entry *ce) { - return php_http_message_parser_object_new_ex(ce, NULL, NULL TSRMLS_CC); + return &php_http_message_parser_object_new_ex(ce, NULL)->zo; } -zend_object_value php_http_message_parser_object_new_ex(zend_class_entry *ce, php_http_message_parser_t *parser, php_http_message_parser_object_t **ptr TSRMLS_DC) +php_http_message_parser_object_t *php_http_message_parser_object_new_ex(zend_class_entry *ce, php_http_message_parser_t *parser) { php_http_message_parser_object_t *o; - o = ecalloc(1, sizeof(php_http_message_parser_object_t)); - zend_object_std_init((zend_object *) o, ce TSRMLS_CC); - object_properties_init((zend_object *) o, ce); - - if (ptr) { - *ptr = o; - } + o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); + zend_object_std_init(&o->zo, ce); + object_properties_init(&o->zo, ce); if (parser) { o->parser = parser; } else { - o->parser = php_http_message_parser_init(NULL TSRMLS_CC); + o->parser = php_http_message_parser_init(NULL); } - o->buffer = php_http_buffer_new(); + php_http_buffer_init(&o->buffer); + o->zo.handlers = &php_http_message_parser_object_handlers; - o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_parser_object_free, NULL TSRMLS_CC); - o->zv.handlers = &php_http_message_parser_object_handlers; - - return o->zv; + return o; } -void php_http_message_parser_object_free(void *object TSRMLS_DC) +void php_http_message_parser_object_free(zend_object *object) { - php_http_message_parser_object_t *o = (php_http_message_parser_object_t *) object; + php_http_message_parser_object_t *o = PHP_HTTP_OBJ(object, NULL); if (o->parser) { php_http_message_parser_free(&o->parser); } - if (o->buffer) { - php_http_buffer_free(&o->buffer); - } - zend_object_std_dtor((zend_object *) o TSRMLS_CC); - efree(o); + php_http_buffer_dtor(&o->buffer); + zend_object_std_dtor(object); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageParser_getState, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(HttpMessageParser, getState) { - php_http_message_parser_object_t *parser_obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_message_parser_object_t *parser_obj = PHP_HTTP_OBJ(NULL, getThis()); zend_parse_parameters_none(); /* always return the real state */ @@ -614,18 +593,22 @@ static PHP_METHOD(HttpMessageParser, parse) php_http_message_parser_object_t *parser_obj; zval *zmsg; char *data_str; - int data_len; - long flags; + size_t data_len; + zend_long flags; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "slz", &data_str, &data_len, &flags, &zmsg), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "slz", &data_str, &data_len, &flags, &zmsg), invalid_arg, return); - parser_obj = zend_object_store_get_object(getThis() TSRMLS_CC); - php_http_buffer_append(parser_obj->buffer, data_str, data_len); - RETVAL_LONG(php_http_message_parser_parse(parser_obj->parser, parser_obj->buffer, flags, &parser_obj->parser->message)); + parser_obj = PHP_HTTP_OBJ(NULL, getThis()); + php_http_buffer_append(&parser_obj->buffer, data_str, data_len); + RETVAL_LONG(php_http_message_parser_parse(parser_obj->parser, &parser_obj->buffer, flags, &parser_obj->parser->message)); + ZVAL_DEREF(zmsg); zval_dtor(zmsg); + ZVAL_NULL(zmsg); if (parser_obj->parser->message) { - ZVAL_OBJVAL(zmsg, php_http_message_object_new_ex(php_http_message_class_entry, php_http_message_copy(parser_obj->parser->message, NULL), NULL TSRMLS_CC), 0); + php_http_message_t *msg_cpy = php_http_message_copy(parser_obj->parser->message, NULL); + php_http_message_object_t *msg_obj = php_http_message_object_new_ex(php_http_message_class_entry, msg_cpy); + ZVAL_OBJ(zmsg, &msg_obj->zo); } } @@ -640,20 +623,24 @@ static PHP_METHOD(HttpMessageParser, stream) zend_error_handling zeh; zval *zmsg, *zstream; php_stream *s; - long flags; + zend_long flags; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &zstream, &flags, &zmsg), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "rlz", &zstream, &flags, &zmsg), invalid_arg, return); - zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh TSRMLS_CC); - php_stream_from_zval(s, &zstream); - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh); + php_stream_from_zval(s, zstream); + zend_restore_error_handling(&zeh); - parser_obj = zend_object_store_get_object(getThis() TSRMLS_CC); - RETVAL_LONG(php_http_message_parser_parse_stream(parser_obj->parser, parser_obj->buffer, s, flags, &parser_obj->parser->message)); + parser_obj = PHP_HTTP_OBJ(NULL, getThis()); + RETVAL_LONG(php_http_message_parser_parse_stream(parser_obj->parser, &parser_obj->buffer, s, flags, &parser_obj->parser->message)); + ZVAL_DEREF(zmsg); zval_dtor(zmsg); + ZVAL_NULL(zmsg); if (parser_obj->parser->message) { - ZVAL_OBJVAL(zmsg, php_http_message_object_new_ex(php_http_message_class_entry, php_http_message_copy(parser_obj->parser->message, NULL), NULL TSRMLS_CC), 0); + php_http_message_t *msg_cpy = php_http_message_copy(parser_obj->parser->message, NULL); + php_http_message_object_t *msg_obj = php_http_message_object_new_ex(php_http_message_class_entry, msg_cpy); + ZVAL_OBJ(zmsg, &msg_obj->zo); } } @@ -669,27 +656,29 @@ PHP_MINIT_FUNCTION(http_message_parser) zend_class_entry ce; INIT_NS_CLASS_ENTRY(ce, "http\\Message", "Parser", php_http_message_parser_methods); - php_http_message_parser_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_http_message_parser_class_entry = zend_register_internal_class(&ce); memcpy(&php_http_message_parser_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_message_parser_class_entry->create_object = php_http_message_parser_object_new; php_http_message_parser_object_handlers.clone_obj = NULL; - - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("CLEANUP"), PHP_HTTP_MESSAGE_PARSER_CLEANUP TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("DUMB_BODIES"), PHP_HTTP_MESSAGE_PARSER_DUMB_BODIES TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("EMPTY_REDIRECTS"), PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("GREEDY"), PHP_HTTP_MESSAGE_PARSER_GREEDY TSRMLS_CC); - - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_FAILURE"), PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_START"), PHP_HTTP_MESSAGE_PARSER_STATE_START TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_HEADER"), PHP_HTTP_MESSAGE_PARSER_STATE_HEADER TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_HEADER_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_DUMB"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_LENGTH"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_CHUNKED"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_UPDATE_CL"), PHP_HTTP_MESSAGE_PARSER_STATE_UPDATE_CL TSRMLS_CC); - zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_DONE TSRMLS_CC); + php_http_message_parser_object_handlers.free_obj = php_http_message_parser_object_free; + php_http_message_parser_object_handlers.offset = XtOffsetOf(php_http_message_parser_object_t, zo); + + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("CLEANUP"), PHP_HTTP_MESSAGE_PARSER_CLEANUP); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("DUMB_BODIES"), PHP_HTTP_MESSAGE_PARSER_DUMB_BODIES); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("EMPTY_REDIRECTS"), PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("GREEDY"), PHP_HTTP_MESSAGE_PARSER_GREEDY); + + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_FAILURE"), PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_START"), PHP_HTTP_MESSAGE_PARSER_STATE_START); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_HEADER"), PHP_HTTP_MESSAGE_PARSER_STATE_HEADER); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_HEADER_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_DUMB"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_LENGTH"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_CHUNKED"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_UPDATE_CL"), PHP_HTTP_MESSAGE_PARSER_STATE_UPDATE_CL); + zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_DONE); return SUCCESS; } diff --git a/src/php_http_message_parser.h b/src/php_http_message_parser.h index 0bac9da..fa63858 100644 --- a/src/php_http_message_parser.h +++ b/src/php_http_message_parser.h @@ -43,12 +43,9 @@ typedef struct php_http_message_parser { php_http_message_t *message; php_http_encoding_stream_t *dechunk; php_http_encoding_stream_t *inflate; -#ifdef ZTS - void ***ts; -#endif } php_http_message_parser_t; -PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser TSRMLS_DC); +PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser); PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_push(php_http_message_parser_t *parser, unsigned argc, ...); PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_is(php_http_message_parser_t *parser); PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_pop(php_http_message_parser_t *parser); @@ -58,19 +55,18 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse_stream(php_http_message_parser_t *parser, php_http_buffer_t *buffer, php_stream *s, unsigned flags, php_http_message_t **message); typedef struct php_http_message_parser_object { - zend_object zo; - zend_object_value zv; - php_http_buffer_t *buffer; + php_http_buffer_t buffer; php_http_message_parser_t *parser; + zend_object zo; } php_http_message_parser_object_t; PHP_HTTP_API zend_class_entry *php_http_message_parser_class_entry; PHP_MINIT_FUNCTION(http_message_parser); -zend_object_value php_http_message_parser_object_new(zend_class_entry *ce TSRMLS_DC); -zend_object_value php_http_message_parser_object_new_ex(zend_class_entry *ce, php_http_message_parser_t *parser, php_http_message_parser_object_t **ptr TSRMLS_DC); -void php_http_message_parser_object_free(void *object TSRMLS_DC); +zend_object *php_http_message_parser_object_new(zend_class_entry *ce); +php_http_message_parser_object_t *php_http_message_parser_object_new_ex(zend_class_entry *ce, php_http_message_parser_t *parser); +void php_http_message_parser_object_free(zend_object *object); #endif diff --git a/src/php_http_misc.c b/src/php_http_misc.c index 8e2227d..4adab81 100644 --- a/src/php_http_misc.c +++ b/src/php_http_misc.c @@ -113,9 +113,9 @@ char *php_http_pretty_key(register char *key, size_t key_len, zend_bool uctitle, } -size_t php_http_boundary(char *buf, size_t buf_len TSRMLS_DC) +size_t php_http_boundary(char *buf, size_t buf_len) { - return snprintf(buf, buf_len, "%15.15F", sapi_get_request_time(TSRMLS_C) * php_combined_lcg(TSRMLS_C)); + return snprintf(buf, buf_len, "%15.15F", sapi_get_request_time() * php_combined_lcg()); } int php_http_select_str(const char *cmp, int argc, ...) @@ -144,73 +144,65 @@ int php_http_select_str(const char *cmp, int argc, ...) /* ARRAYS */ -unsigned php_http_array_list(HashTable *ht TSRMLS_DC, unsigned argc, ...) +unsigned php_http_array_list(HashTable *ht, unsigned argc, ...) { - HashPosition pos; unsigned argl = 0; va_list argv; + zval *data; va_start(argv, argc); - for ( zend_hash_internal_pointer_reset_ex(ht, &pos); - SUCCESS == zend_hash_has_more_elements_ex(ht, &pos) && (argl < argc); - zend_hash_move_forward_ex(ht, &pos)) - { - zval **data, ***argp = (zval ***) va_arg(argv, zval ***); - - if (SUCCESS == zend_hash_get_current_data_ex(ht, (void *) &data, &pos)) { - *argp = data; - ++argl; - } - } + ZEND_HASH_FOREACH_VAL(ht, data) { + zval **argp = (zval **) va_arg(argv, zval **); + *argp = data; + ++argl; + } ZEND_HASH_FOREACH_END(); va_end(argv); return argl; } -void php_http_array_copy_strings(void *zpp) +void php_http_array_copy_strings(zval *zp) { - zval **zvpp = ((zval **) zpp); - - *zvpp = php_http_zsep(1, IS_STRING, *zvpp); + Z_TRY_ADDREF_P(zp); + convert_to_string_ex(zp); } -int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) +int php_http_array_apply_append_func(zval *value, int num_args, va_list args, zend_hash_key *hash_key) { int flags; char *key = NULL; HashTable *dst; - zval **data = NULL, *value = *((zval **) pDest); + zval *data = NULL; dst = va_arg(args, HashTable *); flags = va_arg(args, int); - if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->nKeyLength) { - if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) { - key = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1); - zend_hash_find(dst, key, hash_key->nKeyLength, (void *) &data); - } else if (hash_key->nKeyLength) { - zend_hash_quick_find(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &data); + if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->key) { + if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->key) { + key = php_http_pretty_key(estrndup(hash_key->key->val, hash_key->key->len), hash_key->key->len, 1, 1); + data = zend_hash_str_find(dst, key, hash_key->key->len); + } else if (hash_key->key) { + data = zend_hash_find(dst, hash_key->key); } else { - zend_hash_index_find(dst, hash_key->h, (void *) &data); + data = zend_hash_index_find(dst, hash_key->h); } if (flags & ARRAY_JOIN_STRINGIFY) { - value = php_http_zsep(1, IS_STRING, value); - } else { - Z_ADDREF_P(value); + convert_to_string_ex(value); } + Z_ADDREF_P(value); if (data) { - if (Z_TYPE_PP(data) != IS_ARRAY) { - convert_to_array(*data); + if (Z_TYPE_P(data) != IS_ARRAY) { + convert_to_array(data); } - add_next_index_zval(*data, value); + add_next_index_zval(data, value); } else if (key) { - zend_symtable_update(dst, key, hash_key->nKeyLength, &value, sizeof(zval *), NULL); - } else if (hash_key->nKeyLength) { - zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &value, sizeof(zval *), NULL); + zend_hash_str_update(dst, key, hash_key->key->len, value); + } else if (hash_key->key) { + zend_hash_update(dst, hash_key->key, value); } else { - zend_hash_index_update(dst, hash_key->h, (void *) &value, sizeof(zval *), NULL); + zend_hash_index_update(dst, hash_key->h, value); } if (key) { @@ -221,31 +213,30 @@ int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_lis return ZEND_HASH_APPLY_KEEP; } -int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) +int php_http_array_apply_merge_func(zval *value, int num_args, va_list args, zend_hash_key *hash_key) { int flags; char *key = NULL; HashTable *dst; - zval *value = *((zval **) pDest); dst = va_arg(args, HashTable *); flags = va_arg(args, int); - if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->nKeyLength) { + if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->key) { if (flags & ARRAY_JOIN_STRINGIFY) { - value = php_http_zsep(1, IS_STRING, value); - } else { - Z_ADDREF_P(value); + convert_to_string_ex(value); } - if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) { - key = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1); - zend_hash_update(dst, key, hash_key->nKeyLength, (void *) &value, sizeof(zval *), NULL); + Z_TRY_ADDREF_P(value); + + if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->key) { + key = php_http_pretty_key(estrndup(hash_key->key->val, hash_key->key->len), hash_key->key->len, 1, 1); + zend_hash_str_update(dst, key, hash_key->key->len, value); efree(key); - } else if (hash_key->nKeyLength) { - zend_hash_quick_update(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &value, sizeof(zval *), NULL); + } else if (hash_key->key) { + zend_hash_update(dst, hash_key->key, value); } else { - zend_hash_index_update(dst, hash_key->h, (void *) &value, sizeof(zval *), NULL); + zend_hash_index_update(dst, hash_key->h, value); } } @@ -257,13 +248,11 @@ int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list size_t php_http_pass_fcall_callback(void *cb_arg, const char *str, size_t len) { php_http_pass_fcall_arg_t *fcd = cb_arg; - zval *zdata; - TSRMLS_FETCH_FROM_CTX(fcd->ts); + zval zdata; - MAKE_STD_ZVAL(zdata); - ZVAL_STRINGL(zdata, str, len, 1); - if (SUCCESS == zend_fcall_info_argn(&fcd->fci TSRMLS_CC, 2, &fcd->fcz, &zdata)) { - zend_fcall_info_call(&fcd->fci, &fcd->fcc, NULL, NULL TSRMLS_CC); + ZVAL_STRINGL(&zdata, str, len); + if (SUCCESS == zend_fcall_info_argn(&fcd->fci, 2, &fcd->fcz, &zdata)) { + zend_fcall_info_call(&fcd->fci, &fcd->fcc, NULL, NULL); zend_fcall_info_args_clear(&fcd->fci, 0); } zval_ptr_dtor(&zdata); diff --git a/src/php_http_misc.h b/src/php_http_misc.h index a4f579d..e8d900b 100644 --- a/src/php_http_misc.h +++ b/src/php_http_misc.h @@ -64,7 +64,7 @@ PHP_HTTP_API void php_http_sleep(double s); int php_http_match(const char *haystack, const char *needle, int flags); char *php_http_pretty_key(register char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen); -size_t php_http_boundary(char *buf, size_t len TSRMLS_DC); +size_t php_http_boundary(char *buf, size_t len); int php_http_select_str(const char *cmp, int argc, ...); /* See "A Reusable Duff Device" By Ralf Holly, August 01, 2005 */ @@ -139,135 +139,65 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i /* ZEND */ -#if PHP_VERSION_ID < 50400 -# define object_properties_init(o, ce) zend_hash_copy(((zend_object *) o)->properties, &(ce->default_properties), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval*)) -# define PHP_HTTP_ZEND_LITERAL_DC -# define PHP_HTTP_ZEND_LITERAL_CC -# define PHP_HTTP_ZEND_LITERAL_CCN -# define ZVAL_COPY_VALUE(zv, arr) do { \ - (zv)->value = (arr)->value; \ - Z_TYPE_P(zv) = Z_TYPE_P(arr); \ - } while (0) -#else -# define PHP_HTTP_ZEND_LITERAL_DC , const zend_literal *literal_key -# define PHP_HTTP_ZEND_LITERAL_CC , (literal_key) -# define PHP_HTTP_ZEND_LITERAL_CCN , NULL +#ifdef PHP_DEBUG +# undef HASH_OF +# define HASH_OF(p) ((HashTable*)(Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties((p)) : NULL)))) #endif -#if PHP_VERSION_ID < 50500 -#undef SUCCESS -#undef FAILURE -typedef enum { - SUCCESS = 0, - FAILURE = -1 -} ZEND_RESULT_CODE; -#endif - -#if PHP_VERSION_ID < 50700 -# define z_is_true zend_is_true -#else -# define z_is_true(z) zend_is_true(z TSRMLS_CC) -#endif - -#define INIT_PZVAL_ARRAY(zv, ht) \ - { \ - INIT_PZVAL((zv)); \ - Z_TYPE_P(zv) = IS_ARRAY; \ - Z_ARRVAL_P(zv) = (ht); \ - } - -static inline zval *php_http_zconv(int type, zval *z) +static inline void *PHP_HTTP_OBJ(zend_object *zo, zval *zv) { - switch (type) { - case IS_NULL: convert_to_null_ex(&z); break; - case IS_BOOL: convert_to_boolean_ex(&z); break; - case IS_LONG: convert_to_long_ex(&z); break; - case IS_DOUBLE: convert_to_double_ex(&z); break; - case IS_STRING: convert_to_string_ex(&z); break; - case IS_ARRAY: convert_to_array_ex(&z); break; - case IS_OBJECT: convert_to_object_ex(&z); break; + if (!zo) { + zo = Z_OBJ_P(zv); } - return z; + return (char *) zo - zo->handlers->offset; } -static inline zval *php_http_ztyp(int type, zval *z) +static inline zend_string *php_http_cs2zs(char *s, size_t l) { - SEPARATE_ARG_IF_REF(z); - return (Z_TYPE_P(z) == type) ? z : php_http_zconv(type, z); -} + zend_string *str = erealloc(s, sizeof(*str) + l); -static inline zval *php_http_zsep(zend_bool add_ref, int type, zval *z) -{ - if (add_ref) { - Z_ADDREF_P(z); - } - if (Z_TYPE_P(z) != type) { - return php_http_zconv(type, z); - } else { - SEPARATE_ZVAL_IF_NOT_REF(&z); - return z; - } + memmove(str->val, str, l); + str->val[l] = 0; + str->len = l; + str->h = 0; + + GC_REFCOUNT(str) = 1; + GC_TYPE_INFO(str) = IS_STRING; + + return str; } -static inline ZEND_RESULT_CODE php_http_ini_entry(const char *name_str, size_t name_len, const char **value_str, size_t *value_len, zend_bool orig TSRMLS_DC) +static inline ZEND_RESULT_CODE php_http_ini_entry(const char *name_str, size_t name_len, const char **val_str, size_t *val_len, zend_bool orig) { zend_ini_entry *ini_entry; - if (SUCCESS == zend_hash_find(EG(ini_directives), name_str, name_len + 1, (void *) &ini_entry)) { + if ((ini_entry = zend_hash_str_find_ptr(EG(ini_directives), name_str, name_len))) { if (orig && ini_entry->modified) { - *value_str = ini_entry->orig_value; - *value_len = (size_t) ini_entry->orig_value_length; + *val_str = ini_entry->orig_value->val; + *val_len = ini_entry->orig_value->len; } else { - *value_str = ini_entry->value; - *value_len = (size_t) ini_entry->value_length; + *val_str = ini_entry->value->val; + *val_len = ini_entry->value->len; } return SUCCESS; } return FAILURE; } +#define Z_ISUSER(zv) (Z_TYPE(zv) <= 10) +#define Z_ISUSER_P(zvp) Z_ISUSER(*(zvp)) + /* return object(values) */ +#define ZVAL_OBJECT(z, o, addref) \ + ZVAL_OBJ(z, o); \ + if (addref) { \ + Z_ADDREF_P(z); \ + } #define RETVAL_OBJECT(o, addref) \ - RETVAL_OBJVAL((o)->value.obj, addref) + ZVAL_OBJECT(return_value, o, addref) #define RETURN_OBJECT(o, addref) \ RETVAL_OBJECT(o, addref); \ return -#define RETVAL_OBJVAL(ov, addref) \ - ZVAL_OBJVAL(return_value, ov, addref) -#define RETURN_OBJVAL(ov, addref) \ - RETVAL_OBJVAL(ov, addref); \ - return -#define ZVAL_OBJVAL(zv, ov, addref) \ - (zv)->type = IS_OBJECT; \ - (zv)->value.obj = (ov);\ - if (addref && Z_OBJ_HT_P(zv)->add_ref) { \ - Z_OBJ_HT_P(zv)->add_ref((zv) TSRMLS_CC); \ - } - -#define Z_OBJ_DELREF(z) \ - if (Z_OBJ_HT(z)->del_ref) { \ - Z_OBJ_HT(z)->del_ref(&(z) TSRMLS_CC); \ - } -#define Z_OBJ_ADDREF(z) \ - if (Z_OBJ_HT(z)->add_ref) { \ - Z_OBJ_HT(z)->add_ref(&(z) TSRMLS_CC); \ - } -#define Z_OBJ_DELREF_P(z) \ - if (Z_OBJ_HT_P(z)->del_ref) { \ - Z_OBJ_HT_P(z)->del_ref((z) TSRMLS_CC); \ - } -#define Z_OBJ_ADDREF_P(z) \ - if (Z_OBJ_HT_P(z)->add_ref) { \ - Z_OBJ_HT_P(z)->add_ref((z) TSRMLS_CC); \ - } -#define Z_OBJ_DELREF_PP(z) \ - if (Z_OBJ_HT_PP(z)->del_ref) { \ - Z_OBJ_HT_PP(z)->del_ref(*(z) TSRMLS_CC); \ - } -#define Z_OBJ_ADDREF_PP(z) \ - if (Z_OBJ_HT_PP(z)->add_ref) { \ - Z_OBJ_HT_PP(z)->add_ref(*(z) TSRMLS_CC); \ - } #define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL, 0, 0} @@ -278,64 +208,53 @@ static inline ZEND_RESULT_CODE php_http_ini_entry(const char *name_str, size_t n /* ARRAYS */ -#ifndef HASH_KEY_NON_EXISTENT -# define HASH_KEY_NON_EXISTENT HASH_KEY_NON_EXISTANT -#endif - -PHP_HTTP_API unsigned php_http_array_list(HashTable *ht TSRMLS_DC, unsigned argc, ...); +PHP_HTTP_API unsigned php_http_array_list(HashTable *ht, unsigned argc, ...); -typedef struct php_http_array_hashkey { - char *str; - uint len; - ulong num; - uint dup:1; - uint type:31; -} php_http_array_hashkey_t; -#define php_http_array_hashkey_init(dup) {NULL, 0, 0, (dup), 0} +typedef struct php_http_arrkey { + zend_ulong h; + zend_string *key; + unsigned allocated:1; + unsigned stringified:1; +} php_http_arrkey_t; -static inline void php_http_array_hashkey_stringify(php_http_array_hashkey_t *key) +static inline void *php_http_arrkey_stringify(php_http_arrkey_t *arrkey, zend_hash_key *key) { - if (key->type != HASH_KEY_IS_STRING) { - key->len = spprintf(&key->str, 0, "%lu", key->num) + 1; + if (arrkey) { + arrkey->allocated = 0; + } else { + arrkey = emalloc(sizeof(*arrkey)); + arrkey->allocated = 1; + } + + if (key) { + memcpy(arrkey, key, sizeof(*key)); + } + if ((arrkey->stringified = !arrkey->key)) { + arrkey->key = zend_long_to_str(arrkey->h); } + return arrkey; } -static inline void php_http_array_hashkey_stringfree(php_http_array_hashkey_t *key) +static inline void php_http_arrkey_dtor(php_http_arrkey_t *arrkey) { - if (key->type != HASH_KEY_IS_STRING || key->dup) { - PTR_FREE(key->str); + if (arrkey->stringified) { + zend_string_release(arrkey->key); + } + if (arrkey->allocated) { + efree(arrkey); } } -#define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, HASH_OF(array), val) -#define FOREACH_HASH_VAL(pos, hash, val) \ - for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \ - zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \ - zend_hash_move_forward_ex(hash, &pos)) - -#define FOREACH_KEY(pos, array, key) FOREACH_HASH_KEY(pos, HASH_OF(array), key) -#define FOREACH_HASH_KEY(pos, hash, _key) \ - for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \ - ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (zend_bool) (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT; \ - zend_hash_move_forward_ex(hash, &pos)) \ - -#define FOREACH_KEYVAL(pos, array, key, val) FOREACH_HASH_KEYVAL(pos, HASH_OF(array), key, val) -#define FOREACH_HASH_KEYVAL(pos, hash, _key, val) \ - for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \ - ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (zend_bool) (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT && \ - zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \ - zend_hash_move_forward_ex(hash, &pos)) - -#define array_copy(src, dst) zend_hash_copy(dst, src, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)) -#define array_copy_strings(src, dst) zend_hash_copy(dst, src, php_http_array_copy_strings, NULL, sizeof(zval *)) +#define array_copy(src, dst) zend_hash_copy(dst, src, (copy_ctor_func_t) zval_add_ref) +#define array_copy_strings(src, dst) zend_hash_copy(dst, src, php_http_array_copy_strings) #define ARRAY_JOIN_STRONLY 0x01 #define ARRAY_JOIN_PRETTIFY 0x02 #define ARRAY_JOIN_STRINGIFY 0x04 -#define array_join(src, dst, append, flags) zend_hash_apply_with_arguments(src TSRMLS_CC, (append)?php_http_array_apply_append_func:php_http_array_apply_merge_func, 2, dst, (int)flags) +#define array_join(src, dst, append, flags) zend_hash_apply_with_arguments(src, (append)?php_http_array_apply_append_func:php_http_array_apply_merge_func, 2, dst, (int)flags) -void php_http_array_copy_strings(void *zpp); -int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key); -int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key); +void php_http_array_copy_strings(zval *zp); +int php_http_array_apply_append_func(zval *pDest, int num_args, va_list args, zend_hash_key *hash_key); +int php_http_array_apply_merge_func(zval *pDest, int num_args, va_list args, zend_hash_key *hash_key); /* PASS CALLBACK */ @@ -344,12 +263,9 @@ typedef size_t (*php_http_pass_php_http_buffer_callback_t)(void *cb_arg, php_htt typedef size_t (*php_http_pass_format_callback_t)(void *cb_arg, const char *fmt, ...); typedef struct php_http_pass_fcall_arg { - zval *fcz; + zval fcz; zend_fcall_info fci; zend_fcall_info_cache fcc; -#ifdef ZTS - void ***ts; -#endif } php_http_pass_fcall_arg_t; PHP_HTTP_API size_t php_http_pass_fcall_callback(void *cb_arg, const char *str, size_t len); diff --git a/src/php_http_negotiate.c b/src/php_http_negotiate.c index a74875b..9fdad26 100644 --- a/src/php_http_negotiate.c +++ b/src/php_http_negotiate.c @@ -12,27 +12,22 @@ #include "php_http_api.h" -static int php_http_negotiate_sort(const void *a, const void *b TSRMLS_DC) +static int php_http_negotiate_sort(const void *first, const void *second) { - zval result, *first, *second; + Bucket *b1 = (Bucket *) first, *b2 = (Bucket *) second; + int result = numeric_compare_function(&b1->val, &b2->val); - first = *((zval **) (*((Bucket **) a))->pData); - second= *((zval **) (*((Bucket **) b))->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)); + return (result > 0 ? -1 : (result < 0 ? 1 : 0)); } #define M_PRI 5 #define M_SEC 2 #define M_ANY 1 #define M_NOT 0 -#define M_ALL -1 +#define M_ALL ~0 static inline unsigned php_http_negotiate_match(const char *param_str, size_t param_len, const char *supported_str, size_t supported_len, const char *sep_str, size_t sep_len) { - int match = M_NOT; + unsigned match = M_NOT; if (param_len == supported_len && !strncasecmp(param_str, supported_str, param_len)) { /* that was easy */ @@ -67,95 +62,98 @@ static inline unsigned php_http_negotiate_match(const char *param_str, size_t pa #endif return match; } - -static int php_http_negotiate_reduce(void *p TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) +static int php_http_negotiate_reduce(zval *p, int num_args, va_list args, zend_hash_key *hash_key) { unsigned best_match = 0; - HashPosition pos; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - zval **q = NULL, **val, *supported = php_http_ztyp(IS_STRING, *(zval **)p); + php_http_arrkey_t key; + zval *value, *q = NULL; + zend_string *supported = zval_get_string(p); HashTable *params = va_arg(args, HashTable *); HashTable *result = va_arg(args, HashTable *); const char *sep_str = va_arg(args, const char *); size_t sep_len = va_arg(args, size_t); - FOREACH_HASH_KEYVAL(pos, params, key, val) { - if (key.type == HASH_KEY_IS_STRING) { - unsigned match = php_http_negotiate_match(key.str, key.len-1, Z_STRVAL_P(supported), Z_STRLEN_P(supported), sep_str, sep_len); + ZEND_HASH_FOREACH_KEY_VAL(params, key.h, key.key, value) + { + unsigned match; - if (match > best_match) { - best_match = match; - q = val; - } + php_http_arrkey_stringify(&key, NULL); + match = php_http_negotiate_match(key.key->val, key.key->len, supported->val, supported->len, sep_str, sep_len); + + if (match > best_match) { + best_match = match; + q = value; } + php_http_arrkey_dtor(&key); } + ZEND_HASH_FOREACH_END(); - if (q && Z_DVAL_PP(q) > 0) { - Z_ADDREF_PP(q); - zend_hash_update(result, Z_STRVAL_P(supported), Z_STRLEN_P(supported) + 1, (void *) q, sizeof(zval *), NULL); + if (q && Z_DVAL_P(q) > 0) { + Z_TRY_ADDREF_P(q); + zend_hash_update(result, supported, q); } - zval_ptr_dtor(&supported); + zend_string_release(supported); return ZEND_HASH_APPLY_KEEP; } -HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable *supported, const char *primary_sep_str, size_t primary_sep_len TSRMLS_DC) +HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable *supported, const char *primary_sep_str, size_t primary_sep_len) { HashTable *result = NULL; if (value_str && value_len) { unsigned i = 0; - zval arr, **val, **arg, **zq; - HashPosition pos; + zval arr, *val, *arg, *zq; HashTable params; - php_http_array_hashkey_t key = php_http_array_hashkey_init(1); + php_http_arrkey_t key; php_http_params_opts_t opts; zend_hash_init(¶ms, 10, NULL, ZVAL_PTR_DTOR, 0); php_http_params_opts_default_get(&opts); opts.input.str = estrndup(value_str, value_len); opts.input.len = value_len; - php_http_params_parse(¶ms, &opts TSRMLS_CC); + php_http_params_parse(¶ms, &opts); efree(opts.input.str); - INIT_PZVAL(&arr); array_init(&arr); - FOREACH_HASH_KEYVAL(pos, ¶ms, key, val) { + ZEND_HASH_FOREACH_KEY_VAL(¶ms, key.h, key.key, val) + { double q; - if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(val), ZEND_STRS("arguments"), (void *) &arg) - && IS_ARRAY == Z_TYPE_PP(arg) - && SUCCESS == zend_hash_find(Z_ARRVAL_PP(arg), ZEND_STRS("q"), (void *) &zq)) { - zval *tmp = php_http_ztyp(IS_DOUBLE, *zq); - - q = Z_DVAL_P(tmp); - zval_ptr_dtor(&tmp); + if ((arg = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("arguments"))) + && (IS_ARRAY == Z_TYPE_P(arg)) + && (zq = zend_hash_str_find(Z_ARRVAL_P(arg), ZEND_STRL("q")))) { + q = zval_get_double(zq); } else { q = 1.0 - ++i / 100.0; } - if (key.type == HASH_KEY_IS_STRING) { - add_assoc_double_ex(&arr, key.str, key.len, q); +#if 0 + fprintf(stderr, "Q: %s=%1.3f\n", key.key->val, q); +#endif + + if (key.key) { + add_assoc_double_ex(&arr, key.key->val, key.key->len, q); } else { - add_index_double(&arr, key.num, q); + add_index_double(&arr, key.h, q); } - PTR_FREE(key.str); } + ZEND_HASH_FOREACH_END(); #if 0 - zend_print_zval_r(&arr, 1 TSRMLS_CC); + zend_print_zval_r(&arr, 1); #endif ALLOC_HASHTABLE(result); zend_hash_init(result, zend_hash_num_elements(supported), NULL, ZVAL_PTR_DTOR, 0); - zend_hash_apply_with_arguments(supported TSRMLS_CC, php_http_negotiate_reduce, 4, Z_ARRVAL(arr), result, primary_sep_str, primary_sep_len); + zend_hash_apply_with_arguments(supported, php_http_negotiate_reduce, 4, Z_ARRVAL(arr), result, primary_sep_str, primary_sep_len); zend_hash_destroy(¶ms); zval_dtor(&arr); - zend_hash_sort(result, zend_qsort, php_http_negotiate_sort, 0 TSRMLS_CC); + zend_hash_sort(result, php_http_negotiate_sort, 0); } - + return result; } diff --git a/src/php_http_negotiate.h b/src/php_http_negotiate.h index f7405b5..44f1735 100644 --- a/src/php_http_negotiate.h +++ b/src/php_http_negotiate.h @@ -13,58 +13,58 @@ #ifndef PHP_HTTP_NEGOTIATE_H #define PHP_HTTP_NEGOTIATE_H -PHP_HTTP_API HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable *supported, const char *primary_sep_str, size_t primary_sep_len TSRMLS_DC); +PHP_HTTP_API HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable *supported, const char *primary_sep_str, size_t primary_sep_len); -static inline HashTable *php_http_negotiate_language(HashTable *supported, php_http_message_t *request TSRMLS_DC) +static inline HashTable *php_http_negotiate_language(HashTable *supported, php_http_message_t *request) { HashTable *result = NULL; size_t length; - char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Language"), &length, request TSRMLS_CC); + char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Language"), &length, request); if (value) { - result = php_http_negotiate(value, length, supported, "-", 1 TSRMLS_CC); + result = php_http_negotiate(value, length, supported, "-", 1); } PTR_FREE(value); return result; } -static inline HashTable *php_http_negotiate_encoding(HashTable *supported, php_http_message_t *request TSRMLS_DC) +static inline HashTable *php_http_negotiate_encoding(HashTable *supported, php_http_message_t *request) { HashTable *result = NULL; size_t length; - char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Encoding"), &length, request TSRMLS_CC); + char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Encoding"), &length, request); if (value) { - result = php_http_negotiate(value, length, supported, NULL, 0 TSRMLS_CC); + result = php_http_negotiate(value, length, supported, NULL, 0); } PTR_FREE(value); return result; } -static inline HashTable *php_http_negotiate_charset(HashTable *supported, php_http_message_t *request TSRMLS_DC) +static inline HashTable *php_http_negotiate_charset(HashTable *supported, php_http_message_t *request) { HashTable *result = NULL; size_t length; - char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Charset"), &length, request TSRMLS_CC); + char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Charset"), &length, request); if (value) { - result = php_http_negotiate(value, length, supported, NULL, 0 TSRMLS_CC); + result = php_http_negotiate(value, length, supported, NULL, 0); } PTR_FREE(value); return result; } -static inline HashTable *php_http_negotiate_content_type(HashTable *supported, php_http_message_t *request TSRMLS_DC) +static inline HashTable *php_http_negotiate_content_type(HashTable *supported, php_http_message_t *request) { HashTable *result = NULL; size_t length; - char *value = php_http_env_get_request_header(ZEND_STRL("Accept"), &length, request TSRMLS_CC); + char *value = php_http_env_get_request_header(ZEND_STRL("Accept"), &length, request); if (value) { - result = php_http_negotiate(value, length, supported, "/", 1 TSRMLS_CC); + result = php_http_negotiate(value, length, supported, "/", 1); } PTR_FREE(value); @@ -73,11 +73,11 @@ static inline HashTable *php_http_negotiate_content_type(HashTable *supported, p #define PHP_HTTP_DO_NEGOTIATE_DEFAULT(supported) \ { \ - zval **value; \ + zval *value; \ \ zend_hash_internal_pointer_reset((supported)); \ - if (SUCCESS == zend_hash_get_current_data((supported), (void *) &value)) { \ - RETVAL_ZVAL(*value, 1, 0); \ + if ((value = zend_hash_get_current_data((supported)))) { \ + RETVAL_ZVAL(value, 1, 0); \ } else { \ RETVAL_NULL(); \ } \ @@ -86,30 +86,30 @@ static inline HashTable *php_http_negotiate_content_type(HashTable *supported, p #define PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array) \ PHP_HTTP_DO_NEGOTIATE_DEFAULT(supported); \ if (rs_array) { \ - HashPosition pos; \ - zval **value_ptr; \ + zval *value; \ \ - FOREACH_HASH_VAL(pos, supported, value_ptr) { \ - zval *value = php_http_ztyp(IS_STRING, *value_ptr); \ - add_assoc_double(rs_array, Z_STRVAL_P(value), 1.0); \ - zval_ptr_dtor(&value); \ + ZEND_HASH_FOREACH_VAL(supported, value) \ + { \ + zend_string *zs = zval_get_string(value); \ + add_assoc_double_ex(rs_array, zs->val, zs->len, 1.0); \ + zend_string_release(zs); \ } \ + ZEND_HASH_FOREACH_END(); \ } #define PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(result, supported, rs_array) \ { \ - char *key; \ - uint key_len; \ - ulong idx; \ + zend_string *key; \ + zend_ulong idx; \ \ - if (zend_hash_num_elements(result) && HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key, &key_len, &idx, 1, NULL)) { \ - RETVAL_STRINGL(key, key_len-1, 0); \ + if (zend_hash_num_elements(result) && HASH_KEY_IS_STRING == zend_hash_get_current_key(result, &key, &idx)) { \ + RETVAL_STR_COPY(key); \ } else { \ PHP_HTTP_DO_NEGOTIATE_DEFAULT(supported); \ } \ \ if (rs_array) { \ - zend_hash_copy(Z_ARRVAL_P(rs_array), result, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); \ + zend_hash_copy(Z_ARRVAL_P(rs_array), result, (copy_ctor_func_t) zval_add_ref); \ } \ \ zend_hash_destroy(result); \ @@ -119,14 +119,13 @@ static inline HashTable *php_http_negotiate_content_type(HashTable *supported, p #define PHP_HTTP_DO_NEGOTIATE(type, supported, rs_array) \ { \ HashTable *result; \ - if ((result = php_http_negotiate_ ##type(supported, NULL TSRMLS_CC))) { \ + if ((result = php_http_negotiate_ ##type(supported, NULL))) { \ PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(result, supported, rs_array); \ } else { \ PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array); \ } \ } - #endif /* diff --git a/src/php_http_object.c b/src/php_http_object.c index d57388d..e42998e 100644 --- a/src/php_http_object.c +++ b/src/php_http_object.c @@ -12,84 +12,70 @@ #include "php_http_api.h" -zend_object_value php_http_object_new(zend_class_entry *ce TSRMLS_DC) +static zend_object_handlers php_http_object_handlers; + +zend_object *php_http_object_new(zend_class_entry *ce) { - return php_http_object_new_ex(ce, NULL, NULL TSRMLS_CC); + return &php_http_object_new_ex(ce, NULL)->zo; } -zend_object_value php_http_object_new_ex(zend_class_entry *ce, void *nothing, php_http_object_t **ptr TSRMLS_DC) +php_http_object_t *php_http_object_new_ex(zend_class_entry *ce, void *intern) { php_http_object_t *o; - o = ecalloc(1, sizeof(php_http_object_t)); - zend_object_std_init((zend_object *) o, ce TSRMLS_CC); - object_properties_init((zend_object *) o, ce); + o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); + zend_object_std_init(&o->zo, ce); + object_properties_init(&o->zo, ce); - if (ptr) { - *ptr = o; - } + o->intern = intern; + o->zo.handlers = &php_http_object_handlers; - o->zv.handle = zend_objects_store_put(o, NULL, (zend_objects_free_object_storage_t) zend_objects_free_object_storage, NULL TSRMLS_CC); - o->zv.handlers = zend_get_std_object_handlers(); + return o; +} - return o->zv; +void php_http_object_free(zend_object *object) +{ + zend_object_std_dtor(object); } -ZEND_RESULT_CODE php_http_new(zend_object_value *ovp, zend_class_entry *ce, php_http_new_t create, zend_class_entry *parent_ce, void *intern_ptr, void **obj_ptr TSRMLS_DC) +ZEND_RESULT_CODE php_http_new(void **obj_ptr, zend_class_entry *ce, php_http_new_t create, zend_class_entry *parent_ce, void *intern_ptr) { - zend_object_value ov; + void *obj; if (!ce) { ce = parent_ce; - } else if (parent_ce && !instanceof_function(ce, parent_ce TSRMLS_CC)) { - php_http_throw(unexpected_val, "Class %s does not extend %s", ce->name, parent_ce->name); + } else if (parent_ce && !instanceof_function(ce, parent_ce)) { + php_http_throw(unexpected_val, "Class %s does not extend %s", ce->name->val, parent_ce->name->val); return FAILURE; } - ov = create(ce, intern_ptr, obj_ptr TSRMLS_CC); - if (ovp) { - *ovp = ov; + obj = create(ce, intern_ptr); + if (obj_ptr) { + *obj_ptr = obj; } return SUCCESS; } -static inline zend_function *get_object_method(zval *zobject, zval *zmeth TSRMLS_DC) +php_http_object_method_t *php_http_object_method_init(php_http_object_method_t *cb, zval *zobject, const char *method_str, size_t method_len) { -#if PHP_VERSION_ID >= 50400 - return Z_OBJ_HT_P(zobject)->get_method(&zobject, Z_STRVAL_P(zmeth), Z_STRLEN_P(zmeth), NULL TSRMLS_CC); -#else - return Z_OBJ_HT_P(zobject)->get_method(&zobject, Z_STRVAL_P(zmeth), Z_STRLEN_P(zmeth) TSRMLS_CC); -#endif -} - -php_http_object_method_t *php_http_object_method_init(php_http_object_method_t *cb, zval *zobject, const char *method_str, size_t method_len TSRMLS_DC) -{ - zval *zfn; - if (!cb) { cb = ecalloc(1, sizeof(*cb)); } else { memset(cb, 0, sizeof(*cb)); } - MAKE_STD_ZVAL(zfn); - ZVAL_STRINGL(zfn, method_str, method_len, 1); - cb->fci.size = sizeof(cb->fci); - cb->fci.function_name = zfn; + ZVAL_STRINGL(&cb->fci.function_name, method_str, method_len); cb->fcc.initialized = 1; cb->fcc.calling_scope = cb->fcc.called_scope = Z_OBJCE_P(zobject); - cb->fcc.function_handler = get_object_method(zobject, cb->fci.function_name TSRMLS_CC); + cb->fcc.function_handler = Z_OBJ_HT_P(zobject)->get_method(&Z_OBJ_P(zobject), Z_STR(cb->fci.function_name), NULL); return cb; } void php_http_object_method_dtor(php_http_object_method_t *cb) { - if (cb->fci.function_name) { - zval_ptr_dtor(&cb->fci.function_name); - cb->fci.function_name = NULL; - } + zval_ptr_dtor(&cb->fci.function_name); } void php_http_object_method_free(php_http_object_method_t **cb) @@ -101,35 +87,44 @@ void php_http_object_method_free(php_http_object_method_t **cb) } } -ZEND_RESULT_CODE php_http_object_method_call(php_http_object_method_t *cb, zval *zobject, zval **retval_ptr, int argc, zval ***args TSRMLS_DC) +ZEND_RESULT_CODE php_http_object_method_call(php_http_object_method_t *cb, zval *zobject, zval *retval_ptr, int argc, zval *args) { ZEND_RESULT_CODE rv; - zval *retval = NULL; + zval retval; + ZVAL_UNDEF(&retval); Z_ADDREF_P(zobject); - cb->fci.object_ptr = zobject; - cb->fcc.object_ptr = zobject; + cb->fci.object = Z_OBJ_P(zobject); + cb->fcc.object = Z_OBJ_P(zobject); - cb->fci.retval_ptr_ptr = retval_ptr ? retval_ptr : &retval; + cb->fci.retval = retval_ptr ? retval_ptr : &retval; cb->fci.param_count = argc; cb->fci.params = args; if (cb->fcc.called_scope != Z_OBJCE_P(zobject)) { cb->fcc.called_scope = Z_OBJCE_P(zobject); - cb->fcc.function_handler = get_object_method(zobject, cb->fci.function_name TSRMLS_CC); + cb->fcc.function_handler = Z_OBJ_HT_P(zobject)->get_method(&Z_OBJ_P(zobject), Z_STR(cb->fci.function_name), NULL); } - rv = zend_call_function(&cb->fci, &cb->fcc TSRMLS_CC); + rv = zend_call_function(&cb->fci, &cb->fcc); - zval_ptr_dtor(&zobject); - if (!retval_ptr && retval) { + zval_ptr_dtor(zobject); + if (!retval_ptr && !Z_ISUNDEF(retval)) { zval_ptr_dtor(&retval); } return rv; } +PHP_MINIT_FUNCTION(http_object) +{ + memcpy(&php_http_object_handlers, zend_get_std_object_handlers(), sizeof(php_http_object_handlers)); + php_http_object_handlers.offset = XtOffsetOf(php_http_object_t, zo); + + return SUCCESS; +} + /* * Local variables: * tab-width: 4 diff --git a/src/php_http_object.h b/src/php_http_object.h index 3f75932..20de8c8 100644 --- a/src/php_http_object.h +++ b/src/php_http_object.h @@ -14,24 +14,26 @@ #define PHP_HTTP_OBJECT_H typedef struct php_http_object { + void *intern; zend_object zo; - zend_object_value zv; } php_http_object_t; -zend_object_value php_http_object_new(zend_class_entry *ce TSRMLS_DC); -zend_object_value php_http_object_new_ex(zend_class_entry *ce, void *nothing, php_http_object_t **ptr TSRMLS_DC); +zend_object *php_http_object_new(zend_class_entry *ce); +php_http_object_t *php_http_object_new_ex(zend_class_entry *ce, void *nothing); -typedef zend_object_value (*php_http_new_t)(zend_class_entry *ce, void *, void ** TSRMLS_DC); +typedef void *(*php_http_new_t)(zend_class_entry *ce, void *); -ZEND_RESULT_CODE php_http_new(zend_object_value *ov, zend_class_entry *ce, php_http_new_t create, zend_class_entry *parent_ce, void *intern_ptr, void **obj_ptr TSRMLS_DC); +ZEND_RESULT_CODE php_http_new(void **obj_ptr, zend_class_entry *ce, php_http_new_t create, zend_class_entry *parent_ce, void *intern_ptr); + +PHP_MINIT_FUNCTION(http_object); typedef struct php_http_method { zend_fcall_info fci; zend_fcall_info_cache fcc; } php_http_object_method_t; -php_http_object_method_t *php_http_object_method_init(php_http_object_method_t *cb, zval *zobject, const char *method_str, size_t method_len TSRMLS_DC); -ZEND_RESULT_CODE php_http_object_method_call(php_http_object_method_t *cb, zval *zobject, zval **retval, int argc, zval ***args TSRMLS_DC); +php_http_object_method_t *php_http_object_method_init(php_http_object_method_t *cb, zval *zobject, const char *method_str, size_t method_len); +ZEND_RESULT_CODE php_http_object_method_call(php_http_object_method_t *cb, zval *zobject, zval *retval, int argc, zval *args); void php_http_object_method_dtor(php_http_object_method_t *cb); void php_http_object_method_free(php_http_object_method_t **cb); diff --git a/src/php_http_options.c b/src/php_http_options.c index 59b9c5f..d4be512 100644 --- a/src/php_http_options.c +++ b/src/php_http_options.c @@ -12,6 +12,16 @@ #include "php_http_api.h" +static void php_http_options_hash_dtor(zval *pData) +{ + php_http_option_t *opt = Z_PTR_P(pData); + + zval_ptr_dtor(&opt->defval); + zend_hash_destroy(&opt->suboptions.options); + zend_string_release(opt->name); + pefree(opt, opt->persistent); +} + php_http_options_t *php_http_options_init(php_http_options_t *registry, zend_bool persistent) { if (!registry) { @@ -21,18 +31,19 @@ php_http_options_t *php_http_options_init(php_http_options_t *registry, zend_boo } registry->persistent = persistent; - zend_hash_init(®istry->options, 0, NULL, (dtor_func_t) zend_hash_destroy, persistent); + zend_hash_init(®istry->options, 0, NULL, php_http_options_hash_dtor, persistent); return registry; } ZEND_RESULT_CODE php_http_options_apply(php_http_options_t *registry, HashTable *options, void *userdata) { - HashPosition pos; - zval *val; + zval *entry, *val; php_http_option_t *opt; - FOREACH_HASH_VAL(pos, ®istry->options, opt) { + ZEND_HASH_FOREACH_VAL(®istry->options, entry) + { + opt = Z_PTR_P(entry); if (!(val = registry->getter(opt, options, userdata))) { val = &opt->defval; } @@ -44,6 +55,8 @@ ZEND_RESULT_CODE php_http_options_apply(php_http_options_t *registry, HashTable return FAILURE; } } + ZEND_HASH_FOREACH_END(); + return SUCCESS; } @@ -63,7 +76,7 @@ void php_http_options_free(php_http_options_t **registry) php_http_option_t *php_http_option_register(php_http_options_t *registry, const char *name_str, size_t name_len, ulong option, zend_uchar type) { - php_http_option_t opt, *dst = NULL; + php_http_option_t opt; memset(&opt, 0, sizeof(opt)); @@ -71,22 +84,22 @@ php_http_option_t *php_http_option_register(php_http_options_t *registry, const opt.suboptions.getter = registry->getter; opt.suboptions.setter = registry->setter; - opt.name.h = zend_hash_func(opt.name.s = name_str, opt.name.l = name_len + 1); + opt.persistent = registry->persistent; + opt.name = zend_string_init(name_str, name_len, registry->persistent); opt.type = type; opt.option = option; - INIT_ZVAL(opt.defval); switch ((opt.type = type)) { - case IS_BOOL: - ZVAL_BOOL(&opt.defval, 0); + case IS_TRUE: + ZVAL_TRUE(&opt.defval); break; - case IS_LONG: - ZVAL_LONG(&opt.defval, 0); + case IS_FALSE: + ZVAL_FALSE(&opt.defval); break; - case IS_STRING: - ZVAL_STRINGL(&opt.defval, NULL, 0, 0); + case IS_LONG: + ZVAL_LONG(&opt.defval, 0); break; case IS_DOUBLE: @@ -98,18 +111,13 @@ php_http_option_t *php_http_option_register(php_http_options_t *registry, const break; } - zend_hash_quick_update(®istry->options, opt.name.s, opt.name.l, opt.name.h, (void *) &opt, sizeof(opt), (void *) &dst); - return dst; + return zend_hash_update_mem(®istry->options, opt.name, &opt, sizeof(opt)); } zval *php_http_option_get(php_http_option_t *opt, HashTable *options, void *userdata) { if (options) { - zval **zoption; - - if (SUCCESS == zend_hash_quick_find(options, opt->name.s, opt->name.l, opt->name.h, (void *) &zoption)) { - return *zoption; - } + return zend_hash_find(options, opt->name); } return NULL; diff --git a/src/php_http_options.h b/src/php_http_options.h index 2475383..4fff611 100644 --- a/src/php_http_options.h +++ b/src/php_http_options.h @@ -31,18 +31,14 @@ struct php_http_options { struct php_http_option { php_http_options_t suboptions; - struct { - const char *s; - size_t l; - ulong h; - } name; - + zend_string *name; ulong option; zend_uchar type; unsigned flags; zval defval; php_http_option_set_callback_t setter; + unsigned persistent:1; }; PHP_HTTP_API php_http_options_t *php_http_options_init(php_http_options_t *registry, zend_bool persistent); diff --git a/src/php_http_params.c b/src/php_http_params.c index 5adeb91..b51ab71 100644 --- a/src/php_http_params.c +++ b/src/php_http_params.c @@ -20,7 +20,7 @@ static php_http_params_opts_t def_opts = { def_param_sep_ptr, def_arg_sep_ptr, def_val_sep_ptr, - NULL, + {{0}}, PHP_HTTP_PARAMS_DEFAULT }; @@ -41,82 +41,101 @@ typedef struct php_http_params_state { php_http_params_token_t arg; php_http_params_token_t val; struct { - zval **param; - zval **args; - zval **val; + zval *param; + zval *args; + zval *val; } current; unsigned quotes:1; unsigned escape:1; unsigned rfc5987:1; } php_http_params_state_t; -static inline void sanitize_escaped(zval *zv TSRMLS_DC) +static inline void sanitize_escaped(zval *zv) { if (Z_STRVAL_P(zv)[0] == '"' && Z_STRVAL_P(zv)[Z_STRLEN_P(zv) - 1] == '"') { size_t deq_len = Z_STRLEN_P(zv) - 2; char *deq = estrndup(Z_STRVAL_P(zv) + 1, deq_len); zval_dtor(zv); - ZVAL_STRINGL(zv, deq, deq_len, 0); + ZVAL_STR(zv, php_http_cs2zs(deq, deq_len)); } - php_stripcslashes(Z_STRVAL_P(zv), &Z_STRLEN_P(zv)); + php_stripcslashes(Z_STR_P(zv)); } -static inline void quote_string(zval *zv, zend_bool force TSRMLS_DC) +static inline void quote_string(zend_string **zs, zend_bool force) { - int len = Z_STRLEN_P(zv); + int len = (*zs)->len; - Z_STRVAL_P(zv) = php_addcslashes(Z_STRVAL_P(zv), Z_STRLEN_P(zv), &Z_STRLEN_P(zv), 1, - ZEND_STRL("\0..\37\173\\\"") TSRMLS_CC); + *zs = php_addcslashes(*zs, 1, ZEND_STRL("\0..\37\173\\\"")); - if (force || len != Z_STRLEN_P(zv) || strpbrk(Z_STRVAL_P(zv), "()<>@,;:\"[]?={} ")) { - zval tmp = *zv; - int len = Z_STRLEN_P(zv) + 2; - char *str = emalloc(len + 1); + if (force || len != (*zs)->len || strpbrk((*zs)->val, "()<>@,;:\"[]?={} ")) { + int len = (*zs)->len + 2; - str[0] = '"'; - memcpy(&str[1], Z_STRVAL_P(zv), Z_STRLEN_P(zv)); - str[len-1] = '"'; - str[len] = '\0'; + *zs = zend_string_extend(*zs, len, 0); - zval_dtor(&tmp); - ZVAL_STRINGL(zv, str, len, 0); + memmove(&(*zs)->val[1], (*zs)->val, (*zs)->len); + (*zs)->val[0] = '"'; + (*zs)->val[len-1] = '"'; + (*zs)->val[len] = '\0'; + + zend_string_forget_hash_val(*zs); } } -static inline void prepare_escaped(zval *zv TSRMLS_DC) +/* if (Z_TYPE_P(zv) == IS_STRING) { + size_t len = Z_STRLEN_P(zv); + zend_string *stripped = php_addcslashes(Z_STR_P(zv), 0, + ZEND_STRL("\0..\37\173\\\"")); + + if (len != stripped->len || strpbrk(stripped->val, "()<>@,;:\"[]?={} ")) { + size_t len = stripped->len + 2; + char *str = emalloc(len + 1); + + str[0] = '"'; + memcpy(&str[1], stripped->val, stripped->len); + str[len-1] = '"'; + str[len] = '\0'; + + zval_dtor(zv); + zend_string_release(stripped); + ZVAL_STR(zv, php_http_cs2zs(str, len)); + } else { + zval_dtor(zv); + ZVAL_STR(zv, stripped); + } +*/ + +static inline void prepare_escaped(zval *zv) { if (Z_TYPE_P(zv) == IS_STRING) { - quote_string(zv, 0 TSRMLS_CC); + quote_string(&Z_STR_P(zv), 0); } else { zval_dtor(zv); ZVAL_EMPTY_STRING(zv); } } -static inline void sanitize_urlencoded(zval *zv TSRMLS_DC) +static inline void sanitize_urlencoded(zval *zv) { Z_STRLEN_P(zv) = php_raw_url_decode(Z_STRVAL_P(zv), Z_STRLEN_P(zv)); } -static inline void prepare_urlencoded(zval *zv TSRMLS_DC) +static inline void prepare_urlencoded(zval *zv) { - int len; - char *str = php_raw_url_encode(Z_STRVAL_P(zv), Z_STRLEN_P(zv), &len); + zend_string *str = php_raw_url_encode(Z_STRVAL_P(zv), Z_STRLEN_P(zv)); zval_dtor(zv); - ZVAL_STRINGL(zv, str, len, 0); + ZVAL_STR(zv, str); } -static void sanitize_dimension(zval *zv TSRMLS_DC) +static void sanitize_dimension(zval *zv) { - zval *arr = NULL, *tmp = NULL, **cur = NULL; + zval arr, tmp, *cur = NULL; char *var = NULL, *ptr = Z_STRVAL_P(zv), *end = Z_STRVAL_P(zv) + Z_STRLEN_P(zv); long level = 0; - MAKE_STD_ZVAL(arr); - array_init(arr); + array_init(&arr); cur = &arr; while (ptr < end) { @@ -128,7 +147,7 @@ static void sanitize_dimension(zval *zv TSRMLS_DC) case '[': if (++level > PG(max_input_nesting_level)) { zval_ptr_dtor(&arr); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Max input nesting level of %ld exceeded", (long) PG(max_input_nesting_level)); + php_error_docref(NULL, E_WARNING, "Max input nesting level of %ld exceeded", (long) PG(max_input_nesting_level)); return; } if (ptr - var == 0) { @@ -139,17 +158,16 @@ static void sanitize_dimension(zval *zv TSRMLS_DC) case ']': - MAKE_STD_ZVAL(tmp); - ZVAL_NULL(tmp); - convert_to_array(*cur); + ZVAL_NULL(&tmp); + convert_to_array(cur); if (ptr - var) { char chr = *ptr; *ptr = '\0'; - zend_symtable_update(Z_ARRVAL_PP(cur), var, ptr - var + 1, (void *) &tmp, sizeof(zval *), (void *) &cur); + cur = zend_symtable_str_update(Z_ARRVAL_P(cur), var, ptr - var, &tmp); *ptr = chr; } else { - zend_hash_next_index_insert(Z_ARRVAL_PP(cur), (void *) &tmp, sizeof(zval *), (void *) &cur); + cur = zend_hash_next_index_insert(Z_ARRVAL_P(cur), &tmp); } var = NULL; @@ -159,75 +177,76 @@ static void sanitize_dimension(zval *zv TSRMLS_DC) ++ptr; } - if (zend_hash_num_elements(Z_ARRVAL_P(arr))) { + if (zend_hash_num_elements(Z_ARRVAL(arr))) { zval_dtor(zv); -#if PHP_VERSION_ID >= 50400 - ZVAL_COPY_VALUE(zv, arr); -#else - zv->value = arr->value; - Z_TYPE_P(zv) = Z_TYPE_P(arr); -#endif - FREE_ZVAL(arr); + ZVAL_COPY_VALUE(zv, &arr); } else { zval_ptr_dtor(&arr); } } -static inline void shift_key(php_http_buffer_t *buf, char *key_str, size_t key_len, const char *ass, size_t asl, unsigned flags TSRMLS_DC); -static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags TSRMLS_DC); +static inline void shift_key(php_http_buffer_t *buf, char *key_str, size_t key_len, const char *ass, size_t asl, unsigned flags); +static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags); -static void prepare_dimension(php_http_buffer_t *buf, php_http_buffer_t *keybuf, zval *zvalue, const char *pss, size_t psl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC) +static void prepare_dimension(php_http_buffer_t *buf, php_http_buffer_t *keybuf, zval *zvalue, const char *pss, size_t psl, const char *vss, size_t vsl, unsigned flags) { HashTable *ht = HASH_OF(zvalue); - HashPosition pos; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - zval **val; + php_http_arrkey_t key; + zval *val; php_http_buffer_t prefix; - if (!ht->nApplyCount++) { + if (!ZEND_HASH_GET_APPLY_COUNT(ht)) { + ZEND_HASH_INC_APPLY_COUNT(ht); php_http_buffer_init(&prefix); php_http_buffer_append(&prefix, keybuf->data, keybuf->used); - FOREACH_HASH_KEYVAL(pos, ht, key, val) { - if (key.type == HASH_KEY_IS_STRING && !*key.str) { + ZEND_HASH_FOREACH_KEY_VAL_IND(ht, key.h, key.key, val) + { + if (key.key && !*key.key->val) { /* only public properties */ continue; } php_http_buffer_appends(&prefix, "["); - if (key.type == HASH_KEY_IS_STRING) { - php_http_buffer_append(&prefix, key.str, key.len - 1); + if (key.key) { + php_http_buffer_append(&prefix, key.key->val, key.key->len); } else { - php_http_buffer_appendf(&prefix, "%lu", key.num); + php_http_buffer_appendf(&prefix, "%lu", key.h); } php_http_buffer_appends(&prefix, "]"); - if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) { - prepare_dimension(buf, &prefix, *val, pss, psl, vss, vsl, flags TSRMLS_CC); + if (Z_TYPE_P(val) == IS_ARRAY || Z_TYPE_P(val) == IS_OBJECT) { + prepare_dimension(buf, &prefix, val, pss, psl, vss, vsl, flags); } else { - zval *cpy = php_http_ztyp(IS_STRING, *val); + zend_string *cpy = zval_get_string(val); + zval tmp; - shift_key(buf, prefix.data, prefix.used, pss, psl, flags TSRMLS_CC); - shift_val(buf, cpy, vss, vsl, flags TSRMLS_CC); - zval_ptr_dtor(&cpy); + ZVAL_STR(&tmp, cpy); + shift_key(buf, prefix.data, prefix.used, pss, psl, flags); + shift_val(buf, &tmp, vss, vsl, flags); + zend_string_release(cpy); } php_http_buffer_cut(&prefix, keybuf->used, prefix.used - keybuf->used); } + ZEND_HASH_FOREACH_END(); + ZEND_HASH_DEC_APPLY_COUNT(ht); + php_http_buffer_dtor(&prefix); } - --ht->nApplyCount; } -static inline void sanitize_key(unsigned flags, char *str, size_t len, zval *zv, zend_bool *rfc5987 TSRMLS_DC) +static inline void sanitize_key(unsigned flags, const char *str, size_t len, zval *zv, zend_bool *rfc5987) { char *eos; + zend_string *zs = zend_string_init(str, len, 0); zval_dtor(zv); - php_trim(str, len, NULL, 0, zv, 3 TSRMLS_CC); + ZVAL_STR(zv, php_trim(zs, NULL, 0, 3)); + zend_string_release(zs); if (flags & PHP_HTTP_PARAMS_ESCAPED) { - sanitize_escaped(zv TSRMLS_CC); + sanitize_escaped(zv); } if (!Z_STRLEN_P(zv)) { @@ -242,15 +261,15 @@ static inline void sanitize_key(unsigned flags, char *str, size_t len, zval *zv, } if (flags & PHP_HTTP_PARAMS_URLENCODED) { - sanitize_urlencoded(zv TSRMLS_CC); + sanitize_urlencoded(zv); } if (flags & PHP_HTTP_PARAMS_DIMENSION) { - sanitize_dimension(zv TSRMLS_CC); + sanitize_dimension(zv); } } -static inline void sanitize_rfc5987(zval *zv, char **language, zend_bool *latin1 TSRMLS_DC) +static inline void sanitize_rfc5987(zval *zv, char **language, zend_bool *latin1) { char *ptr; @@ -292,17 +311,20 @@ static inline void sanitize_rfc5987(zval *zv, char **language, zend_bool *latin1 /* remainder */ ptr = estrdup(++ptr); zval_dtor(zv); - ZVAL_STRING(zv, ptr, 0); + ZVAL_STR(zv, php_http_cs2zs(ptr, strlen(ptr))); } } -static inline void sanitize_rfc5988(char *str, size_t len, zval *zv TSRMLS_DC) +static inline void sanitize_rfc5988(char *str, size_t len, zval *zv) { + zend_string *zs = zend_string_init(str, len, 0); + zval_dtor(zv); - php_trim(str, len, " ><", 3, zv, 3 TSRMLS_CC); + ZVAL_STR(zv, php_trim(zs, " ><", 3, 3)); + zend_string_release(zs); } -static inline void prepare_rfc5988(zval *zv TSRMLS_DC) +static inline void prepare_rfc5988(zval *zv) { if (Z_TYPE_P(zv) != IS_STRING) { zval_dtor(zv); @@ -332,130 +354,129 @@ static void utf8encode(zval *zv) } } zval_dtor(zv); - ZVAL_STRINGL(zv, (char *) ptr, pos-1, 0); + ZVAL_STR(zv, php_http_cs2zs((char *) ptr, pos-1)); } -static inline void sanitize_value(unsigned flags, char *str, size_t len, zval *zv, zend_bool rfc5987 TSRMLS_DC) +static inline void sanitize_value(unsigned flags, const char *str, size_t len, zval *zv, zend_bool rfc5987) { char *language = NULL; zend_bool latin1 = 0; + zend_string *zs = zend_string_init(str, len, 0); zval_dtor(zv); - php_trim(str, len, NULL, 0, zv, 3 TSRMLS_CC); + ZVAL_STR(zv, php_trim(zs, NULL, 0, 3)); + zend_string_release(zs); if (rfc5987) { - sanitize_rfc5987(zv, &language, &latin1 TSRMLS_CC); + sanitize_rfc5987(zv, &language, &latin1); } if (flags & PHP_HTTP_PARAMS_ESCAPED) { - sanitize_escaped(zv TSRMLS_CC); + sanitize_escaped(zv); } if ((flags & PHP_HTTP_PARAMS_URLENCODED) || (rfc5987 && language)) { - sanitize_urlencoded(zv TSRMLS_CC); + sanitize_urlencoded(zv); } if (rfc5987 && language) { - zval *tmp; + zval tmp; if (latin1) { utf8encode(zv); } - MAKE_STD_ZVAL(tmp); - ZVAL_COPY_VALUE(tmp, zv); + ZVAL_COPY_VALUE(&tmp, zv); array_init(zv); - add_assoc_zval(zv, language, tmp); - PTR_FREE(language); + add_assoc_zval(zv, language, &tmp); + efree(language); } } -static inline void prepare_key(unsigned flags, char *old_key, size_t old_len, char **new_key, size_t *new_len TSRMLS_DC) +static inline void prepare_key(unsigned flags, char *old_key, size_t old_len, char **new_key, size_t *new_len) { zval zv; - INIT_PZVAL(&zv); - ZVAL_STRINGL(&zv, old_key, old_len, 1); + ZVAL_STRINGL(&zv, old_key, old_len); if (flags & PHP_HTTP_PARAMS_URLENCODED) { - prepare_urlencoded(&zv TSRMLS_CC); + prepare_urlencoded(&zv); } if (flags & PHP_HTTP_PARAMS_ESCAPED) { if (flags & PHP_HTTP_PARAMS_RFC5988) { - prepare_rfc5988(&zv TSRMLS_CC); + prepare_rfc5988(&zv); } else { - prepare_escaped(&zv TSRMLS_CC); + prepare_escaped(&zv); } } - *new_key = Z_STRVAL(zv); + *new_key = estrndup(Z_STRVAL(zv), Z_STRLEN(zv)); *new_len = Z_STRLEN(zv); + zval_ptr_dtor(&zv); } -static inline void prepare_value(unsigned flags, zval *zv TSRMLS_DC) +static inline void prepare_value(unsigned flags, zval *zv) { if (flags & PHP_HTTP_PARAMS_URLENCODED) { - prepare_urlencoded(zv TSRMLS_CC); + prepare_urlencoded(zv); } if (flags & PHP_HTTP_PARAMS_ESCAPED) { - prepare_escaped(zv TSRMLS_CC); + prepare_escaped(zv); } } -static void merge_param(HashTable *params, zval *zdata, zval ***current_param, zval ***current_args TSRMLS_DC) +static void merge_param(HashTable *params, zval *zdata, zval **current_param, zval **current_args) { - zval **ptr, **zdata_ptr; - php_http_array_hashkey_t hkey = php_http_array_hashkey_init(0); + zval *ptr, *zdata_ptr; + php_http_arrkey_t hkey = {0}; #if 0 { zval tmp; INIT_PZVAL_ARRAY(&tmp, params); fprintf(stderr, "params = "); - zend_print_zval_r(&tmp, 1 TSRMLS_CC); + zend_print_zval_r(&tmp, 1); fprintf(stderr, "\n"); } #endif - hkey.type = zend_hash_get_current_key_ex(Z_ARRVAL_P(zdata), &hkey.str, &hkey.len, &hkey.num, hkey.dup, NULL); + zend_hash_get_current_key(Z_ARRVAL_P(zdata), &hkey.key, &hkey.h); - if ((hkey.type == HASH_KEY_IS_STRING && !zend_hash_exists(params, hkey.str, hkey.len)) - || (hkey.type == HASH_KEY_IS_LONG && !zend_hash_index_exists(params, hkey.num)) + if ((hkey.key && !zend_hash_exists(params, hkey.key)) + || (!hkey.key && !zend_hash_index_exists(params, hkey.h)) ) { - zval *tmp, *arg, **args; + zval tmp, arg, *args; /* create the entry if it doesn't exist */ - zend_hash_get_current_data(Z_ARRVAL_P(zdata), (void *) &ptr); - Z_ADDREF_PP(ptr); - MAKE_STD_ZVAL(tmp); - array_init(tmp); - add_assoc_zval_ex(tmp, ZEND_STRS("value"), *ptr); - - MAKE_STD_ZVAL(arg); - array_init(arg); - zend_hash_update(Z_ARRVAL_P(tmp), "arguments", sizeof("arguments"), (void *) &arg, sizeof(zval *), (void *) &args); + ptr = zend_hash_get_current_data(Z_ARRVAL_P(zdata)); + Z_TRY_ADDREF_P(ptr); + array_init(&tmp); + add_assoc_zval_ex(&tmp, ZEND_STRL("value"), ptr); + + array_init(&arg); + args = zend_hash_str_update(Z_ARRVAL(tmp), "arguments", lenof("arguments"), &arg); *current_args = args; - if (hkey.type == HASH_KEY_IS_STRING) { - zend_hash_update(params, hkey.str, hkey.len, (void *) &tmp, sizeof(zval *), (void *) &ptr); + if (hkey.key) { + ptr = zend_hash_update(params, hkey.key, &tmp); } else { - zend_hash_index_update(params, hkey.num, (void *) &tmp, sizeof(zval *), (void *) &ptr); + ptr = zend_hash_index_update(params, hkey.h, &tmp); } } else { /* merge */ - if (hkey.type == HASH_KEY_IS_STRING) { - zend_hash_find(params, hkey.str, hkey.len, (void *) &ptr); + if (hkey.key) { + ptr = zend_hash_find(params, hkey.key); } else { - zend_hash_index_find(params, hkey.num, (void *) &ptr); + ptr = zend_hash_index_find(params, hkey.h); } - zdata_ptr = &zdata; + zdata_ptr = zdata; - if (Z_TYPE_PP(ptr) == IS_ARRAY - && SUCCESS == zend_hash_find(Z_ARRVAL_PP(ptr), "value", sizeof("value"), (void *) &ptr) - && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(zdata_ptr), (void *) &zdata_ptr) + if (Z_TYPE_P(ptr) == IS_ARRAY + && (ptr = zend_hash_str_find(Z_ARRVAL_P(ptr), "value", lenof("value"))) + && (zdata_ptr = zend_hash_get_current_data(Z_ARRVAL_P(zdata_ptr))) ) { /* * params = [arr => [value => [0 => 1]]] @@ -463,48 +484,50 @@ static void merge_param(HashTable *params, zval *zdata, zval ***current_param, z * zdata = [arr => [0 => NULL]] * ^- zdata_ptr */ - zval **test_ptr; + zval *test_ptr; - while (Z_TYPE_PP(zdata_ptr) == IS_ARRAY - && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(zdata_ptr), (void *) &test_ptr) - ) { - if (Z_TYPE_PP(test_ptr) == IS_ARRAY) { + while (Z_TYPE_P(zdata_ptr) == IS_ARRAY && (test_ptr = zend_hash_get_current_data(Z_ARRVAL_P(zdata_ptr)))) { + if (Z_TYPE_P(test_ptr) == IS_ARRAY) { + zval *tmp_ptr = ptr; /* now find key in ptr */ - if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_PP(zdata_ptr), &hkey.str, &hkey.len, &hkey.num, hkey.dup, NULL)) { - if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(ptr), hkey.str, hkey.len, (void *) &ptr)) { + if (HASH_KEY_IS_STRING == zend_hash_get_current_key(Z_ARRVAL_P(zdata_ptr), &hkey.key, &hkey.h)) { + if ((ptr = zend_hash_find(Z_ARRVAL_P(ptr), hkey.key))) { zdata_ptr = test_ptr; } else { - Z_ADDREF_PP(test_ptr); - zend_hash_update(Z_ARRVAL_PP(ptr), hkey.str, hkey.len, (void *) test_ptr, sizeof(zval *), (void *) &ptr); + ptr = tmp_ptr; + Z_TRY_ADDREF_P(test_ptr); + ptr = zend_hash_update(Z_ARRVAL_P(ptr), hkey.key, test_ptr); break; } } else { - if (SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(ptr), hkey.num, (void *) &ptr)) { + if ((ptr = zend_hash_index_find(Z_ARRVAL_P(ptr), hkey.h))) { zdata_ptr = test_ptr; - } else if (hkey.num) { - Z_ADDREF_PP(test_ptr); - zend_hash_index_update(Z_ARRVAL_PP(ptr), hkey.num, (void *) test_ptr, sizeof(zval *), (void *) &ptr); + } else if (hkey.h) { + ptr = tmp_ptr; + Z_TRY_ADDREF_P(test_ptr); + ptr = zend_hash_index_update(Z_ARRVAL_P(ptr), hkey.h, test_ptr); break; } else { - Z_ADDREF_PP(test_ptr); - zend_hash_next_index_insert(Z_ARRVAL_PP(ptr), (void *) test_ptr, sizeof(zval *), (void *) &ptr); + ptr = tmp_ptr; + Z_TRY_ADDREF_P(test_ptr); + ptr = zend_hash_next_index_insert(Z_ARRVAL_P(ptr), test_ptr); break; } } } else { /* this is the leaf */ - Z_ADDREF_PP(test_ptr); - if (Z_TYPE_PP(ptr) != IS_ARRAY) { - zval_dtor(*ptr); - array_init(*ptr); + Z_TRY_ADDREF_P(test_ptr); + if (Z_TYPE_P(ptr) != IS_ARRAY) { + zval_dtor(ptr); + array_init(ptr); } - if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_PP(zdata_ptr), &hkey.str, &hkey.len, &hkey.num, hkey.dup, NULL)) { - zend_hash_update(Z_ARRVAL_PP(ptr), hkey.str, hkey.len, (void *) test_ptr, sizeof(zval *), (void *) &ptr); - } else if (hkey.num) { - zend_hash_index_update(Z_ARRVAL_PP(ptr), hkey.num, (void *) test_ptr, sizeof(zval *), (void *) &ptr); + if (HASH_KEY_IS_STRING == zend_hash_get_current_key(Z_ARRVAL_P(zdata_ptr), &hkey.key, &hkey.h)) { + ptr = zend_hash_update(Z_ARRVAL_P(ptr), hkey.key, test_ptr); + } else if (hkey.h) { + ptr = zend_hash_index_update(Z_ARRVAL_P(ptr), hkey.h, test_ptr); } else { - zend_hash_next_index_insert(Z_ARRVAL_PP(ptr), (void *) test_ptr, sizeof(zval *), (void *) &ptr); + ptr = zend_hash_next_index_insert(Z_ARRVAL_P(ptr), test_ptr); } break; } @@ -514,86 +537,87 @@ static void merge_param(HashTable *params, zval *zdata, zval ***current_param, z } /* bubble up */ - while (Z_TYPE_PP(ptr) == IS_ARRAY && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(ptr), (void *) &ptr)); + while (Z_TYPE_P(ptr) == IS_ARRAY) { + zval *tmp = zend_hash_get_current_data(Z_ARRVAL_P(ptr)); + + if (tmp) { + ptr = tmp; + } else { + break; + } + } *current_param = ptr; } -static void push_param(HashTable *params, php_http_params_state_t *state, const php_http_params_opts_t *opts TSRMLS_DC) +static void push_param(HashTable *params, php_http_params_state_t *state, const php_http_params_opts_t *opts) { if (state->val.str) { if (0 < (state->val.len = state->input.str - state->val.str)) { - sanitize_value(opts->flags, state->val.str, state->val.len, *(state->current.val), state->rfc5987 TSRMLS_CC); + sanitize_value(opts->flags, state->val.str, state->val.len, state->current.val, state->rfc5987); } state->rfc5987 = 0; } else if (state->arg.str) { if (0 < (state->arg.len = state->input.str - state->arg.str)) { - zval *val, key; + zval val, key; zend_bool rfc5987 = 0; - INIT_PZVAL(&key); ZVAL_NULL(&key); - sanitize_key(opts->flags, state->arg.str, state->arg.len, &key, &rfc5987 TSRMLS_CC); + sanitize_key(opts->flags, state->arg.str, state->arg.len, &key, &rfc5987); state->rfc5987 = rfc5987; if (Z_TYPE(key) == IS_STRING && Z_STRLEN(key)) { - MAKE_STD_ZVAL(val); - ZVAL_TRUE(val); + ZVAL_TRUE(&val); if (rfc5987) { - zval **rfc; + zval *rfc; - if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(state->current.args), ZEND_STRS("*rfc5987*"), (void *) &rfc)) { - zend_symtable_update(Z_ARRVAL_PP(rfc), Z_STRVAL(key), Z_STRLEN(key) + 1, (void *) &val, sizeof(zval *), (void *) &state->current.val); + if ((rfc = zend_hash_str_find(Z_ARRVAL_P(state->current.args), ZEND_STRL("*rfc5987*")))) { + state->current.val = zend_symtable_str_update(Z_ARRVAL_P(rfc), Z_STRVAL(key), Z_STRLEN(key), &val); } else { - zval *tmp; + zval tmp; - MAKE_STD_ZVAL(tmp); - array_init_size(tmp, 1); - zend_symtable_update(Z_ARRVAL_P(tmp), Z_STRVAL(key), Z_STRLEN(key) + 1, (void *) &val, sizeof(zval *), (void *) &state->current.val); - zend_symtable_update(Z_ARRVAL_PP(state->current.args), ZEND_STRS("*rfc5987*"), (void *) &tmp, sizeof(zval *), NULL); + array_init_size(&tmp, 1); + state->current.val = zend_symtable_str_update(Z_ARRVAL(tmp), Z_STRVAL(key), Z_STRLEN(key), &val); + zend_symtable_str_update(Z_ARRVAL_P(state->current.args), ZEND_STRL("*rfc5987*"), &tmp); } } else { - zend_symtable_update(Z_ARRVAL_PP(state->current.args), Z_STRVAL(key), Z_STRLEN(key) + 1, (void *) &val, sizeof(zval *), (void *) &state->current.val); + state->current.val = zend_symtable_str_update(Z_ARRVAL_P(state->current.args), Z_STRVAL(key), Z_STRLEN(key), &val); } } zval_dtor(&key); } } else if (state->param.str) { if (0 < (state->param.len = state->input.str - state->param.str)) { - zval *prm, *arg, *val, *key; + zval prm, arg, val, key; zend_bool rfc5987 = 0; - MAKE_STD_ZVAL(key); - ZVAL_NULL(key); + ZVAL_NULL(&key); if (opts->flags & PHP_HTTP_PARAMS_RFC5988) { - sanitize_rfc5988(state->param.str, state->param.len, key TSRMLS_CC); + sanitize_rfc5988(state->param.str, state->param.len, &key); } else { - sanitize_key(opts->flags, state->param.str, state->param.len, key, &rfc5987 TSRMLS_CC); + sanitize_key(opts->flags, state->param.str, state->param.len, &key, &rfc5987); state->rfc5987 = rfc5987; } - if (Z_TYPE_P(key) != IS_STRING) { - merge_param(params, key, &state->current.val, &state->current.args TSRMLS_CC); - } else if (Z_STRLEN_P(key)) { - MAKE_STD_ZVAL(prm); - array_init_size(prm, 2); - - MAKE_STD_ZVAL(val); - if (opts->defval) { - ZVAL_COPY_VALUE(val, opts->defval); - zval_copy_ctor(val); + if (Z_TYPE(key) == IS_ARRAY) { + merge_param(params, &key, &state->current.val, &state->current.args); + } else if (Z_TYPE(key) == IS_STRING && Z_STRLEN(key)) { + // FIXME: array_init_size(&prm, 2); + array_init(&prm); + + if (!Z_ISUNDEF(opts->defval)) { + ZVAL_COPY_VALUE(&val, &opts->defval); + zval_copy_ctor(&val); } else { - ZVAL_TRUE(val); + ZVAL_TRUE(&val); } if (rfc5987 && (opts->flags & PHP_HTTP_PARAMS_RFC5987)) { - zend_hash_update(Z_ARRVAL_P(prm), "*rfc5987*", sizeof("*rfc5987*"), (void *) &val, sizeof(zval *), (void *) &state->current.val); + state->current.val = zend_hash_str_update(Z_ARRVAL(prm), "*rfc5987*", lenof("*rfc5987*"), &val); } else { - zend_hash_update(Z_ARRVAL_P(prm), "value", sizeof("value"), (void *) &val, sizeof(zval *), (void *) &state->current.val); + state->current.val = zend_hash_str_update(Z_ARRVAL(prm), "value", lenof("value"), &val); } - - MAKE_STD_ZVAL(arg); - array_init_size(arg, 3); - zend_hash_update(Z_ARRVAL_P(prm), "arguments", sizeof("arguments"), (void *) &arg, sizeof(zval *), (void *) &state->current.args); - - zend_symtable_update(params, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void *) &prm, sizeof(zval *), (void *) &state->current.param); + // FIXME: array_init_size(&arg, 3); + array_init(&arg); + state->current.args = zend_hash_str_update(Z_ARRVAL(prm), "arguments", lenof("arguments"), &arg); + state->current.param = zend_symtable_str_update(params, Z_STRVAL(key), Z_STRLEN(key), &prm); } zval_ptr_dtor(&key); } @@ -621,7 +645,7 @@ static size_t check_sep(php_http_params_state_t *state, php_http_params_token_t return 0; } -static void skip_sep(size_t skip, php_http_params_state_t *state, php_http_params_token_t **param, php_http_params_token_t **arg, php_http_params_token_t **val TSRMLS_DC) +static void skip_sep(size_t skip, php_http_params_state_t *state, php_http_params_token_t **param, php_http_params_token_t **arg, php_http_params_token_t **val) { size_t sep_len; @@ -637,7 +661,7 @@ static void skip_sep(size_t skip, php_http_params_state_t *state, php_http_param } } -HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t *opts TSRMLS_DC) +HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t *opts) { php_http_params_state_t state = {{NULL,0}, {NULL,0}, {NULL,0}, {NULL,0}, {NULL,NULL,NULL}, 0, 0}; @@ -664,15 +688,15 @@ HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t if (!state.param.str) { /* initialize */ - skip_sep(0, &state, opts->param, opts->arg, opts->val TSRMLS_CC); + skip_sep(0, &state, opts->param, opts->arg, opts->val); state.param.str = state.input.str; } else { size_t sep_len; /* are we at a param separator? */ if (0 < (sep_len = check_sep(&state, opts->param))) { - push_param(params, &state, opts TSRMLS_CC); + push_param(params, &state, opts); - skip_sep(sep_len, &state, opts->param, opts->arg, opts->val TSRMLS_CC); + skip_sep(sep_len, &state, opts->param, opts->arg, opts->val); /* start off with a new param */ state.param.str = state.input.str; @@ -687,9 +711,9 @@ HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t } else /* are we at an arg separator? */ if (0 < (sep_len = check_sep(&state, opts->arg))) { - push_param(params, &state, opts TSRMLS_CC); + push_param(params, &state, opts); - skip_sep(sep_len, &state, NULL, opts->arg, opts->val TSRMLS_CC); + skip_sep(sep_len, &state, NULL, opts->arg, opts->val); /* continue with a new arg */ state.arg.str = state.input.str; @@ -704,9 +728,9 @@ HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t if (0 < (sep_len = check_sep(&state, opts->val))) { /* only handle separator if we're not already reading in a val */ if (!state.val.str) { - push_param(params, &state, opts TSRMLS_CC); + push_param(params, &state, opts); - skip_sep(sep_len, &state, NULL, NULL, opts->val TSRMLS_CC); + skip_sep(sep_len, &state, NULL, NULL, opts->val); state.val.str = state.input.str; state.val.len = 0; @@ -722,12 +746,12 @@ HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t } } /* finalize */ - push_param(params, &state, opts TSRMLS_CC); + push_param(params, &state, opts); return params; } -static inline void shift_key(php_http_buffer_t *buf, char *key_str, size_t key_len, const char *ass, size_t asl, unsigned flags TSRMLS_DC) +static inline void shift_key(php_http_buffer_t *buf, char *key_str, size_t key_len, const char *ass, size_t asl, unsigned flags) { char *str; size_t len; @@ -736,34 +760,39 @@ static inline void shift_key(php_http_buffer_t *buf, char *key_str, size_t key_l php_http_buffer_append(buf, ass, asl); } - prepare_key(flags, key_str, key_len, &str, &len TSRMLS_CC); + prepare_key(flags, key_str, key_len, &str, &len); php_http_buffer_append(buf, str, len); efree(str); } -static inline void shift_rfc5987(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags TSRMLS_DC) +static inline void shift_rfc5987(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags) { HashTable *ht = HASH_OF(zvalue); - zval **zdata, *tmp; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); + zval *zdata, tmp; + zend_string *zs; + php_http_arrkey_t key = {0}; - if (SUCCESS == zend_hash_get_current_data(ht, (void *) &zdata) - && HASH_KEY_NON_EXISTENT != (key.type = zend_hash_get_current_key_ex(ht, &key.str, &key.len, &key.num, key.dup, NULL)) + if ((zdata = zend_hash_get_current_data(ht)) + && HASH_KEY_NON_EXISTENT != zend_hash_get_current_key(ht, &key.key, &key.h) ) { - php_http_array_hashkey_stringify(&key); + php_http_arrkey_stringify(&key, NULL); php_http_buffer_appendf(buf, "*%.*sutf-8'%.*s'", (int) (vsl > INT_MAX ? INT_MAX : vsl), vss, - (int) (key.len > INT_MAX ? INT_MAX : key.len), key.str); - php_http_array_hashkey_stringfree(&key); + (int) (key.key->len > INT_MAX ? INT_MAX : key.key->len), key.key->val); + php_http_arrkey_dtor(&key); - tmp = php_http_zsep(1, IS_STRING, *zdata); - prepare_value(flags | PHP_HTTP_PARAMS_URLENCODED, tmp TSRMLS_CC); - php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); + if (Z_TYPE_P(zdata) == IS_INDIRECT) { + zdata = Z_INDIRECT_P(zdata); + } + zs = zval_get_string(zdata); + ZVAL_STR(&tmp, zs); + prepare_value(flags | PHP_HTTP_PARAMS_URLENCODED, &tmp); + php_http_buffer_append(buf, Z_STRVAL(tmp), Z_STRLEN(tmp)); zval_ptr_dtor(&tmp); } } -static inline void shift_rfc5988(php_http_buffer_t *buf, char *key_str, size_t key_len, const char *ass, size_t asl, unsigned flags TSRMLS_DC) +static inline void shift_rfc5988(php_http_buffer_t *buf, char *key_str, size_t key_len, const char *ass, size_t asl, unsigned flags) { char *str; size_t len; @@ -772,64 +801,77 @@ static inline void shift_rfc5988(php_http_buffer_t *buf, char *key_str, size_t k php_http_buffer_append(buf, ass, asl); } - prepare_key(flags, key_str, key_len, &str, &len TSRMLS_CC); + prepare_key(flags, key_str, key_len, &str, &len); php_http_buffer_appends(buf, "<"); php_http_buffer_append(buf, str, len); php_http_buffer_appends(buf, ">"); efree(str); } -static inline void shift_rfc5988_val(php_http_buffer_t *buf, zval *zv, const char *vss, size_t vsl, unsigned flags TSRMLS_DC) +static inline void shift_rfc5988_val(php_http_buffer_t *buf, zval *zv, const char *vss, size_t vsl, unsigned flags) { - zval *tmp = php_http_zsep(1, IS_STRING, zv); + zend_string *zs = zval_get_string(zv); - quote_string(tmp, 1 TSRMLS_CC); + quote_string(&zs, 1); php_http_buffer_append(buf, vss, vsl); - php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); + php_http_buffer_append(buf, zs->val, zs->len); - zval_ptr_dtor(&tmp); + zend_string_release(zs); } -static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags TSRMLS_DC) +static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags) { - if (Z_TYPE_P(zvalue) != IS_BOOL) { - zval *tmp = php_http_zsep(1, IS_STRING, zvalue); + zval tmp; + zend_string *zs; - prepare_value(flags, tmp TSRMLS_CC); - php_http_buffer_append(buf, vss, vsl); - php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); + switch (Z_TYPE_P(zvalue)) { + case IS_TRUE: + break; - zval_ptr_dtor(&tmp); - } else if (!Z_BVAL_P(zvalue)) { + case IS_FALSE: php_http_buffer_append(buf, vss, vsl); php_http_buffer_appends(buf, "0"); + break; + + default: + zs = zval_get_string(zvalue); + + ZVAL_STR(&tmp, zs); + prepare_value(flags, &tmp); + php_http_buffer_append(buf, vss, vsl); + php_http_buffer_append(buf, Z_STRVAL(tmp), Z_STRLEN(tmp)); + + zval_ptr_dtor(&tmp); + break; } } -static void shift_arg(php_http_buffer_t *buf, char *key_str, size_t key_len, zval *zvalue, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC) +static void shift_arg(php_http_buffer_t *buf, char *key_str, size_t key_len, zval *zvalue, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags) { if (Z_TYPE_P(zvalue) == IS_ARRAY || Z_TYPE_P(zvalue) == IS_OBJECT) { - HashPosition pos; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - zval **val; + php_http_arrkey_t key; + HashTable *ht = HASH_OF(zvalue); + zval *val; zend_bool rfc5987 = !strcmp(key_str, "*rfc5987*"); if (!rfc5987) { - shift_key(buf, key_str, key_len, ass, asl, flags TSRMLS_CC); + shift_key(buf, key_str, key_len, ass, asl, flags); } - FOREACH_KEYVAL(pos, zvalue, key, val) { + ZEND_HASH_FOREACH_KEY_VAL_IND(ht, key.h, key.key, val) + { /* did you mean recursion? */ - php_http_array_hashkey_stringify(&key); - if (rfc5987 && (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT)) { - shift_key(buf, key.str, key.len-1, ass, asl, flags TSRMLS_CC); - shift_rfc5987(buf, *val, vss, vsl, flags TSRMLS_CC); + php_http_arrkey_stringify(&key, NULL); + if (rfc5987 && (Z_TYPE_P(val) == IS_ARRAY || Z_TYPE_P(val) == IS_OBJECT)) { + shift_key(buf, key.key->val, key.key->len, ass, asl, flags); + shift_rfc5987(buf, val, vss, vsl, flags); } else { - shift_arg(buf, key.str, key.len-1, *val, ass, asl, vss, vsl, flags TSRMLS_CC); + shift_arg(buf, key.key->val, key.key->len, val, ass, asl, vss, vsl, flags); } - php_http_array_hashkey_stringfree(&key); + php_http_arrkey_dtor(&key); } + ZEND_HASH_FOREACH_END(); } else { - shift_key(buf, key_str, key_len, ass, asl, flags TSRMLS_CC); + shift_key(buf, key_str, key_len, ass, asl, flags); if (flags & PHP_HTTP_PARAMS_RFC5988) { switch (key_len) { @@ -838,60 +880,60 @@ static void shift_arg(php_http_buffer_t *buf, char *key_str, size_t key_len, zva case lenof("anchor"): /* some args must be quoted */ if (0 <= php_http_select_str(key_str, 3, "rel", "title", "anchor")) { - shift_rfc5988_val(buf, zvalue, vss, vsl, flags TSRMLS_CC); + shift_rfc5988_val(buf, zvalue, vss, vsl, flags); return; } break; } } - shift_val(buf, zvalue, vss, vsl, flags TSRMLS_CC); + shift_val(buf, zvalue, vss, vsl, flags); } } -static void shift_param(php_http_buffer_t *buf, char *key_str, size_t key_len, zval *zvalue, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags, zend_bool rfc5987 TSRMLS_DC) +static void shift_param(php_http_buffer_t *buf, char *key_str, size_t key_len, zval *zvalue, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags, zend_bool rfc5987) { if (Z_TYPE_P(zvalue) == IS_ARRAY || Z_TYPE_P(zvalue) == IS_OBJECT) { /* treat as arguments, unless we care for dimensions or rfc5987 */ if (flags & PHP_HTTP_PARAMS_DIMENSION) { php_http_buffer_t *keybuf = php_http_buffer_from_string(key_str, key_len); - prepare_dimension(buf, keybuf, zvalue, pss, psl, vss, vsl, flags TSRMLS_CC); + prepare_dimension(buf, keybuf, zvalue, pss, psl, vss, vsl, flags); php_http_buffer_free(&keybuf); } else if (rfc5987) { - shift_key(buf, key_str, key_len, pss, psl, flags TSRMLS_CC); - shift_rfc5987(buf, zvalue, vss, vsl, flags TSRMLS_CC); + shift_key(buf, key_str, key_len, pss, psl, flags); + shift_rfc5987(buf, zvalue, vss, vsl, flags); } else { - shift_arg(buf, key_str, key_len, zvalue, ass, asl, vss, vsl, flags TSRMLS_CC); + shift_arg(buf, key_str, key_len, zvalue, ass, asl, vss, vsl, flags); } } else { if (flags & PHP_HTTP_PARAMS_RFC5988) { - shift_rfc5988(buf, key_str, key_len, pss, psl, flags TSRMLS_CC); + shift_rfc5988(buf, key_str, key_len, pss, psl, flags); } else { - shift_key(buf, key_str, key_len, pss, psl, flags TSRMLS_CC); + shift_key(buf, key_str, key_len, pss, psl, flags); } - shift_val(buf, zvalue, vss, vsl, flags TSRMLS_CC); + shift_val(buf, zvalue, vss, vsl, flags); } } -php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable *params, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC) +php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable *params, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags) { - zval **zparam; - HashPosition pos, pos1; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0), key1 = php_http_array_hashkey_init(0); + zval *zparam; + php_http_arrkey_t key; zend_bool rfc5987 = 0; if (!buf) { buf = php_http_buffer_init(NULL); } - FOREACH_HASH_KEYVAL(pos, params, key, zparam) { - zval **zvalue, **zargs; + ZEND_HASH_FOREACH_KEY_VAL(params, key.h, key.key, zparam) + { + zval *zvalue, *zargs; - if (Z_TYPE_PP(zparam) != IS_ARRAY) { + if (Z_TYPE_P(zparam) != IS_ARRAY) { zvalue = zparam; } else { - if (SUCCESS != zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("value"), (void *) &zvalue)) { - if (SUCCESS != zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("*rfc5987*"), (void *) &zvalue)) { + if (!(zvalue = zend_hash_str_find(Z_ARRVAL_P(zparam), ZEND_STRL("value")))) { + if (!(zvalue = zend_hash_str_find(Z_ARRVAL_P(zparam), ZEND_STRL("*rfc5987*")))) { zvalue = zparam; } else { rfc5987 = 1; @@ -899,29 +941,37 @@ php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable * } } - php_http_array_hashkey_stringify(&key); - shift_param(buf, key.str, key.len - 1, *zvalue, pss, psl, ass, asl, vss, vsl, flags, rfc5987 TSRMLS_CC); - php_http_array_hashkey_stringfree(&key); + php_http_arrkey_stringify(&key, NULL); + shift_param(buf, key.key->val, key.key->len, zvalue, pss, psl, ass, asl, vss, vsl, flags, rfc5987); + php_http_arrkey_dtor(&key); + + if (Z_TYPE_P(zparam) == IS_ARRAY) { + zval *tmp = zend_hash_str_find(Z_ARRVAL_P(zparam), ZEND_STRL("arguments")); - if (Z_TYPE_PP(zparam) == IS_ARRAY && SUCCESS != zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("arguments"), (void *) &zvalue)) { - if (zvalue == zparam) { + if (tmp) { + zvalue = tmp; + } else if (zvalue == zparam) { continue; + } else { + zvalue = zparam; } - zvalue = zparam; } - if (Z_TYPE_PP(zvalue) == IS_ARRAY) { - FOREACH_KEYVAL(pos1, *zvalue, key1, zargs) { - if (zvalue == zparam && key1.type == HASH_KEY_IS_STRING && !strcmp(key1.str, "value")) { + if (Z_TYPE_P(zvalue) == IS_ARRAY) { + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(zvalue), key.h, key.key, zargs) + { + if (zvalue == zparam && key.key && zend_string_equals_literal(key.key, "value")) { continue; } - php_http_array_hashkey_stringify(&key1); - shift_arg(buf, key1.str, key1.len - 1, *zargs, ass, asl, vss, vsl, flags TSRMLS_CC); - php_http_array_hashkey_stringfree(&key1); + php_http_arrkey_stringify(&key, NULL); + shift_arg(buf, key.key->val, key.key->len, zargs, ass, asl, vss, vsl, flags); + php_http_arrkey_dtor(&key); } + ZEND_HASH_FOREACH_END(); } } + ZEND_HASH_FOREACH_END(); php_http_buffer_shrink(buf); php_http_buffer_fix(buf); @@ -929,31 +979,36 @@ php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable * return buf; } -php_http_params_token_t **php_http_params_separator_init(zval *zv TSRMLS_DC) +php_http_params_token_t **php_http_params_separator_init(zval *zv) { - zval **sep; - HashPosition pos; + zval *sep, ztmp; php_http_params_token_t **ret, **tmp; if (!zv) { return NULL; } - zv = php_http_ztyp(IS_ARRAY, zv); + ZVAL_DUP(&ztmp, zv); + zv = &ztmp; + convert_to_array(zv); + ret = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(zv)) + 1, sizeof(*ret)); tmp = ret; - FOREACH_VAL(pos, zv, sep) { - zval *zt = php_http_ztyp(IS_STRING, *sep); + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(zv), sep) + { + zend_string *zs = zval_get_string(sep); - if (Z_STRLEN_P(zt)) { + if (zs->len) { *tmp = emalloc(sizeof(**tmp)); - (*tmp)->str = estrndup(Z_STRVAL_P(zt), (*tmp)->len = Z_STRLEN_P(zt)); + (*tmp)->str = estrndup(zs->val, (*tmp)->len = zs->len); ++tmp; } - zval_ptr_dtor(&zt); + zend_string_release(zs); } - zval_ptr_dtor(&zv); + ZEND_HASH_FOREACH_END(); + + zval_ptr_dtor(&ztmp); *tmp = NULL; return ret; @@ -981,26 +1036,27 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams___construct, 0, 0, 0) ZEND_END_ARG_INFO(); PHP_METHOD(HttpParams, __construct) { - zval *zcopy, *zparams = NULL, *param_sep = NULL, *arg_sep = NULL, *val_sep = NULL; - long flags = PHP_HTTP_PARAMS_DEFAULT; + zval *zparams = NULL, *param_sep = NULL, *arg_sep = NULL, *val_sep = NULL; + zend_long flags = PHP_HTTP_PARAMS_DEFAULT; zend_error_handling zeh; + zend_string *zs; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!/z/z/z/l", &zparams, ¶m_sep, &arg_sep, &val_sep, &flags), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z!/z/z/z/l", &zparams, ¶m_sep, &arg_sep, &val_sep, &flags), invalid_arg, return); - zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh); { switch (ZEND_NUM_ARGS()) { case 5: - zend_update_property_long(php_http_params_class_entry, getThis(), ZEND_STRL("flags"), flags TSRMLS_CC); + zend_update_property_long(php_http_params_class_entry, getThis(), ZEND_STRL("flags"), flags); /* no break */ case 4: - zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), val_sep TSRMLS_CC); + zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), val_sep); /* no break */ case 3: - zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), arg_sep TSRMLS_CC); + zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), arg_sep); /* no break */ case 2: - zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), param_sep TSRMLS_CC); + zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), param_sep); /* no break */ } @@ -1008,54 +1064,55 @@ PHP_METHOD(HttpParams, __construct) switch (Z_TYPE_P(zparams)) { case IS_OBJECT: case IS_ARRAY: - zcopy = php_http_zsep(1, IS_ARRAY, zparams); - zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zcopy TSRMLS_CC); - zval_ptr_dtor(&zcopy); + convert_to_array(zparams); + zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams); break; default: - zcopy = php_http_ztyp(IS_STRING, zparams); - if (Z_STRLEN_P(zcopy)) { + zs = zval_get_string(zparams); + if (zs->len) { + zval tmp; + php_http_params_opts_t opts = { - {Z_STRVAL_P(zcopy), Z_STRLEN_P(zcopy)}, - php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0 TSRMLS_CC) TSRMLS_CC), - php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0 TSRMLS_CC) TSRMLS_CC), - php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0 TSRMLS_CC) TSRMLS_CC), - NULL, flags + {zs->val, zs->len}, + php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0, &tmp)), + php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0, &tmp)), + php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0, &tmp)), + {{0}}, flags }; - MAKE_STD_ZVAL(zparams); - array_init(zparams); - php_http_params_parse(Z_ARRVAL_P(zparams), &opts TSRMLS_CC); - zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams TSRMLS_CC); - zval_ptr_dtor(&zparams); + array_init(&tmp); + php_http_params_parse(Z_ARRVAL(tmp), &opts); + zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), &tmp); + zval_ptr_dtor(&tmp); php_http_params_separator_free(opts.param); php_http_params_separator_free(opts.arg); php_http_params_separator_free(opts.val); } - zval_ptr_dtor(&zcopy); + zend_string_release(zs); break; } } else { - MAKE_STD_ZVAL(zparams); - array_init(zparams); - zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams TSRMLS_CC); - zval_ptr_dtor(&zparams); + zval tmp; + + array_init(&tmp); + zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), &tmp); + zval_ptr_dtor(&tmp); } } - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_toArray, 0, 0, 0) ZEND_END_ARG_INFO(); PHP_METHOD(HttpParams, toArray) { - zval *zparams; + zval zparams_tmp, *zparams; if (SUCCESS != zend_parse_parameters_none()) { return; } - zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC); + zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp); RETURN_ZVAL(zparams, 1, 0); } @@ -1063,41 +1120,43 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_toString, 0, 0, 0) ZEND_END_ARG_INFO(); PHP_METHOD(HttpParams, toString) { - zval **tmp, *zparams, *zpsep, *zasep, *zvsep, *zflags; + zval *tmp, *zparams, *zpsep, *zasep, *zvsep; + zval zparams_tmp, flags_tmp, psep_tmp, asep_tmp, vsep_tmp; + zend_string *psep, *asep, *vsep; + long flags; php_http_buffer_t buf; - zparams = php_http_zsep(1, IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC)); - zflags = php_http_ztyp(IS_LONG, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("flags"), 0 TSRMLS_CC)); + zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp); + convert_to_array_ex(zparams); + flags = zval_get_long(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("flags"), 0, &flags_tmp)); - zpsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0 TSRMLS_CC); - if (Z_TYPE_P(zpsep) == IS_ARRAY && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zpsep), (void *) &tmp)) { - zpsep = php_http_ztyp(IS_STRING, *tmp); + zpsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0, &psep_tmp); + if (Z_TYPE_P(zpsep) == IS_ARRAY && (tmp = zend_hash_get_current_data(Z_ARRVAL_P(zpsep)))) { + psep = zval_get_string(tmp); } else { - zpsep = php_http_ztyp(IS_STRING, zpsep); + psep = zval_get_string(zpsep); } - zasep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0 TSRMLS_CC); - if (Z_TYPE_P(zasep) == IS_ARRAY && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zasep), (void *) &tmp)) { - zasep = php_http_ztyp(IS_STRING, *tmp); + zasep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0, &asep_tmp); + if (Z_TYPE_P(zasep) == IS_ARRAY && (tmp = zend_hash_get_current_data(Z_ARRVAL_P(zasep)))) { + asep = zval_get_string(tmp); } else { - zasep = php_http_ztyp(IS_STRING, zasep); + asep = zval_get_string(zasep); } - zvsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0 TSRMLS_CC); - if (Z_TYPE_P(zvsep) == IS_ARRAY && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zvsep), (void *) &tmp)) { - zvsep = php_http_ztyp(IS_STRING, *tmp); + zvsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0, &vsep_tmp); + if (Z_TYPE_P(zvsep) == IS_ARRAY && (tmp = zend_hash_get_current_data(Z_ARRVAL_P(zvsep)))) { + vsep = zval_get_string(tmp); } else { - zvsep = php_http_ztyp(IS_STRING, zvsep); + vsep = zval_get_string(zvsep); } php_http_buffer_init(&buf); - php_http_params_to_string(&buf, Z_ARRVAL_P(zparams), Z_STRVAL_P(zpsep), Z_STRLEN_P(zpsep), Z_STRVAL_P(zasep), Z_STRLEN_P(zasep), Z_STRVAL_P(zvsep), Z_STRLEN_P(zvsep), Z_LVAL_P(zflags) TSRMLS_CC); + php_http_params_to_string(&buf, Z_ARRVAL_P(zparams), psep->val, psep->len, asep->val, asep->len, vsep->val, vsep->len, flags); - zval_ptr_dtor(&zparams); - zval_ptr_dtor(&zpsep); - zval_ptr_dtor(&zasep); - zval_ptr_dtor(&zvsep); - zval_ptr_dtor(&zflags); + zend_string_release(psep); + zend_string_release(asep); + zend_string_release(vsep); - RETVAL_PHP_HTTP_BUFFER_VAL(&buf); + RETVAL_STR(php_http_cs2zs(buf.data, buf.used)); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetExists, 0, 0, 1) @@ -1105,22 +1164,20 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetExists, 0, 0, 1) ZEND_END_ARG_INFO(); PHP_METHOD(HttpParams, offsetExists) { - char *name_str; - int name_len; - zval **zparam, *zparams; + zend_string *name; + zval zparams_tmp, *zparam, *zparams; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name)) { return; } - zparams = php_http_ztyp(IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC)); + zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp); - if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(zparams), name_str, name_len + 1, (void *) &zparam)) { - RETVAL_BOOL(Z_TYPE_PP(zparam) != IS_NULL); + if (Z_TYPE_P(zparams) == IS_ARRAY && (zparam = zend_symtable_find(Z_ARRVAL_P(zparams), name))) { + RETVAL_BOOL(Z_TYPE_P(zparam) != IS_NULL); } else { RETVAL_FALSE; } - zval_ptr_dtor(&zparams); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetGet, 0, 0, 1) @@ -1128,21 +1185,18 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetGet, 0, 0, 1) ZEND_END_ARG_INFO(); PHP_METHOD(HttpParams, offsetGet) { - char *name_str; - int name_len; - zval **zparam, *zparams; + zend_string *name; + zval zparams_tmp, *zparam, *zparams; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name)) { return; } - zparams = php_http_ztyp(IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC)); + zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp); - if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(zparams), name_str, name_len + 1, (void *) &zparam)) { - RETVAL_ZVAL(*zparam, 1, 0); + if (Z_TYPE_P(zparams) == IS_ARRAY && (zparam = zend_symtable_find(Z_ARRVAL_P(zparams), name))) { + RETVAL_ZVAL(zparam, 1, 0); } - - zval_ptr_dtor(&zparams); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetUnset, 0, 0, 1) @@ -1150,20 +1204,18 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetUnset, 0, 0, 1) ZEND_END_ARG_INFO(); PHP_METHOD(HttpParams, offsetUnset) { - char *name_str; - int name_len; - zval *zparams; + zend_string *name; + zval zparams_tmp, *zparams; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name)) { return; } - zparams = php_http_zsep(1, IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC)); + zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp); - zend_symtable_del(Z_ARRVAL_P(zparams), name_str, name_len + 1); - zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams TSRMLS_CC); - - zval_ptr_dtor(&zparams); + if (Z_TYPE_P(zparams) == IS_ARRAY) { + zend_symtable_del(Z_ARRVAL_P(zparams), name); + } } ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetSet, 0, 0, 2) @@ -1172,55 +1224,48 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_offsetSet, 0, 0, 2) ZEND_END_ARG_INFO(); PHP_METHOD(HttpParams, offsetSet) { - zval *nvalue; - char *name_str; - int name_len; - zval **zparam, *zparams; + zend_string *name; + zval zparams_tmp, *zparam, *zparams, *nvalue; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &name_str, &name_len, &nvalue)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "Sz", &name, &nvalue)) { return; } - zparams = php_http_zsep(1, IS_ARRAY, zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0 TSRMLS_CC)); + zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp); + convert_to_array(zparams); - if (name_len) { + if (name->len) { if (Z_TYPE_P(nvalue) == IS_ARRAY) { - zval *new_zparam; - - if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(zparams), name_str, name_len + 1, (void *) &zparam)) { - new_zparam = php_http_zsep(1, IS_ARRAY, *zparam); - array_join(Z_ARRVAL_P(nvalue), Z_ARRVAL_P(new_zparam), 0, 0); + if ((zparam = zend_symtable_find(Z_ARRVAL_P(zparams), name))) { + convert_to_array(zparam); + array_join(Z_ARRVAL_P(nvalue), Z_ARRVAL_P(zparam), 0, 0); } else { - new_zparam = nvalue; - Z_ADDREF_P(new_zparam); + Z_TRY_ADDREF_P(nvalue); + add_assoc_zval_ex(zparams, name->val, name->len, nvalue); } - add_assoc_zval_ex(zparams, name_str, name_len + 1, new_zparam); } else { - zval *tmp; + zval tmp; - if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(zparams), name_str, name_len + 1, (void *) &zparam)) { - tmp = php_http_zsep(1, IS_ARRAY, *zparam); + if ((zparam = zend_symtable_find(Z_ARRVAL_P(zparams), name))) { + ZVAL_DUP(&tmp, zparam); + convert_to_array(&tmp); } else { - MAKE_STD_ZVAL(tmp); - array_init(tmp); + array_init(&tmp); } - Z_ADDREF_P(nvalue); - add_assoc_zval_ex(tmp, ZEND_STRS("value"), nvalue); - add_assoc_zval_ex(zparams, name_str, name_len + 1, tmp); + Z_TRY_ADDREF_P(nvalue); + add_assoc_zval_ex(&tmp, ZEND_STRL("value"), nvalue); + add_assoc_zval_ex(zparams, name->val, name->len, &tmp); } } else { - zval *tmp = php_http_ztyp(IS_STRING, nvalue), *arr; + zval arr; + zend_string *zs = zval_get_string(nvalue); - MAKE_STD_ZVAL(arr); - array_init(arr); - add_assoc_bool_ex(arr, ZEND_STRS("value"), 1); - add_assoc_zval_ex(zparams, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp) + 1, arr); - zval_ptr_dtor(&tmp); + array_init(&arr); + add_assoc_bool_ex(&arr, ZEND_STRL("value"), 1); + add_assoc_zval_ex(zparams, zs->val, zs->len, &arr); + zend_string_release(zs); } - - zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams TSRMLS_CC); - zval_ptr_dtor(&zparams); } static zend_function_entry php_http_params_methods[] = { @@ -1245,29 +1290,29 @@ PHP_MINIT_FUNCTION(http_params) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http", "Params", php_http_params_methods); - php_http_params_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_http_params_class_entry = zend_register_internal_class(&ce); php_http_params_class_entry->create_object = php_http_params_object_new; - zend_class_implements(php_http_params_class_entry TSRMLS_CC, 1, zend_ce_arrayaccess); - - zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_PARAM_SEP"), ZEND_STRL(",") TSRMLS_CC); - zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_ARG_SEP"), ZEND_STRL(";") TSRMLS_CC); - zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_VAL_SEP"), ZEND_STRL("=") TSRMLS_CC); - zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("COOKIE_PARAM_SEP"), ZEND_STRL("") TSRMLS_CC); - - zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_PARAMS_RAW TSRMLS_CC); - zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_ESCAPED"), PHP_HTTP_PARAMS_ESCAPED TSRMLS_CC); - zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_URLENCODED"), PHP_HTTP_PARAMS_URLENCODED TSRMLS_CC); - zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_DIMENSION"), PHP_HTTP_PARAMS_DIMENSION TSRMLS_CC); - zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_RFC5987"), PHP_HTTP_PARAMS_RFC5987 TSRMLS_CC); - zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_RFC5988"), PHP_HTTP_PARAMS_RFC5988 TSRMLS_CC); - zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_DEFAULT"), PHP_HTTP_PARAMS_DEFAULT TSRMLS_CC); - zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_QUERY"), PHP_HTTP_PARAMS_QUERY TSRMLS_CC); - - zend_declare_property_null(php_http_params_class_entry, ZEND_STRL("params"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("param_sep"), ZEND_STRL(","), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("arg_sep"), ZEND_STRL(";"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("val_sep"), ZEND_STRL("="), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_long(php_http_params_class_entry, ZEND_STRL("flags"), PHP_HTTP_PARAMS_DEFAULT, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_class_implements(php_http_params_class_entry, 1, zend_ce_arrayaccess); + + zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_PARAM_SEP"), ZEND_STRL(",")); + zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_ARG_SEP"), ZEND_STRL(";")); + zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("DEF_VAL_SEP"), ZEND_STRL("=")); + zend_declare_class_constant_stringl(php_http_params_class_entry, ZEND_STRL("COOKIE_PARAM_SEP"), ZEND_STRL("")); + + zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_PARAMS_RAW); + zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_ESCAPED"), PHP_HTTP_PARAMS_ESCAPED); + zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_URLENCODED"), PHP_HTTP_PARAMS_URLENCODED); + zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_DIMENSION"), PHP_HTTP_PARAMS_DIMENSION); + zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_RFC5987"), PHP_HTTP_PARAMS_RFC5987); + zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_RFC5988"), PHP_HTTP_PARAMS_RFC5988); + zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_DEFAULT"), PHP_HTTP_PARAMS_DEFAULT); + zend_declare_class_constant_long(php_http_params_class_entry, ZEND_STRL("PARSE_QUERY"), PHP_HTTP_PARAMS_QUERY); + + zend_declare_property_null(php_http_params_class_entry, ZEND_STRL("params"), ZEND_ACC_PUBLIC); + zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("param_sep"), ZEND_STRL(","), ZEND_ACC_PUBLIC); + zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("arg_sep"), ZEND_STRL(";"), ZEND_ACC_PUBLIC); + zend_declare_property_stringl(php_http_params_class_entry, ZEND_STRL("val_sep"), ZEND_STRL("="), ZEND_ACC_PUBLIC); + zend_declare_property_long(php_http_params_class_entry, ZEND_STRL("flags"), PHP_HTTP_PARAMS_DEFAULT, ZEND_ACC_PUBLIC); return SUCCESS; } diff --git a/src/php_http_params.h b/src/php_http_params.h index e1ebe27..b889210 100644 --- a/src/php_http_params.h +++ b/src/php_http_params.h @@ -32,15 +32,15 @@ typedef struct php_http_params_opts { php_http_params_token_t **param; php_http_params_token_t **arg; php_http_params_token_t **val; - zval *defval; + zval defval; unsigned flags; } php_http_params_opts_t; PHP_HTTP_API php_http_params_opts_t *php_http_params_opts_default_get(php_http_params_opts_t *opts); -PHP_HTTP_API HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t *opts TSRMLS_DC); -PHP_HTTP_API php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable *params, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC); +PHP_HTTP_API HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t *opts); +PHP_HTTP_API php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable *params, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags); -PHP_HTTP_API php_http_params_token_t **php_http_params_separator_init(zval *zv TSRMLS_DC); +PHP_HTTP_API php_http_params_token_t **php_http_params_separator_init(zval *zv); PHP_HTTP_API void php_http_params_separator_free(php_http_params_token_t **separator); typedef php_http_object_t php_http_params_object_t; diff --git a/src/php_http_querystring.c b/src/php_http_querystring.c index d72337f..5f4eff8 100644 --- a/src/php_http_querystring.c +++ b/src/php_http_querystring.c @@ -25,52 +25,60 @@ #define QS_MERGE 1 -static inline void php_http_querystring_set(zval *instance, zval *params, int flags TSRMLS_DC) +static inline void php_http_querystring_set(zval *instance, zval *params, int flags) { - zval *qa; + zval qa; + + array_init(&qa); if (flags & QS_MERGE) { - qa = php_http_zsep(1, IS_ARRAY, zend_read_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), 0 TSRMLS_CC)); - } else { - MAKE_STD_ZVAL(qa); - array_init(qa); + zval old_tmp, *old = zend_read_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), 0, &old_tmp); + + ZVAL_DEREF(old); + if (Z_TYPE_P(old) == IS_ARRAY) { + array_copy(Z_ARRVAL_P(old), Z_ARRVAL(qa)); + } } - php_http_querystring_update(qa, params, NULL TSRMLS_CC); - zend_update_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), qa TSRMLS_CC); + php_http_querystring_update(&qa, params, NULL); + zend_update_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), &qa); zval_ptr_dtor(&qa); } -static inline void php_http_querystring_str(zval *instance, zval *return_value TSRMLS_DC) +static inline void php_http_querystring_str(zval *instance, zval *return_value) { - zval *qa = zend_read_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), 0 TSRMLS_CC); + zval qa_tmp, *qa = zend_read_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), 0, &qa_tmp); + ZVAL_DEREF(qa); if (Z_TYPE_P(qa) == IS_ARRAY) { - php_http_querystring_update(qa, NULL, return_value TSRMLS_CC); + php_http_querystring_update(qa, NULL, return_value); } else { RETURN_EMPTY_STRING(); } } -static inline void php_http_querystring_get(zval *this_ptr, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value TSRMLS_DC) +static inline void php_http_querystring_get(zval *instance, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value) { - zval **arrval, *qarray = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); + zval *arrval, qarray_tmp, *qarray = zend_read_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), 0, &qarray_tmp); + + ZVAL_DEREF(qarray); + if ((Z_TYPE_P(qarray) == IS_ARRAY) && (arrval = zend_symtable_str_find(Z_ARRVAL_P(qarray), name, name_len))) { + if (type && type != Z_TYPE_P(arrval)) { + zval tmp; - if ((Z_TYPE_P(qarray) == IS_ARRAY) && (SUCCESS == zend_symtable_find(Z_ARRVAL_P(qarray), name, name_len + 1, (void *) &arrval))) { - if (type) { - zval *value = php_http_ztyp(type, *arrval); - RETVAL_ZVAL(value, 1, 1); + ZVAL_DUP(&tmp, arrval); + convert_to_explicit_type(&tmp, type); + RETVAL_ZVAL(&tmp, 0, 0); } else { - RETVAL_ZVAL(*arrval, 1, 0); + RETVAL_ZVAL(arrval, 1, 0); } if (del) { - zval *delarr; + zval delarr; - MAKE_STD_ZVAL(delarr); - array_init(delarr); - add_assoc_null_ex(delarr, name, name_len + 1); - php_http_querystring_set(this_ptr, delarr, QS_MERGE TSRMLS_CC); + array_init(&delarr); + add_assoc_null_ex(&delarr, name, name_len); + php_http_querystring_set(instance, &delarr, QS_MERGE); zval_ptr_dtor(&delarr); } } else if(defval) { @@ -79,89 +87,85 @@ static inline void php_http_querystring_get(zval *this_ptr, int type, char *name } #ifdef PHP_HTTP_HAVE_ICONV -ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe TSRMLS_DC) +ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe) { - HashPosition pos; - zval **entry = NULL; - char *xlate_str = NULL, *xkey; - size_t xlate_len = 0, xlen; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); + zval *entry; + zend_string *xkey, *xstr; + php_http_arrkey_t key; - FOREACH_KEYVAL(pos, src, key, entry) { - if (key.type == HASH_KEY_IS_STRING) { - if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.str, key.len-1, &xkey, &xlen, oe, ie)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'", key.len-1, key.str, ie, oe); + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(src), key.h, key.key, entry) + { + if (key.key) { + if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.key->val, key.key->len, &xkey, oe, ie)) { + php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'", key.key->len, key.key->val, ie, oe); return FAILURE; } } - if (Z_TYPE_PP(entry) == IS_STRING) { - if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), &xlate_str, &xlate_len, oe, ie)) { - if (key.type == HASH_KEY_IS_STRING) { - efree(xkey); + if (Z_TYPE_P(entry) == IS_STRING) { + if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(Z_STRVAL_P(entry), Z_STRLEN_P(entry), &xstr, oe, ie)) { + if (key.key) { + zend_string_release(xkey); } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'", Z_STRLEN_PP(entry), Z_STRVAL_PP(entry), ie, oe); + php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'", Z_STRLEN_P(entry), Z_STRVAL_P(entry), ie, oe); return FAILURE; } - if (key.type == HASH_KEY_IS_STRING) { - add_assoc_stringl_ex(dst, xkey, xlen+1, xlate_str, xlate_len, 0); + if (key.key) { + add_assoc_str_ex(dst, xkey->val, xkey->len, xstr); } else { - add_index_stringl(dst, key.num, xlate_str, xlate_len, 0); + add_index_str(dst, key.h, xstr); } - } else if (Z_TYPE_PP(entry) == IS_ARRAY) { - zval *subarray; + } else if (Z_TYPE_P(entry) == IS_ARRAY) { + zval subarray; - MAKE_STD_ZVAL(subarray); - array_init(subarray); - if (key.type == HASH_KEY_IS_STRING) { - add_assoc_zval_ex(dst, xkey, xlen+1, subarray); + array_init(&subarray); + if (key.key) { + add_assoc_zval_ex(dst, xkey->val, xkey->len, &subarray); } else { - add_index_zval(dst, key.num, subarray); + add_index_zval(dst, key.h, &subarray); } - if (SUCCESS != php_http_querystring_xlate(subarray, *entry, ie, oe TSRMLS_CC)) { - if (key.type == HASH_KEY_IS_STRING) { - efree(xkey); + if (SUCCESS != php_http_querystring_xlate(&subarray, entry, ie, oe)) { + if (key.key) { + zend_string_release(xkey); } return FAILURE; } } - if (key.type == HASH_KEY_IS_STRING) { - efree(xkey); + if (key.key) { + zend_string_release(xkey); } } + ZEND_HASH_FOREACH_END(); + return SUCCESS; } #endif /* HAVE_ICONV */ -ZEND_RESULT_CODE php_http_querystring_ctor(zval *instance, zval *params TSRMLS_DC) +ZEND_RESULT_CODE php_http_querystring_ctor(zval *instance, zval *params) { - php_http_querystring_set(instance, params, 0 TSRMLS_CC); + php_http_querystring_set(instance, params, 0); return SUCCESS; } -static int apply_querystring(void *pData TSRMLS_DC) +static int apply_querystring(zval *val) { - zval **val = pData; + if (Z_TYPE_P(val) == IS_ARRAY) { + zval *zvalue; - if (Z_TYPE_PP(val) == IS_ARRAY) { - zval **zvalue; + if ((zvalue = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("value")))) { + zval tmp; - if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(val), ZEND_STRS("value"), (void *) &zvalue)) { - zval *tmp = *val; - - Z_ADDREF_PP(zvalue); - *val = *zvalue; - zval_dtor(tmp); - Z_TYPE_P(tmp) = IS_NULL; - zval_ptr_dtor(&tmp); + ZVAL_COPY(&tmp, zvalue); + zval_dtor(val); + ZVAL_COPY_VALUE(val, &tmp); } } return ZEND_HASH_APPLY_KEEP; } -ZEND_RESULT_CODE php_http_querystring_parse(HashTable *ht, const char *str, size_t len TSRMLS_DC) +ZEND_RESULT_CODE php_http_querystring_parse(HashTable *ht, const char *str, size_t len) { ZEND_RESULT_CODE rv = FAILURE; php_http_params_opts_t opts; @@ -177,26 +181,23 @@ ZEND_RESULT_CODE php_http_querystring_parse(HashTable *ht, const char *str, size opts.val = vsepp; opts.flags = PHP_HTTP_PARAMS_QUERY; - if (SUCCESS == php_http_ini_entry(ZEND_STRL("arg_separator.input"), &asi_str, &asi_len, 0 TSRMLS_CC) && asi_len) { - zval *arr; + if (SUCCESS == php_http_ini_entry(ZEND_STRL("arg_separator.input"), &asi_str, &asi_len, 0) && asi_len) { + zval arr; - MAKE_STD_ZVAL(arr); - array_init_size(arr, asi_len); + array_init_size(&arr, asi_len); do { - add_next_index_stringl(arr, asi_str++, 1, 1); + add_next_index_stringl(&arr, asi_str++, 1); } while (*asi_str); - opts.param = php_http_params_separator_init(arr TSRMLS_CC); - + opts.param = php_http_params_separator_init(&arr); zval_ptr_dtor(&arr); } - MAKE_STD_ZVAL(opts.defval); - ZVAL_NULL(opts.defval); + ZVAL_NULL(&opts.defval); - if (php_http_params_parse(ht, &opts TSRMLS_CC)) { - zend_hash_apply(ht, apply_querystring TSRMLS_CC); + if (php_http_params_parse(ht, &opts)) { + zend_hash_apply(ht, apply_querystring); rv = SUCCESS; } @@ -209,7 +210,7 @@ ZEND_RESULT_CODE php_http_querystring_parse(HashTable *ht, const char *str, size return rv; } -ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *outstring TSRMLS_DC) +ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *outstring) { /* enforce proper type */ if (Z_TYPE_P(qarray) != IS_ARRAY) { @@ -218,90 +219,91 @@ ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *o /* modify qarray */ if (params) { - HashPosition pos; - HashTable *ptr; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - zval **params_entry, **qarray_entry; - zval zv, *zv_ptr = NULL; + HashTable *ht; + php_http_arrkey_t key; + zval zv, *params_entry, *qarray_entry; - INIT_PZVAL(&zv); ZVAL_NULL(&zv); /* squeeze the hash out of the zval */ - if (Z_TYPE_P(params) == IS_OBJECT && instanceof_function(Z_OBJCE_P(params), php_http_querystring_class_entry TSRMLS_CC)) { - zv_ptr = php_http_ztyp(IS_ARRAY, zend_read_property(php_http_querystring_class_entry, params, ZEND_STRL("queryArray"), 0 TSRMLS_CC)); - ptr = Z_ARRVAL_P(zv_ptr); + if (Z_TYPE_P(params) == IS_OBJECT && instanceof_function(Z_OBJCE_P(params), php_http_querystring_class_entry)) { + zval qa_tmp, *qa = zend_read_property(php_http_querystring_class_entry, params, ZEND_STRL("queryArray"), 0, &qa_tmp); + + ZVAL_DEREF(qa); + convert_to_array(qa); + ht = Z_ARRVAL_P(qa); } else if (Z_TYPE_P(params) == IS_OBJECT || Z_TYPE_P(params) == IS_ARRAY) { - ptr = HASH_OF(params); + ht = HASH_OF(params); } else { - zv_ptr = php_http_ztyp(IS_STRING, params); + zend_string *zs = zval_get_string(params); + array_init(&zv); - php_http_querystring_parse(Z_ARRVAL(zv), Z_STRVAL_P(zv_ptr), Z_STRLEN_P(zv_ptr) TSRMLS_CC); - zval_ptr_dtor(&zv_ptr); - zv_ptr = NULL; - ptr = Z_ARRVAL(zv); + php_http_querystring_parse(Z_ARRVAL(zv), zs->val, zs->len); + zend_string_release(zs); + + ht = Z_ARRVAL(zv); } - FOREACH_HASH_KEYVAL(pos, ptr, key, params_entry) { + ZEND_HASH_FOREACH_KEY_VAL_IND(ht, key.h, key.key, params_entry) + { /* only public properties */ - if (key.type != HASH_KEY_IS_STRING || *key.str) { - if (Z_TYPE_PP(params_entry) == IS_NULL) { + if (!key.key || *key.key->val) { + if (Z_TYPE_P(params_entry) == IS_NULL) { /* * delete */ - if (key.type == HASH_KEY_IS_STRING) { - zend_hash_del(Z_ARRVAL_P(qarray), key.str, key.len); + if (key.key) { + zend_hash_del(Z_ARRVAL_P(qarray), key.key); } else { - zend_hash_index_del(Z_ARRVAL_P(qarray), key.num); + zend_hash_index_del(Z_ARRVAL_P(qarray), key.h); } - } else if ( ((key.type == HASH_KEY_IS_STRING) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), key.str, key.len, (void *) &qarray_entry))) - || ((key.type == HASH_KEY_IS_LONG) && (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(qarray), key.num, (void *) &qarray_entry)))) { + } else if ( ((key.key) && (qarray_entry = zend_hash_find(Z_ARRVAL_P(qarray), key.key))) + || ((!key.key) && (qarray_entry = zend_hash_index_find(Z_ARRVAL_P(qarray), key.h)))) { /* * update */ - zval equal, *entry = NULL; + zval equal, tmp, *entry = &tmp; + ZVAL_UNDEF(&tmp); /* recursive */ - if (Z_TYPE_PP(params_entry) == IS_ARRAY || Z_TYPE_PP(params_entry) == IS_OBJECT) { - entry = php_http_zsep(1, IS_ARRAY, *qarray_entry); - php_http_querystring_update(entry, *params_entry, NULL TSRMLS_CC); - } else if ((FAILURE == is_equal_function(&equal, *qarray_entry, *params_entry TSRMLS_CC)) || !Z_BVAL(equal)) { - Z_ADDREF_PP(params_entry); - entry = *params_entry; + if (Z_TYPE_P(params_entry) == IS_ARRAY || Z_TYPE_P(params_entry) == IS_OBJECT) { + ZVAL_DUP(entry, qarray_entry); + convert_to_array(entry); + php_http_querystring_update(entry, params_entry, NULL); + } else if ((FAILURE == is_equal_function(&equal, qarray_entry, params_entry)) || Z_TYPE(equal) != IS_TRUE) { + Z_TRY_ADDREF_P(params_entry); + entry = params_entry; } if (entry) { - if (key.type == HASH_KEY_IS_STRING) { - zend_hash_update(Z_ARRVAL_P(qarray), key.str, key.len, (void *) &entry, sizeof(zval *), NULL); + if (key.key) { + zend_hash_update(Z_ARRVAL_P(qarray), key.key, entry); } else { - zend_hash_index_update(Z_ARRVAL_P(qarray), key.num, (void *) &entry, sizeof(zval *), NULL); + zend_hash_index_update(Z_ARRVAL_P(qarray), key.h, entry); } } } else { - zval *entry; + zval entry, *entry_ptr = &entry; /* * add */ - if (Z_TYPE_PP(params_entry) == IS_OBJECT) { - MAKE_STD_ZVAL(entry); - array_init(entry); - php_http_querystring_update(entry, *params_entry, NULL TSRMLS_CC); + if (Z_TYPE_P(params_entry) == IS_OBJECT) { + array_init(&entry); + php_http_querystring_update(&entry, params_entry, NULL); } else { - Z_ADDREF_PP(params_entry); - entry = *params_entry; + Z_TRY_ADDREF_P(params_entry); + entry_ptr = params_entry; } - if (key.type == HASH_KEY_IS_STRING) { - add_assoc_zval_ex(qarray, key.str, key.len, entry); + if (key.key) { + add_assoc_zval_ex(qarray, key.key->val, key.key->len, entry_ptr); } else { - add_index_zval(qarray, key.num, entry); + add_index_zval(qarray, key.h, entry_ptr); } } } } - /* clean up */ - if (zv_ptr) { - zval_ptr_dtor(&zv_ptr); - } + ZEND_HASH_FOREACH_END(); + zval_dtor(&zv); } @@ -310,11 +312,11 @@ ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *o char *s; size_t l; - if (SUCCESS == php_http_url_encode_hash(Z_ARRVAL_P(qarray), NULL, 0, &s, &l TSRMLS_CC)) { + if (SUCCESS == php_http_url_encode_hash(Z_ARRVAL_P(qarray), NULL, 0, &s, &l)) { zval_dtor(outstring); - ZVAL_STRINGL(outstring, s, l, 0); + ZVAL_STR(outstring, php_http_cs2zs(s, l)); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to encode query string"); + php_error_docref(NULL, E_WARNING, "Failed to encode query string"); return FAILURE; } } @@ -330,63 +332,53 @@ PHP_METHOD(HttpQueryString, __construct) zval *params = NULL; zend_error_handling zeh; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", ¶ms), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z", ¶ms), invalid_arg, return); - zend_replace_error_handling(EH_THROW, php_http_exception_bad_querystring_class_entry, &zeh TSRMLS_CC); - php_http_querystring_set(getThis(), params, 0 TSRMLS_CC); - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_bad_querystring_class_entry, &zeh); + php_http_querystring_set(getThis(), params, 0); + zend_restore_error_handling(&zeh); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_getGlobalInstance, 0, 0, 0) ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, getGlobalInstance) { - zval *instance; + zval *instance, *_GET; + zend_string *zs; php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - instance = *zend_std_get_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), 0 PHP_HTTP_ZEND_LITERAL_CCN TSRMLS_CC); - - if (Z_TYPE_P(instance) != IS_OBJECT) { - zval **_GET = NULL; - - zend_is_auto_global("_GET", lenof("_GET") TSRMLS_CC); + zs = zend_string_init(ZEND_STRL("instance"), 0); + instance = zend_std_get_static_property(php_http_querystring_class_entry, zs, 0); + zend_string_release(zs); - if ((SUCCESS == zend_hash_find(&EG(symbol_table), "_GET", sizeof("_GET"), (void *) &_GET)) - && (Z_TYPE_PP(_GET) == IS_ARRAY) - ) { - MAKE_STD_ZVAL(instance); - ZVAL_OBJVAL(instance, php_http_querystring_object_new(php_http_querystring_class_entry TSRMLS_CC), 0); + if (Z_TYPE_P(instance) == IS_OBJECT) { + RETVAL_ZVAL(instance, 1, 0); + } else if ((_GET = php_http_env_get_superglobal(ZEND_STRL("_GET")))) { + ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry)); - SEPARATE_ZVAL_TO_MAKE_IS_REF(_GET); - convert_to_array(*_GET); - zend_update_property(php_http_querystring_class_entry, instance, ZEND_STRL("queryArray"), *_GET TSRMLS_CC); + ZVAL_MAKE_REF(_GET); + zend_update_property(php_http_querystring_class_entry, return_value, ZEND_STRL("queryArray"), _GET); - zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), instance TSRMLS_CC); - zval_ptr_dtor(&instance); - } else { - php_http_throw(unexpected_val, "Could not acquire reference to superglobal GET array", NULL); - } + zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), return_value); + } else { + php_http_throw(unexpected_val, "Could not acquire reference to superglobal GET array", NULL); } - RETVAL_ZVAL(instance, 1, 0); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_getIterator, 0, 0, 0) ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, getIterator) { - zval *retval = NULL, *qa; + zval qa_tmp, *qa; php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return); - qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); + qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &qa_tmp); object_init_ex(return_value, spl_ce_RecursiveArrayIterator); - zend_call_method_with_1_params(&return_value, spl_ce_RecursiveArrayIterator, NULL, "__construct", &retval, qa); - if (retval) { - zval_ptr_dtor(&retval); - } + zend_call_method_with_1_params(return_value, spl_ce_RecursiveArrayIterator, NULL, "__construct", NULL, qa); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_toString, 0, 0, 0) @@ -396,20 +388,20 @@ PHP_METHOD(HttpQueryString, toString) if (SUCCESS != zend_parse_parameters_none()) { return; } - php_http_querystring_str(getThis(), return_value TSRMLS_CC); + php_http_querystring_str(getThis(), return_value); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_toArray, 0, 0, 0) ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, toArray) { - zval *zqa; + zval zqa_tmp, *zqa; if (SUCCESS != zend_parse_parameters_none()) { return; } - zqa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); + zqa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &zqa_tmp); RETURN_ZVAL(zqa, 1, 0); } @@ -422,12 +414,12 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, get) { char *name_str = NULL; - int name_len = 0; - long type = 0; + size_t name_len = 0; + zend_long type = 0; zend_bool del = 0; zval *ztype = NULL, *defval = NULL; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|szzb", &name_str, &name_len, &ztype, &defval, &del)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|szzb", &name_str, &name_len, &ztype, &defval, &del)) { if (name_str && name_len) { if (ztype) { if (Z_TYPE_P(ztype) == IS_LONG) { @@ -453,9 +445,9 @@ PHP_METHOD(HttpQueryString, get) } } } - php_http_querystring_get(getThis(), type, name_str, name_len, defval, del, return_value TSRMLS_CC); + php_http_querystring_get(getThis(), type, name_str, name_len, defval, del, return_value); } else { - php_http_querystring_str(getThis(), return_value TSRMLS_CC); + php_http_querystring_str(getThis(), return_value); } } } @@ -467,11 +459,11 @@ PHP_METHOD(HttpQueryString, set) { zval *params; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "z", ¶ms)) { return; } - php_http_querystring_set(getThis(), params, QS_MERGE TSRMLS_CC); + php_http_querystring_set(getThis(), params, QS_MERGE); RETVAL_ZVAL(getThis(), 1, 0); } @@ -480,15 +472,17 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_mod, 0, 0, 0) ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, mod) { - zval *params; + zval qa_tmp, *params, *instance = getThis(); zend_error_handling zeh; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z", ¶ms), invalid_arg, return); - zend_replace_error_handling(EH_THROW, php_http_exception_bad_querystring_class_entry, &zeh TSRMLS_CC); - ZVAL_OBJVAL(return_value, Z_OBJ_HT_P(getThis())->clone_obj(getThis() TSRMLS_CC), 0); - php_http_querystring_set(return_value, params, QS_MERGE TSRMLS_CC); - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_bad_querystring_class_entry, &zeh); + ZVAL_OBJ(return_value, Z_OBJ_HT_P(instance)->clone_obj(instance)); + /* make sure we do not inherit the reference to _GET */ + SEPARATE_ZVAL(zend_read_property(Z_OBJCE_P(return_value), return_value, ZEND_STRL("queryArray"), 0, &qa_tmp)); + php_http_querystring_set(return_value, params, QS_MERGE); + zend_restore_error_handling(&zeh); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString___getter, 0, 0, 1) @@ -500,14 +494,14 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, method) \ { \ char *name; \ - int name_len; \ + size_t name_len; \ zval *defval = NULL; \ zend_bool del = 0; \ - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|zb", &name, &name_len, &defval, &del)) { \ - php_http_querystring_get(getThis(), TYPE, name, name_len, defval, del, return_value TSRMLS_CC); \ + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|zb", &name, &name_len, &defval, &del)) { \ + php_http_querystring_get(getThis(), TYPE, name, name_len, defval, del, return_value); \ } \ } -PHP_HTTP_QUERYSTRING_GETTER(getBool, IS_BOOL); +PHP_HTTP_QUERYSTRING_GETTER(getBool, _IS_BOOL); PHP_HTTP_QUERYSTRING_GETTER(getInt, IS_LONG); PHP_HTTP_QUERYSTRING_GETTER(getFloat, IS_DOUBLE); PHP_HTTP_QUERYSTRING_GETTER(getString, IS_STRING); @@ -522,26 +516,25 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, xlate) { char *ie, *oe; - int ie_len, oe_len; - zval *na, *qa; + size_t ie_len, oe_len; + zval na, qa_tmp, *qa; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &ie, &ie_len, &oe, &oe_len), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &ie, &ie_len, &oe, &oe_len), invalid_arg, return); - MAKE_STD_ZVAL(na); - array_init(na); - qa = php_http_ztyp(IS_ARRAY, zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC)); + array_init(&na); + qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &qa_tmp); + ZVAL_DEREF(qa); + convert_to_array(qa); - php_http_expect(SUCCESS == php_http_querystring_xlate(na, qa, ie, oe TSRMLS_CC), bad_conversion, + php_http_expect(SUCCESS == php_http_querystring_xlate(&na, qa, ie, oe), bad_conversion, zval_ptr_dtor(&na); - zval_ptr_dtor(&qa); return; ); - php_http_querystring_set(getThis(), na, 0 TSRMLS_CC); + php_http_querystring_set(getThis(), &na, 0); RETVAL_ZVAL(getThis(), 1, 0); zval_ptr_dtor(&na); - zval_ptr_dtor(&qa); } #endif /* HAVE_ICONV */ @@ -552,7 +545,7 @@ PHP_METHOD(HttpQueryString, serialize) if (SUCCESS != zend_parse_parameters_none()) { return; } - php_http_querystring_str(getThis(), return_value TSRMLS_CC); + php_http_querystring_str(getThis(), return_value); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_unserialize, 0, 0, 1) @@ -562,14 +555,14 @@ PHP_METHOD(HttpQueryString, unserialize) { zval *serialized; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &serialized)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "z", &serialized)) { return; } if (Z_TYPE_P(serialized) == IS_STRING) { - php_http_querystring_set(getThis(), serialized, 0 TSRMLS_CC); + php_http_querystring_set(getThis(), serialized, 0); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected a string as parameter"); + php_error_docref(NULL, E_WARNING, "Expected a string as parameter"); } } @@ -578,19 +571,19 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_offsetGet, 0, 0, 1) ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, offsetGet) { - char *offset_str; - int offset_len; - zval **value, *qa; + zend_string *offset; + zval *value, qa_tmp, *qa; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &offset)) { return; } - qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); + qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &qa_tmp); + ZVAL_DEREF(qa); if (Z_TYPE_P(qa) == IS_ARRAY) { - if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(qa), offset_str, offset_len + 1, (void *) &value)) { - RETVAL_ZVAL(*value, 1, 0); + if ((value = zend_symtable_find(Z_ARRVAL_P(qa), offset))) { + RETVAL_ZVAL(value, 1, 0); } } } @@ -601,27 +594,22 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_offsetSet, 0, 0, 2) ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, offsetSet) { - char *offset_str; - int offset_len; - zval *value, *param; + zend_string *offset; + zval *value, param, znull; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &offset_str, &offset_len, &value)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "Sz", &offset, &value)) { return; } - param = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); - - if (Z_TYPE_P(param) == IS_ARRAY && zend_symtable_exists(Z_ARRVAL_P(param), offset_str, offset_len + 1)) { - Z_ADDREF_P(value); - zend_symtable_update(Z_ARRVAL_P(param), offset_str, offset_len + 1, (void *) &value, sizeof(zval *), NULL); - Z_ADDREF_P(param); - } else { - MAKE_STD_ZVAL(param); - array_init(param); - Z_ADDREF_P(value); - add_assoc_zval_ex(param, offset_str, offset_len + 1, value); - } - php_http_querystring_set(getThis(), param, QS_MERGE TSRMLS_CC); + array_init_size(¶m, 1); + /* unset first */ + ZVAL_NULL(&znull); + zend_symtable_update(Z_ARRVAL(param), offset, &znull); + php_http_querystring_set(getThis(), ¶m, QS_MERGE); + /* then update, else QS_MERGE would merge sub-arrrays */ + Z_TRY_ADDREF_P(value); + zend_symtable_update(Z_ARRVAL(param), offset, value); + php_http_querystring_set(getThis(), ¶m, QS_MERGE); zval_ptr_dtor(¶m); } @@ -630,19 +618,19 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_offsetExists, 0, 0, 1) ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, offsetExists) { - char *offset_str; - int offset_len; - zval **value, *qa; + zend_string *offset; + zval *value, qa_tmp, *qa; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &offset)) { return; } - qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); + qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0, &qa_tmp); + ZVAL_DEREF(qa); if (Z_TYPE_P(qa) == IS_ARRAY) { - if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(qa), offset_str, offset_len + 1, (void *) &value)) { - RETURN_BOOL(Z_TYPE_PP(value) != IS_NULL); + if ((value = zend_symtable_find(Z_ARRVAL_P(qa), offset))) { + RETURN_BOOL(Z_TYPE_P(value) != IS_NULL); } } RETURN_FALSE; @@ -653,18 +641,17 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_offsetUnset, 0, 0, 1) ZEND_END_ARG_INFO(); PHP_METHOD(HttpQueryString, offsetUnset) { - char *offset_str; - int offset_len; - zval *param; + zend_string *offset; + zval param, znull; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &offset)) { return; } - MAKE_STD_ZVAL(param); - array_init(param); - add_assoc_null_ex(param, offset_str, offset_len + 1); - php_http_querystring_set(getThis(), param, QS_MERGE TSRMLS_CC); + array_init(¶m); + ZVAL_NULL(&znull); + zend_symtable_update(Z_ARRVAL(param), offset, &znull); + php_http_querystring_set(getThis(), ¶m, QS_MERGE); zval_ptr_dtor(¶m); } @@ -713,19 +700,19 @@ PHP_MINIT_FUNCTION(http_querystring) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http", "QueryString", php_http_querystring_methods); - php_http_querystring_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_http_querystring_class_entry = zend_register_internal_class(&ce); php_http_querystring_class_entry->create_object = php_http_querystring_object_new; - zend_class_implements(php_http_querystring_class_entry TSRMLS_CC, 3, zend_ce_serializable, zend_ce_arrayaccess, zend_ce_aggregate); + zend_class_implements(php_http_querystring_class_entry, 3, zend_ce_serializable, zend_ce_arrayaccess, zend_ce_aggregate); - zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("instance"), (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); - zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("queryArray"), ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("instance"), (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE)); + zend_declare_property_null(php_http_querystring_class_entry, ZEND_STRL("queryArray"), ZEND_ACC_PRIVATE); - zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_BOOL"), PHP_HTTP_QUERYSTRING_TYPE_BOOL TSRMLS_CC); - zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_INT"), PHP_HTTP_QUERYSTRING_TYPE_INT TSRMLS_CC); - zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_FLOAT"), PHP_HTTP_QUERYSTRING_TYPE_FLOAT TSRMLS_CC); - zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_STRING"), PHP_HTTP_QUERYSTRING_TYPE_STRING TSRMLS_CC); - zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_ARRAY"), PHP_HTTP_QUERYSTRING_TYPE_ARRAY TSRMLS_CC); - zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_OBJECT"), PHP_HTTP_QUERYSTRING_TYPE_OBJECT TSRMLS_CC); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_BOOL"), PHP_HTTP_QUERYSTRING_TYPE_BOOL); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_INT"), PHP_HTTP_QUERYSTRING_TYPE_INT); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_FLOAT"), PHP_HTTP_QUERYSTRING_TYPE_FLOAT); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_STRING"), PHP_HTTP_QUERYSTRING_TYPE_STRING); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_ARRAY"), PHP_HTTP_QUERYSTRING_TYPE_ARRAY); + zend_declare_class_constant_long(php_http_querystring_class_entry, ZEND_STRL("TYPE_OBJECT"), PHP_HTTP_QUERYSTRING_TYPE_OBJECT); return SUCCESS; } diff --git a/src/php_http_querystring.h b/src/php_http_querystring.h index 3391e91..d41b8e9 100644 --- a/src/php_http_querystring.h +++ b/src/php_http_querystring.h @@ -14,14 +14,14 @@ #define PHP_HTTP_QUERYSTRING_H #ifdef PHP_HTTP_HAVE_ICONV -PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe TSRMLS_DC); +PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe); #endif /* PHP_HTTP_HAVE_ICONV */ -PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *qstring TSRMLS_DC); -PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_ctor(zval *instance, zval *params TSRMLS_DC); +PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *qstring); +PHP_HTTP_API ZEND_RESULT_CODE php_http_querystring_ctor(zval *instance, zval *params); typedef php_http_object_t php_http_querystring_object_t; -#define PHP_HTTP_QUERYSTRING_TYPE_BOOL IS_BOOL +#define PHP_HTTP_QUERYSTRING_TYPE_BOOL _IS_BOOL #define PHP_HTTP_QUERYSTRING_TYPE_INT IS_LONG #define PHP_HTTP_QUERYSTRING_TYPE_FLOAT IS_DOUBLE #define PHP_HTTP_QUERYSTRING_TYPE_STRING IS_STRING diff --git a/src/php_http_url.c b/src/php_http_url.c index 81b2d95..c5c19a5 100644 --- a/src/php_http_url.c +++ b/src/php_http_url.c @@ -61,7 +61,7 @@ static inline char *localhostname(void) #define url(buf) ((php_http_url_t *) (buf).data) -static php_http_url_t *php_http_url_from_env(TSRMLS_D) +static php_http_url_t *php_http_url_from_env(void) { zval *https, *zhost, *zport; long port; @@ -73,7 +73,7 @@ static php_http_url_t *php_http_url_from_env(TSRMLS_D) /* scheme */ url(buf)->scheme = &buf.data[buf.used]; - https = php_http_env_get_server_var(ZEND_STRL("HTTPS"), 1 TSRMLS_CC); + https = php_http_env_get_server_var(ZEND_STRL("HTTPS"), 1); if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) { php_http_buffer_append(&buf, "https", sizeof("https")); } else { @@ -82,9 +82,9 @@ static php_http_url_t *php_http_url_from_env(TSRMLS_D) /* host */ url(buf)->host = &buf.data[buf.used]; - if ((((zhost = php_http_env_get_server_var(ZEND_STRL("HTTP_HOST"), 1 TSRMLS_CC)) || - (zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_NAME"), 1 TSRMLS_CC)) || - (zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_ADDR"), 1 TSRMLS_CC)))) && Z_STRLEN_P(zhost)) { + if ((((zhost = php_http_env_get_server_var(ZEND_STRL("HTTP_HOST"), 1)) || + (zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_NAME"), 1)) || + (zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_ADDR"), 1)))) && Z_STRLEN_P(zhost)) { size_t stop_at = strspn(Z_STRVAL_P(zhost), "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-."); php_http_buffer_append(&buf, Z_STRVAL_P(zhost), stop_at); @@ -97,7 +97,7 @@ static php_http_url_t *php_http_url_from_env(TSRMLS_D) } /* port */ - zport = php_http_env_get_server_var(ZEND_STRL("SERVER_PORT"), 1 TSRMLS_CC); + zport = php_http_env_get_server_var(ZEND_STRL("SERVER_PORT"), 1); if (zport && IS_LONG == is_numeric_string(Z_STRVAL_P(zport), Z_STRLEN_P(zport), &port, NULL, 0)) { url(buf)->port = port; } @@ -154,7 +154,7 @@ static php_http_url_t *php_http_url_from_env(TSRMLS_D) } \ } while (0) -php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags TSRMLS_DC) +php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags) { php_http_url_t *tmp_url = NULL; php_http_buffer_t buf; @@ -165,9 +165,9 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u /* set from env if requested */ if (flags & PHP_HTTP_URL_FROM_ENV) { - php_http_url_t *env_url = php_http_url_from_env(TSRMLS_C); + php_http_url_t *env_url = php_http_url_from_env(); - old_url = tmp_url = php_http_url_mod(env_url, old_url, flags ^ PHP_HTTP_URL_FROM_ENV TSRMLS_CC); + old_url = tmp_url = php_http_url_mod(env_url, old_url, flags ^ PHP_HTTP_URL_FROM_ENV); php_http_url_free(&env_url); } @@ -228,17 +228,17 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u if ((flags & PHP_HTTP_URL_JOIN_QUERY) && url_isset(new_url, query) && url_isset(old_url, query)) { zval qarr, qstr; - INIT_PZVAL(&qstr); - INIT_PZVAL(&qarr); array_init(&qarr); - ZVAL_STRING(&qstr, old_url->query, 0); - php_http_querystring_update(&qarr, &qstr, NULL TSRMLS_CC); - ZVAL_STRING(&qstr, new_url->query, 0); - php_http_querystring_update(&qarr, &qstr, NULL TSRMLS_CC); + ZVAL_STRING(&qstr, old_url->query); + php_http_querystring_update(&qarr, &qstr, NULL); + zval_ptr_dtor(&qstr); + ZVAL_STRING(&qstr, new_url->query); + php_http_querystring_update(&qarr, &qstr, NULL); + zval_ptr_dtor(&qstr); ZVAL_NULL(&qstr); - php_http_querystring_update(&qarr, NULL, &qstr TSRMLS_CC); + php_http_querystring_update(&qarr, NULL, &qstr); url(buf)->query = &buf.data[buf.used]; url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL(qstr), Z_STRLEN(qstr) + 1)); @@ -422,9 +422,9 @@ char *php_http_url_authority_to_string(const php_http_url_t *url, char **url_str return buf.data; } -php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC) +php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags) { - zval *zcpy; + zend_string *zs; php_http_url_t *purl; switch (Z_TYPE_P(value)) { @@ -434,9 +434,9 @@ php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC) break; default: - zcpy = php_http_ztyp(IS_STRING, value); - purl = php_http_url_parse(Z_STRVAL_P(zcpy), Z_STRLEN_P(zcpy), flags TSRMLS_CC); - zval_ptr_dtor(&zcpy); + zs = zval_get_string(value); + purl = php_http_url_parse(zs->val, zs->len, flags); + zend_string_release(zs); } return purl; @@ -444,67 +444,66 @@ php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC) php_http_url_t *php_http_url_from_struct(HashTable *ht) { - zval **e; + zval *e; php_http_buffer_t buf; php_http_buffer_init_ex(&buf, MAX(PHP_HTTP_BUFFER_DEFAULT_SIZE, sizeof(php_http_url_t)<<2), PHP_HTTP_BUFFER_INIT_PREALLOC); php_http_buffer_account(&buf, sizeof(php_http_url_t)); memset(buf.data, 0, buf.used); - if (SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("scheme")))) { + zend_string *zs = zval_get_string(e); url(buf)->scheme = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "user", sizeof("user"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("user")))) { + zend_string *zs = zval_get_string(e); url(buf)->user = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "pass", sizeof("pass"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("pass")))) { + zend_string *zs = zval_get_string(e); url(buf)->pass = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "host", sizeof("host"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("host")))) { + zend_string *zs = zval_get_string(e); url(buf)->host = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "port", sizeof("port"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_LONG, *e); - url(buf)->port = (unsigned short) Z_LVAL_P(cpy); - zval_ptr_dtor(&cpy); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("port")))) { + url(buf)->port = (unsigned short) zval_get_long(e); } - if (SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("path")))) { + zend_string *zs = zval_get_string(e); url(buf)->path = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "query", sizeof("query"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("query")))) { + zend_string *zs = zval_get_string(e); url(buf)->query = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "fragment", sizeof("fragment"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("fragment")))) { + zend_string *zs = zval_get_string(e); url(buf)->fragment = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } return url(buf); } -HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct TSRMLS_DC) +HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct) { - zval arr; + HashTable *ht; + zval tmp; if (strct) { switch (Z_TYPE_P(strct)) { @@ -514,53 +513,69 @@ HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct TSRMLS_ /* no break */ case IS_ARRAY: case IS_OBJECT: - INIT_PZVAL_ARRAY((&arr), HASH_OF(strct)); + ht = HASH_OF(strct); break; } } else { - INIT_PZVAL(&arr); - array_init(&arr); + ALLOC_HASHTABLE(ht); + zend_hash_init(ht, 8, NULL, ZVAL_PTR_DTOR, 0); + } + +#define url_struct_add(part) \ + if (Z_TYPE_P(strct) == IS_ARRAY) { \ + zend_hash_str_update(Z_ARRVAL_P(strct), part, lenof(part), &tmp); \ + } else { \ + zend_update_property(Z_OBJCE_P(strct), strct, part, lenof(part), &tmp); \ + zval_ptr_dtor(&tmp); \ } if (url) { if (url->scheme) { - add_assoc_string(&arr, "scheme", url->scheme, 1); + ZVAL_STRING(&tmp, url->scheme); + url_struct_add("scheme"); } if (url->user) { - add_assoc_string(&arr, "user", url->user, 1); + ZVAL_STRING(&tmp, url->user); + url_struct_add("user"); } if (url->pass) { - add_assoc_string(&arr, "pass", url->pass, 1); + ZVAL_STRING(&tmp, url->pass); + url_struct_add("pass"); } if (url->host) { - add_assoc_string(&arr, "host", url->host, 1); + ZVAL_STRING(&tmp, url->host); + url_struct_add("host"); } if (url->port) { - add_assoc_long(&arr, "port", (long) url->port); + ZVAL_LONG(&tmp, url->port); + url_struct_add("port"); } if (url->path) { - add_assoc_string(&arr, "path", url->path, 1); + ZVAL_STRING(&tmp, url->path); + url_struct_add("path"); } if (url->query) { - add_assoc_string(&arr, "query", url->query, 1); + ZVAL_STRING(&tmp, url->query); + url_struct_add("query"); } if (url->fragment) { - add_assoc_string(&arr, "fragment", url->fragment, 1); + ZVAL_STRING(&tmp, url->fragment); + url_struct_add("fragment"); } } - return Z_ARRVAL(arr); + return ht; } -ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len TSRMLS_DC) +ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len) { const char *arg_sep_str = "&"; size_t arg_sep_len = 1; php_http_buffer_t *qstr = php_http_buffer_new(); - php_http_url_argsep(&arg_sep_str, &arg_sep_len TSRMLS_CC); + php_http_url_argsep(&arg_sep_str, &arg_sep_len); - if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, "=", 1, pre_encoded_str, pre_encoded_len TSRMLS_CC)) { + if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, "=", 1, pre_encoded_str, pre_encoded_len)) { php_http_buffer_free(&qstr); return FAILURE; } @@ -571,13 +586,13 @@ ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encod return SUCCESS; } -ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len TSRMLS_DC) +ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len) { if (pre_encoded_len && pre_encoded_str) { php_http_buffer_append(qstr, pre_encoded_str, pre_encoded_len); } - if (!php_http_params_to_string(qstr, hash, arg_sep_str, arg_sep_len, "", 0, val_sep_str, val_sep_len, PHP_HTTP_PARAMS_QUERY TSRMLS_CC)) { + if (!php_http_params_to_string(qstr, hash, arg_sep_str, arg_sep_len, "", 0, val_sep_str, val_sep_len, PHP_HTTP_PARAMS_QUERY)) { return FAILURE; } @@ -586,9 +601,6 @@ ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t struct parse_state { php_http_url_t url; -#ifdef ZTS - void ***ts; -#endif const char *ptr; const char *end; size_t maxlen; @@ -747,13 +759,12 @@ static size_t parse_mb(struct parse_state *state, parse_mb_what_t what, const ch } if (!silent) { - TSRMLS_FETCH_FROM_CTX(state->ts); if (consumed) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse %s; unexpected multibyte sequence 0x%x at pos %u in '%s'", parse_what[what], wchar, (unsigned) (ptr - begin), begin); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse %s; unexpected byte 0x%02x at pos %u in '%s'", parse_what[what], (unsigned char) *ptr, (unsigned) (ptr - begin), begin); } @@ -766,7 +777,6 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt { size_t mb; const char *password = NULL, *end = state->ptr, *tmp = ptr; - TSRMLS_FETCH_FROM_CTX(state->ts); state->url.user = &state->buffer[state->offset]; @@ -774,7 +784,7 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt switch (*ptr) { case ':': if (password) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse password; duplicate ':' at pos %u in '%s'", (unsigned) (ptr - tmp), tmp); return FAILURE; @@ -786,7 +796,7 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt case '%': if (ptr[1] != '%' && (end - ptr <= 2 || !isxdigit(*(ptr+1)) || !isxdigit(*(ptr+2)))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse userinfo; invalid percent encoding at pos %u in '%s'", (unsigned) (ptr - tmp), tmp); return FAILURE; @@ -829,7 +839,7 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt #if defined(PHP_WIN32) || defined(HAVE_UIDNA_IDNTOASCII) typedef size_t (*parse_mb_func)(unsigned *wc, const char *ptr, const char *end); -static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u16, size_t *len TSRMLS_DC) +static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u16, size_t *len) { size_t offset = 0, u8_len = strlen(u8); @@ -843,7 +853,7 @@ static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u1 if (!consumed) { efree(*u16); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse UTF-8 at pos %zu of '%s'", offset, u8); + php_error_docref(NULL, E_WARNING, "Failed to parse UTF-8 at pos %zu of '%s'", offset, u8); return FAILURE; } else { offset += consumed; @@ -859,7 +869,7 @@ static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u1 case 0: default: efree(*u16); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to convert UTF-32 'U+%X' to UTF-16", wc); + php_error_docref(NULL, E_WARNING, "Failed to convert UTF-32 'U+%X' to UTF-16", wc); return FAILURE; } } @@ -877,7 +887,6 @@ static ZEND_RESULT_CODE parse_idn2(struct parse_state *state, size_t prev_len) { char *idn = NULL; int rv = -1; - TSRMLS_FETCH_FROM_CTX(state->ts); if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { rv = idn2_lookup_u8((const unsigned char *) state->url.host, (unsigned char **) &idn, IDN2_NFC_INPUT); @@ -888,7 +897,7 @@ static ZEND_RESULT_CODE parse_idn2(struct parse_state *state, size_t prev_len) } # endif if (rv != IDN2_OK) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idn2_strerror(rv)); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN; %s", idn2_strerror(rv)); return FAILURE; } else { size_t idnlen = strlen(idn); @@ -903,7 +912,6 @@ static ZEND_RESULT_CODE parse_idn(struct parse_state *state, size_t prev_len) { char *idn = NULL; int rv = -1; - TSRMLS_FETCH_FROM_CTX(state->ts); if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { rv = idna_to_ascii_8z(state->url.host, &idn, IDNA_ALLOW_UNASSIGNED|IDNA_USE_STD3_ASCII_RULES); @@ -914,7 +922,7 @@ static ZEND_RESULT_CODE parse_idn(struct parse_state *state, size_t prev_len) } # endif if (rv != IDNA_SUCCESS) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idna_strerror(rv)); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN; %s", idna_strerror(rv)); return FAILURE; } else { size_t idnlen = strlen(idn); @@ -940,20 +948,19 @@ static ZEND_RESULT_CODE parse_uidn(struct parse_state *state) uint16_t *uhost_str, ahost_str[MAXHOSTNAMELEN], *ahost_ptr; size_t uhost_len, ahost_len; UErrorCode error = U_ZERO_ERROR; - TSRMLS_FETCH_FROM_CTX(state->ts); if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { - if (SUCCESS != to_utf16(parse_mb_utf8, state->url.host, &uhost_str, &uhost_len TSRMLS_CC)) { + if (SUCCESS != to_utf16(parse_mb_utf8, state->url.host, &uhost_str, &uhost_len)) { return FAILURE; } #ifdef PHP_HTTP_HAVE_WCHAR } else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) { - if (SUCCESS != to_utf16(parse_mb_loc, state->url.host, &uhost_str, &uhost_len TSRMLS_CC)) { + if (SUCCESS != to_utf16(parse_mb_loc, state->url.host, &uhost_str, &uhost_len)) { return FAILURE; } #endif } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; codepage not specified"); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN; codepage not specified"); return FAILURE; } @@ -961,7 +968,7 @@ static ZEND_RESULT_CODE parse_uidn(struct parse_state *state) efree(uhost_str); if (error != U_ZERO_ERROR) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; ICU error %d", error); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN; ICU error %d", error); return FAILURE; } @@ -982,28 +989,27 @@ static ZEND_RESULT_CODE parse_widn(struct parse_state *state) char *host_ptr; uint16_t *uhost_str, ahost_str[MAXHOSTNAMELEN], *ahost_ptr; size_t uhost_len; - TSRMLS_FETCH_FROM_CTX(state->ts); if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { if (SUCCESS != to_utf16(parse_mb_utf8, state->url.host, &uhost_str, &uhost_len)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN"); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN"); return FAILURE; } #ifdef PHP_HTTP_HAVE_WCHAR } else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) { if (SUCCESS != to_utf16(parse_mb_loc, state->url.host, &uhost_str, &uhost_len)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN"); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN"); return FAILURE; } #endif } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN"); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN"); return FAILURE; } if (!IdnToAscii(IDN_ALLOW_UNASSIGNED|IDN_USE_STD3_ASCII_RULES, uhost_str, uhost_len, ahost_str, MAXHOSTNAMELEN)) { efree(uhost_str); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN"); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN"); return FAILURE; } @@ -1023,8 +1029,8 @@ static ZEND_RESULT_CODE parse_widn(struct parse_state *state) #ifdef HAVE_INET_PTON static const char *parse_ip6(struct parse_state *state, const char *ptr) { + size_t mb, len; const char *error = NULL, *end = state->ptr, *tmp = memchr(ptr, ']', end - ptr); - TSRMLS_FETCH_FROM_CTX(state->ts); if (tmp) { size_t addrlen = tmp - ptr + 1; @@ -1050,7 +1056,7 @@ static const char *parse_ip6(struct parse_state *state, const char *ptr) } if (error) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse hostinfo; %s", error); + php_error_docref(NULL, E_WARNING, "Failed to parse hostinfo; %s", error); return NULL; } @@ -1062,7 +1068,6 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt { size_t mb, len; const char *end = state->ptr, *tmp = ptr, *port = NULL, *label = NULL; - TSRMLS_FETCH_FROM_CTX(state->ts); #ifdef HAVE_INET_PTON if (*ptr == '[' && !(ptr = parse_ip6(state, ptr))) { @@ -1074,7 +1079,7 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt switch (*ptr) { case ':': if (port) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse port; unexpected ':' at pos %u in '%s'", (unsigned) (ptr - tmp), tmp); return FAILURE; @@ -1084,7 +1089,7 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt case '%': if (ptr[1] != '%' && (end - ptr <= 2 || !isxdigit(*(ptr+1)) || !isxdigit(*(ptr+2)))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse hostinfo; invalid percent encoding at pos %u in '%s'", (unsigned) (ptr - tmp), tmp); return FAILURE; @@ -1101,7 +1106,7 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt /* sort of a compromise, just ensure we don't end up * with a dot at the beginning or two consecutive dots */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse %s; unexpected '%c' at pos %u in '%s'", port ? "port" : "host", (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp); @@ -1120,7 +1125,7 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u': case 'v': case 'w': case 'x': case 'y': case 'z': if (port) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse port; unexpected char '%c' at pos %u in '%s'", (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp); return FAILURE; @@ -1142,7 +1147,7 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt if (ptr == end) { break; } else if (port) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse port; unexpected byte 0x%02x at pos %u in '%s'", (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp); return FAILURE; @@ -1186,8 +1191,7 @@ static const char *parse_authority(struct parse_state *state) case '@': /* userinfo delimiter */ if (host) { - TSRMLS_FETCH_FROM_CTX(state->ts); - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse userinfo; unexpected '@'"); return NULL; } @@ -1219,7 +1223,6 @@ static const char *parse_path(struct parse_state *state) { size_t mb; const char *tmp; - TSRMLS_FETCH_FROM_CTX(state->ts); /* is there actually a path to parse? */ if (!*state->ptr) { @@ -1236,7 +1239,7 @@ static const char *parse_path(struct parse_state *state) case '%': if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse path; invalid percent encoding at pos %u in '%s'", (unsigned) (state->ptr - tmp), tmp); return NULL; @@ -1287,7 +1290,6 @@ static const char *parse_query(struct parse_state *state) { size_t mb; const char *tmp = state->ptr + !!*state->ptr; - TSRMLS_FETCH_FROM_CTX(state->ts); /* is there actually a query to parse? */ if (*state->ptr != '?') { @@ -1305,7 +1307,7 @@ static const char *parse_query(struct parse_state *state) case '%': if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse query; invalid percent encoding at pos %u in '%s'", (unsigned) (state->ptr - tmp), tmp); return NULL; @@ -1366,7 +1368,6 @@ static const char *parse_fragment(struct parse_state *state) { size_t mb; const char *tmp; - TSRMLS_FETCH_FROM_CTX(state->ts); /* is there actually a fragment to parse? */ if (*state->ptr != '#') { @@ -1381,7 +1382,7 @@ static const char *parse_fragment(struct parse_state *state) switch (*state->ptr) { case '%': if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse fragment; invalid percent encoding at pos %u in '%s'", (unsigned) (state->ptr - tmp), tmp); return NULL; @@ -1494,7 +1495,7 @@ static const char *parse_scheme(struct parse_state *state) return state->ptr = tmp; } -php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags TSRMLS_DC) +php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags) { size_t maxlen = 3 * len; struct parse_state *state = ecalloc(1, sizeof(*state) + maxlen); @@ -1503,10 +1504,9 @@ php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags T state->ptr = str; state->flags = flags; state->maxlen = maxlen; - TSRMLS_SET_CTX(state->ts); if (!parse_scheme(state)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse URL scheme: '%s'", state->ptr); + php_error_docref(NULL, E_WARNING, "Failed to parse URL scheme: '%s'", state->ptr); efree(state); return NULL; } @@ -1517,13 +1517,13 @@ php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags T } if (!parse_query(state)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse URL query: '%s'", state->ptr); + php_error_docref(NULL, E_WARNING, "Failed to parse URL query: '%s'", state->ptr); efree(state); return NULL; } if (!parse_fragment(state)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse URL fragment: '%s'", state->ptr); + php_error_docref(NULL, E_WARNING, "Failed to parse URL fragment: '%s'", state->ptr); efree(state); return NULL; } @@ -1531,7 +1531,7 @@ php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags T return (php_http_url_t *) state; } -php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags TSRMLS_DC) +php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags) { size_t maxlen = 3 * len; struct parse_state *state = ecalloc(1, sizeof(*state) + maxlen); @@ -1540,7 +1540,6 @@ php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsign state->ptr = str; state->flags = flags; state->maxlen = maxlen; - TSRMLS_SET_CTX(state->ts); if (!(state->ptr = parse_authority(state))) { efree(state); @@ -1548,7 +1547,7 @@ php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsign } if (state->ptr != state->end) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse URL authority, unexpected character at pos %u in '%s'", (unsigned) (state->ptr - str), str); efree(state); @@ -1566,35 +1565,35 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpUrl, __construct) { zval *new_url = NULL, *old_url = NULL; - long flags = PHP_HTTP_URL_FROM_ENV; + zend_long flags = PHP_HTTP_URL_FROM_ENV; zend_error_handling zeh; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!z!l", &old_url, &new_url, &flags), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z!z!l", &old_url, &new_url, &flags), invalid_arg, return); - zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh); { php_http_url_t *res_purl, *new_purl = NULL, *old_purl = NULL; if (new_url) { - new_purl = php_http_url_from_zval(new_url, flags TSRMLS_CC); + new_purl = php_http_url_from_zval(new_url, flags); if (!new_purl) { - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); return; } } if (old_url) { - old_purl = php_http_url_from_zval(old_url, flags TSRMLS_CC); + old_purl = php_http_url_from_zval(old_url, flags); if (!old_purl) { if (new_purl) { php_http_url_free(&new_purl); } - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); return; } } - res_purl = php_http_url_mod(old_purl, new_purl, flags TSRMLS_CC); - php_http_url_to_struct(res_purl, getThis() TSRMLS_CC); + res_purl = php_http_url_mod(old_purl, new_purl, flags); + php_http_url_to_struct(res_purl, getThis()); php_http_url_free(&res_purl); if (old_purl) { @@ -1604,7 +1603,7 @@ PHP_METHOD(HttpUrl, __construct) php_http_url_free(&new_purl); } } - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_mod, 0, 0, 1) @@ -1614,19 +1613,19 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpUrl, mod) { zval *new_url = NULL; - long flags = PHP_HTTP_URL_JOIN_PATH | PHP_HTTP_URL_JOIN_QUERY | PHP_HTTP_URL_SANITIZE_PATH; + zend_long flags = PHP_HTTP_URL_JOIN_PATH | PHP_HTTP_URL_JOIN_QUERY | PHP_HTTP_URL_SANITIZE_PATH; zend_error_handling zeh; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!|l", &new_url, &flags), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z!|l", &new_url, &flags), invalid_arg, return); - zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC); + zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh); { php_http_url_t *new_purl = NULL, *old_purl = NULL; if (new_url) { - new_purl = php_http_url_from_zval(new_url, flags TSRMLS_CC); + new_purl = php_http_url_from_zval(new_url, flags); if (!new_purl) { - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); return; } } @@ -1634,10 +1633,10 @@ PHP_METHOD(HttpUrl, mod) if ((old_purl = php_http_url_from_struct(HASH_OF(getThis())))) { php_http_url_t *res_purl; - ZVAL_OBJVAL(return_value, zend_objects_clone_obj(getThis() TSRMLS_CC), 0); + ZVAL_OBJ(return_value, zend_objects_clone_obj(getThis())); - res_purl = php_http_url_mod(old_purl, new_purl, flags TSRMLS_CC); - php_http_url_to_struct(res_purl, return_value TSRMLS_CC); + res_purl = php_http_url_mod(old_purl, new_purl, flags); + php_http_url_to_struct(res_purl, return_value); php_http_url_free(&res_purl); php_http_url_free(&old_purl); @@ -1646,7 +1645,7 @@ PHP_METHOD(HttpUrl, mod) php_http_url_free(&new_purl); } } - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_toString, 0, 0, 0) @@ -1662,7 +1661,7 @@ PHP_METHOD(HttpUrl, toString) php_http_url_to_string(purl, &str, &len, 0); php_http_url_free(&purl); - RETURN_STRINGL(str, len, 0); + RETURN_STR(php_http_cs2zs(str, len)); } } RETURN_EMPTY_STRING(); @@ -1680,7 +1679,7 @@ PHP_METHOD(HttpUrl, toArray) /* strip any non-URL properties */ purl = php_http_url_from_struct(HASH_OF(getThis())); - php_http_url_to_struct(purl, return_value TSRMLS_CC); + php_http_url_to_struct(purl, return_value); php_http_url_free(&purl); } @@ -1700,39 +1699,39 @@ PHP_MINIT_FUNCTION(http_url) zend_class_entry ce = {0}; INIT_NS_CLASS_ENTRY(ce, "http", "Url", php_http_url_methods); - php_http_url_class_entry = zend_register_internal_class(&ce TSRMLS_CC); - - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("scheme"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("user"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("pass"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("host"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("port"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("path"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("query"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("fragment"), ZEND_ACC_PUBLIC TSRMLS_CC); - - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("REPLACE"), PHP_HTTP_URL_REPLACE TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_PATH"), PHP_HTTP_URL_JOIN_PATH TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_QUERY"), PHP_HTTP_URL_JOIN_QUERY TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_USER"), PHP_HTTP_URL_STRIP_USER TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PASS"), PHP_HTTP_URL_STRIP_PASS TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_AUTH"), PHP_HTTP_URL_STRIP_AUTH TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PORT"), PHP_HTTP_URL_STRIP_PORT TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PATH"), PHP_HTTP_URL_STRIP_PATH TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_QUERY"), PHP_HTTP_URL_STRIP_QUERY TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_FRAGMENT"), PHP_HTTP_URL_STRIP_FRAGMENT TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_ALL"), PHP_HTTP_URL_STRIP_ALL TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("FROM_ENV"), PHP_HTTP_URL_FROM_ENV TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("SANITIZE_PATH"), PHP_HTTP_URL_SANITIZE_PATH TSRMLS_CC); + php_http_url_class_entry = zend_register_internal_class(&ce); + + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("scheme"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("user"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("pass"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("host"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("port"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("path"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("query"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("fragment"), ZEND_ACC_PUBLIC); + + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("REPLACE"), PHP_HTTP_URL_REPLACE); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_PATH"), PHP_HTTP_URL_JOIN_PATH); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_QUERY"), PHP_HTTP_URL_JOIN_QUERY); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_USER"), PHP_HTTP_URL_STRIP_USER); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PASS"), PHP_HTTP_URL_STRIP_PASS); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_AUTH"), PHP_HTTP_URL_STRIP_AUTH); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PORT"), PHP_HTTP_URL_STRIP_PORT); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PATH"), PHP_HTTP_URL_STRIP_PATH); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_QUERY"), PHP_HTTP_URL_STRIP_QUERY); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_FRAGMENT"), PHP_HTTP_URL_STRIP_FRAGMENT); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_ALL"), PHP_HTTP_URL_STRIP_ALL); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("FROM_ENV"), PHP_HTTP_URL_FROM_ENV); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("SANITIZE_PATH"), PHP_HTTP_URL_SANITIZE_PATH); #ifdef PHP_HTTP_HAVE_WCHAR - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBLOC"), PHP_HTTP_URL_PARSE_MBLOC TSRMLS_CC); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBLOC"), PHP_HTTP_URL_PARSE_MBLOC); #endif - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBUTF8"), PHP_HTTP_URL_PARSE_MBUTF8 TSRMLS_CC); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBUTF8"), PHP_HTTP_URL_PARSE_MBUTF8); #if defined(PHP_HTTP_HAVE_IDN2) || defined(PHP_HTTP_HAVE_IDN) || defined(HAVE_UIDNA_IDNTOASCII) - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOIDN"), PHP_HTTP_URL_PARSE_TOIDN TSRMLS_CC); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOIDN"), PHP_HTTP_URL_PARSE_TOIDN); #endif - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOPCT"), PHP_HTTP_URL_PARSE_TOPCT TSRMLS_CC); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOPCT"), PHP_HTTP_URL_PARSE_TOPCT); return SUCCESS; } diff --git a/src/php_http_url.h b/src/php_http_url.h index 636efb5..6ae0ac3 100644 --- a/src/php_http_url.h +++ b/src/php_http_url.h @@ -57,23 +57,26 @@ typedef struct php_http_url { char *fragment; } php_http_url_t; -PHP_HTTP_API php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags TSRMLS_DC); -PHP_HTTP_API php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags TSRMLS_DC); -PHP_HTTP_API php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags TSRMLS_DC); +PHP_HTTP_API php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags); +PHP_HTTP_API php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags); +PHP_HTTP_API php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags); PHP_HTTP_API php_http_url_t *php_http_url_copy(const php_http_url_t *url, zend_bool persistent); PHP_HTTP_API php_http_url_t *php_http_url_from_struct(HashTable *ht); -PHP_HTTP_API php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC); -PHP_HTTP_API HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct TSRMLS_DC); +PHP_HTTP_API php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags); +PHP_HTTP_API HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct); PHP_HTTP_API char *php_http_url_to_string(const php_http_url_t *url, char **url_str, size_t *url_len, zend_bool persistent); PHP_HTTP_API char *php_http_url_authority_to_string(const php_http_url_t *url, char **url_str, size_t *url_len); PHP_HTTP_API void php_http_url_free(php_http_url_t **url); -PHP_HTTP_API ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len TSRMLS_DC); -PHP_HTTP_API ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len TSRMLS_DC); +PHP_HTTP_API ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len); +PHP_HTTP_API ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len); -static inline void php_http_url_argsep(const char **str, size_t *len TSRMLS_DC) +static inline void php_http_url_argsep(const char **str, size_t *len) { - php_http_ini_entry(ZEND_STRL("arg_separator.output"), str, len, 0 TSRMLS_CC); + if (SUCCESS != php_http_ini_entry(ZEND_STRL("arg_separator.output"), str, len, 0) || !*len) { + *str = PHP_HTTP_URL_ARGSEP; + *len = lenof(PHP_HTTP_URL_ARGSEP); + } } static inline zend_bool php_http_url_is_empty(const php_http_url_t *url) { diff --git a/src/php_http_version.c b/src/php_http_version.c index 7adef9d..e763a85 100644 --- a/src/php_http_version.c +++ b/src/php_http_version.c @@ -12,7 +12,7 @@ #include "php_http_api.h" -php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major, unsigned minor TSRMLS_DC) +php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major, unsigned minor) { if (!v) { v = emalloc(sizeof(*v)); @@ -24,7 +24,7 @@ php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major, return v; } -php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *str TSRMLS_DC) +php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *str) { long major, minor; char separator = 0; @@ -46,21 +46,21 @@ php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *st separator = *ptr++; if (separator) { if (separator != '.' && separator != ',') { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Non-standard version separator '%c' in HTTP protocol version '%s'", separator, ptr - 2); + php_error_docref(NULL, E_NOTICE, "Non-standard version separator '%c' in HTTP protocol version '%s'", separator, ptr - 2); } minor = *ptr - '0'; if (minor >= 0 && minor <= 9) { - return php_http_version_init(v, major, minor TSRMLS_CC); + return php_http_version_init(v, major, minor); } } } } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP protocol version '%s'", str); + php_error_docref(NULL, E_WARNING, "Could not parse HTTP protocol version '%s'", str); return NULL; } -void php_http_version_to_string(php_http_version_t *v, char **str, size_t *len, const char *pre, const char *post TSRMLS_DC) +void php_http_version_to_string(php_http_version_t *v, char **str, size_t *len, const char *pre, const char *post) { *len = spprintf(str, 0, "%s%u.%u%s", pre ? pre : "", v->major, v->minor, post ? post : ""); } diff --git a/src/php_http_version.h b/src/php_http_version.h index 40b833e..6f51a47 100644 --- a/src/php_http_version.h +++ b/src/php_http_version.h @@ -18,9 +18,9 @@ typedef struct php_http_version { unsigned minor; } php_http_version_t; -PHP_HTTP_API php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major, unsigned minor TSRMLS_DC); -PHP_HTTP_API php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *str TSRMLS_DC); -PHP_HTTP_API void php_http_version_to_string(php_http_version_t *v, char **str, size_t *len, const char *pre, const char *post TSRMLS_DC); +PHP_HTTP_API php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major, unsigned minor); +PHP_HTTP_API php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *str); +PHP_HTTP_API void php_http_version_to_string(php_http_version_t *v, char **str, size_t *len, const char *pre, const char *post); PHP_HTTP_API void php_http_version_dtor(php_http_version_t *v); PHP_HTTP_API void php_http_version_free(php_http_version_t **v); diff --git a/tests/client026.phpt b/tests/client026.phpt index 1bafdc1..3c16bb0 100644 --- a/tests/client026.phpt +++ b/tests/client026.phpt @@ -9,6 +9,7 @@ skip_client_test(); setOptions(array("timeout" => 10, "expect_100_timeout" => 0)); $client->enqueue($request); $client->send(); - var_dump($client->getResponse()->getHeaders()); + dump_headers(null, $client->getResponse()->getHeaders()); }); ?> ===DONE=== --EXPECTF-- Test -array(5) { - ["Accept-Ranges"]=> - string(5) "bytes" - ["Etag"]=> - string(%d) "%s" - ["Last-Modified"]=> - string(%d) "%s" - ["X-Original-Transfer-Encoding"]=> - string(7) "chunked" - ["Content-Length"]=> - int(134217%d%d%d) -} -===DONE=== +Accept-Ranges: bytes +Content-Length: 134217960 +Etag: "%x" +Last-Modified: %s +X-Original-Transfer-Encoding: chunked + +===DONE=== \ No newline at end of file diff --git a/tests/gh-issue11.phpt b/tests/gh-issue11.phpt new file mode 100644 index 0000000..aba014a --- /dev/null +++ b/tests/gh-issue11.phpt @@ -0,0 +1,21 @@ +--TEST-- +crash when query string has nested array keys +--SKIPIF-- + +--FILE-- + +===DONE=== +--EXPECT-- +Test +a%5B0%5D%5B0%5D=x&a%5B1%5D%5B0%5D=x +===DONE=== diff --git a/tests/gh-issue7.phpt b/tests/gh-issue7.phpt index 38e597c..2c3f50d 100644 --- a/tests/gh-issue7.phpt +++ b/tests/gh-issue7.phpt @@ -1,7 +1,12 @@ --TEST-- crash with querystring and exception from error handler --SKIPIF-- - +=")) { + die("skip PHP>=7\n"); +} +?> --GET-- q[]=1&r[]=2 --FILE-- diff --git a/tests/helper/dump.inc b/tests/helper/dump.inc index 5f5f367..452a715 100644 --- a/tests/helper/dump.inc +++ b/tests/helper/dump.inc @@ -1,16 +1,22 @@ getInfo()); - $headers = $msg->getHeaders(); ksort($headers); foreach ($headers as $key => $val) { fprintf($stream, "%s: %s\n", $key, $val); } fprintf($stream, "\n"); +} + +function dump_message($stream, http\Message $msg, $parent = false) { + if (!is_resource($stream)) { + $stream = fopen("php://output", "w"); + } + fprintf($stream, "%s\n", $msg->getInfo()); + dump_headers($stream, $msg->getHeaders()); $msg->getBody()->toStream($stream); if ($parent && ($msg = $msg->getParentMessage())) { diff --git a/tests/helper/server.inc b/tests/helper/server.inc index 029cd46..091ff5c 100644 --- a/tests/helper/server.inc +++ b/tests/helper/server.inc @@ -24,6 +24,18 @@ if ($php) { define("PHP_BIN", PHP_BINDIR.DIRECTORY_SEPARATOR."php"); } +foreach (array("raphf", "propro", "http") as $ext) { + if (!extension_loaded($ext)) { + switch (PHP_SHLIB_SUFFIX) { + case "dll": + dl("php_$ext.dll"); + break; + default: + dl($ext .".". PHP_SHLIB_SUFFIX); + } + } +} + function serve($cb) { /* stream_socket_server() automatically sets SO_REUSEADDR, * which is, well, bad if the tests are run in parallel diff --git a/tests/info001.phpt b/tests/info001.phpt index 8209669..6b829ef 100644 --- a/tests/info001.phpt +++ b/tests/info001.phpt @@ -24,15 +24,15 @@ var_dump(new http\Message("GET / HTTP/1.1")); ?> DONE --EXPECTF-- -exception 'http\Exception\BadMessageException' with message 'http\Message::__construct(): Failed to parse headers: unexpected character '\040' at pos 3 of 'GET HTTP/1.1'' in %s +http\Exception\BadMessageException: http\Message::__construct(): Failed to parse headers: unexpected character '\040' at pos 3 of 'GET HTTP/1.1' in %s Stack trace: #0 %s: http\Message->__construct('GET HTTP/1.1') #1 {main} -exception 'http\Exception\BadMessageException' with message 'http\Message::__construct(): Failed to parse headers: unexpected character '\040' at pos 3 of 'GET HTTP/1.123'' in %s +http\Exception\BadMessageException: http\Message::__construct(): Failed to parse headers: unexpected character '\040' at pos 3 of 'GET HTTP/1.123' in %s Stack trace: #0 %s: http\Message->__construct('GET HTTP/1.123') #1 {main} -exception 'http\Exception\BadMessageException' with message 'http\Message::__construct(): Failed to parse headers: unexpected character '\057' at pos 7 of 'GETHTTP/1.1'' %s +http\Exception\BadMessageException: http\Message::__construct(): Failed to parse headers: unexpected character '\057' at pos 7 of 'GETHTTP/1.1' %s Stack trace: #0 %s: http\Message->__construct('GETHTTP/1.1') #1 {main} diff --git a/tests/info002.phpt b/tests/info002.phpt index 093dcd1..3c71be5 100644 --- a/tests/info002.phpt +++ b/tests/info002.phpt @@ -32,13 +32,13 @@ echo new http\Message("CONNECT www.example.org:80 HTTP/1.1"); ===DONE=== --EXPECTF-- Test -exception 'http\Exception\BadMessageException' with message 'http\Message::__construct(): Failed to parse headers: unexpected character '\057' at pos 4 of 'HTTP/1.1 99 Apples in my Basket'' in %sinfo002.php:%d +http\Exception\BadMessageException: http\Message::__construct(): Failed to parse headers: unexpected character '\057' at pos 4 of 'HTTP/1.1 99 Apples in my Basket' in %sinfo002.php:%d Stack trace: #0 %sinfo002.php(%d): http\Message->__construct('HTTP/1.1 99 App...') #1 %sinfo002.php(%d): {closure}() #2 %sinfo002.php(%d): trap(Object(Closure)) #3 {main} -exception 'http\Exception\BadMessageException' with message 'http\Message::__construct(): Failed to parse headers: unexpected character '\040' at pos 7 of 'CONNECT HTTP/1.1'' in %sinfo002.php:%d +http\Exception\BadMessageException: http\Message::__construct(): Failed to parse headers: unexpected character '\040' at pos 7 of 'CONNECT HTTP/1.1' in %sinfo002.php:%d Stack trace: #0 %sinfo002.php(%d): http\Message->__construct('CONNECT HTTP/1....') #1 %sinfo002.php(%d): {closure}() diff --git a/tests/messagebody003.phpt b/tests/messagebody003.phpt index 7b79e6a..8444cbf 100644 --- a/tests/messagebody003.phpt +++ b/tests/messagebody003.phpt @@ -19,7 +19,7 @@ try { DONE --EXPECTF-- Test -exception 'http\Exception\RuntimeException' with message 'http\Message\Body::append(): Failed to append 4 bytes to body; wrote 0' in %s:%d +http\Exception\RuntimeException: http\Message\Body::append(): Failed to append 4 bytes to body; wrote 0 in %s:%d Stack trace: #0 %s(%d): http\Message\Body->append('nope') #1 {main} diff --git a/tests/messageparser002.phpt b/tests/messageparser002.phpt index 71f2b5e..acac6cd 100644 --- a/tests/messageparser002.phpt +++ b/tests/messageparser002.phpt @@ -37,7 +37,7 @@ object(http\Message)#%d (9) { ["type":protected]=> int(1) ["body":protected]=> - object(http\Message\Body)#2 (0) { + object(http\Message\Body)#%d (0) { } ["requestMethod":protected]=> string(3) "GET" @@ -63,4 +63,4 @@ object(http\Message)#%d (9) { } string(3) "OK " -DONE \ No newline at end of file +DONE diff --git a/tests/negotiate001.phpt b/tests/negotiate001.phpt index f628cdf..0e553f5 100644 --- a/tests/negotiate001.phpt +++ b/tests/negotiate001.phpt @@ -122,7 +122,7 @@ CUSTOM a.b: Array ( [a.b] => 0.9 - [c.e] => 0.1 [a.x] => 0.1 + [c.e] => 0.1 ) DONE diff --git a/tests/phpinfo.phpt b/tests/phpinfo.phpt index 373cb45..c1f58d9 100644 --- a/tests/phpinfo.phpt +++ b/tests/phpinfo.phpt @@ -14,6 +14,6 @@ Done Test %a HTTP Support => enabled -Extension Version => 2.%s +Extension Version => 3.%s %a Done diff --git a/tests/propertyproxy001.phpt b/tests/propertyproxy001.phpt index 1001f8e..a1dc2d8 100644 --- a/tests/propertyproxy001.phpt +++ b/tests/propertyproxy001.phpt @@ -4,8 +4,6 @@ property proxy ---XFAIL-- -TBD --FILE-- int(2) ["by2ref"]=> - &int(1) + int(1) } array(4) { ["bykey"]=> @@ -65,9 +63,9 @@ array(4) { ["by1ref"]=> int(2) ["by2ref"]=> - &int(1) + int(1) ["byXref"]=> - &int(2) + int(2) } array(5) { ["bykey"]=> @@ -75,9 +73,9 @@ array(5) { ["by1ref"]=> int(2) ["by2ref"]=> - &int(1) + int(1) ["byXref"]=> - &int(2) + int(2) ["bynext"]=> array(3) { [0]=> diff --git a/tests/querystring003.phpt b/tests/querystring003.phpt index a504174..caa1745 100644 --- a/tests/querystring003.phpt +++ b/tests/querystring003.phpt @@ -18,5 +18,5 @@ echo $qs,"\n"; --EXPECT-- Test foo=bar&bar=baz -foo=baz&bar=baz +bar=baz&foo=baz ===DONE=== diff --git a/travis/propro-master.ext.phar b/travis/propro-master.ext.phar new file mode 100755 index 0000000..cae49e7 --- /dev/null +++ b/travis/propro-master.ext.phar @@ -0,0 +1,5695 @@ +#!/usr/bin/env php +getUser(); + if (!is_dir($temp) && !mkdir($temp, 0700, true)) { + throw new Exception; + } + $this->name = $temp ."/". uniqid($prefix) . $suffix; + } + + private function getUser() { + if (extension_loaded("posix") && function_exists("posix_getpwuid")) { + return posix_getpwuid(posix_getuid())["name"]; + } + return trim(`whoami 2>/dev/null`) + ?: trim(`id -nu 2>/dev/null`) + ?: getenv("USER") + ?: get_current_user(); + } + + /** + * @return string + */ + public function __toString() { + return (string) $this->name; + } +} + + + +namespace pharext; + +/** + * Create a new temporary file + */ +class Tempfile extends \SplFileInfo +{ + /** + * @var resource + */ + private $handle; + + /** + * @param string $prefix uniqid() prefix + * @param string $suffix e.g. file extension + * @throws \pharext\Exception + */ + public function __construct($prefix, $suffix = ".tmp") { + $tries = 0; + $omask = umask(077); + do { + $path = new Tempname($prefix, $suffix); + $this->handle = fopen($path, "x"); + } while (!is_resource($this->handle) && $tries++ < 10); + umask($omask); + + if (!is_resource($this->handle)) { + throw new Exception("Could not create temporary file"); + } + + parent::__construct($path); + } + + /** + * Unlink the file + */ + public function __destruct() { + if (is_file($this->getPathname())) { + @unlink($this->getPathname()); + } + } + + /** + * Close the stream + */ + public function closeStream() { + fclose($this->handle); + } + + /** + * Retrieve the stream resource + * @return resource + */ + public function getStream() { + return $this->handle; + } +} + + + +namespace pharext; + +/** + * Create a temporary directory + */ +class Tempdir extends \SplFileInfo +{ + /** + * @param string $prefix prefix to uniqid() + * @throws \pharext\Exception + */ + public function __construct($prefix) { + $temp = new Tempname($prefix); + if (!is_dir($temp) && !mkdir($temp, 0700, true)) { + throw new Exception("Could not create tempdir: ".error_get_last()["message"]); + } + parent::__construct($temp); + } +} + + + +namespace pharext; + +use ArrayAccess; +use IteratorAggregate; +use RecursiveDirectoryIterator; +use SplFileInfo; + +use pharext\Exception; + +class Archive implements ArrayAccess, IteratorAggregate +{ + const HALT_COMPILER = "\137\137\150\141\154\164\137\143\157\155\160\151\154\145\162\50\51\73"; + const SIGNED = 0x10000; + const SIG_MD5 = 0x0001; + const SIG_SHA1 = 0x0002; + const SIG_SHA256 = 0x0003; + const SIG_SHA512 = 0x0004; + const SIG_OPENSSL= 0x0010; + + private static $siglen = [ + self::SIG_MD5 => 16, + self::SIG_SHA1 => 20, + self::SIG_SHA256 => 32, + self::SIG_SHA512 => 64, + self::SIG_OPENSSL=> 0 + ]; + + private static $sigalg = [ + self::SIG_MD5 => "md5", + self::SIG_SHA1 => "sha1", + self::SIG_SHA256 => "sha256", + self::SIG_SHA512 => "sha512", + self::SIG_OPENSSL=> "openssl" + ]; + + private static $sigtyp = [ + self::SIG_MD5 => "MD5", + self::SIG_SHA1 => "SHA-1", + self::SIG_SHA256 => "SHA-256", + self::SIG_SHA512 => "SHA-512", + self::SIG_OPENSSL=> "OpenSSL", + ]; + + const PERM_FILE_MASK = 0x01ff; + const COMP_FILE_MASK = 0xf000; + const COMP_GZ_FILE = 0x1000; + const COMP_BZ2_FILE = 0x2000; + + const COMP_PHAR_MASK= 0xf000; + const COMP_PHAR_GZ = 0x1000; + const COMP_PHAR_BZ2 = 0x2000; + + private $file; + private $fd; + private $stub; + private $manifest; + private $signature; + private $extracted; + + function __construct($file = null) { + if (strlen($file)) { + $this->open($file); + } + } + + function open($file) { + if (!$this->fd = @fopen($file, "r")) { + throw new Exception; + } + $this->file = $file; + $this->stub = $this->readStub(); + $this->manifest = $this->readManifest(); + $this->signature = $this->readSignature(); + } + + function getIterator() { + return new RecursiveDirectoryIterator($this->extract()); + } + + function extract() { + return $this->extracted ?: $this->extractTo(new Tempdir("archive")); + } + + function extractTo($dir) { + if ((string) $this->extracted == (string) $dir) { + return $this->extracted; + } + foreach ($this->manifest["entries"] as $file => $entry) { + fseek($this->fd, $this->manifest["offset"]+$entry["offset"]); + $path = "$dir/$file"; + $copy = stream_copy_to_stream($this->fd, $this->outFd($path, $entry["flags"]), $entry["csize"]); + if ($entry["osize"] != $copy) { + throw new Exception("Copied '$copy' of '$file', expected '{$entry["osize"]}' from '{$entry["csize"]}"); + } + + $crc = hexdec(hash_file("crc32b", $path)); + if ($crc !== $entry["crc32"]) { + throw new Exception("CRC mismatch of '$file': '$crc' != '{$entry["crc32"]}"); + } + + chmod($path, $entry["flags"] & self::PERM_FILE_MASK); + touch($path, $entry["stamp"]); + } + return $this->extracted = $dir; + } + + function offsetExists($o) { + return isset($this->entries[$o]); + } + + function offsetGet($o) { + $this->extract(); + return new SplFileInfo($this->extracted."/$o"); + } + + function offsetSet($o, $v) { + throw new Exception("Archive is read-only"); + } + + function offsetUnset($o) { + throw new Exception("Archive is read-only"); + } + + function getSignature() { + /* compatible with Phar::getSignature() */ + return [ + "hash_type" => self::$sigtyp[$this->signature["flags"]], + "hash" => strtoupper(bin2hex($this->signature["hash"])), + ]; + } + + function getPath() { + /* compatible with Phar::getPath() */ + return new SplFileInfo($this->file); + } + + function getMetadata($key = null) { + if (isset($key)) { + return $this->manifest["meta"][$key]; + } + return $this->manifest["meta"]; + } + + private function outFd($path, $flags) { + $dirn = dirname($path); + if (!is_dir($dirn) && !@mkdir($dirn, 0777, true)) { + throw new Exception; + } + if (!$fd = @fopen($path, "w")) { + throw new Exception; + } + switch ($flags & self::COMP_FILE_MASK) { + case self::COMP_GZ_FILE: + if (!@stream_filter_append($fd, "zlib.inflate")) { + throw new Exception; + } + break; + case self::COMP_BZ2_FILE: + if (!@stream_filter_append($fd, "bz2.decompress")) { + throw new Exception; + } + break; + } + + } + private function readVerified($fd, $len) { + if ($len != strlen($data = fread($fd, $len))) { + throw new Exception("Unexpected EOF"); + } + return $data; + } + + private function readFormat($format, $fd, $len) { + if (false === ($data = @unpack($format, $this->readVerified($fd, $len)))) { + throw new Exception; + } + return $data; + } + + private function readSingleFormat($format, $fd, $len) { + return current($this->readFormat($format, $fd, $len)); + } + + private function readStringBinary($fd) { + if (($length = $this->readSingleFormat("V", $fd, 4))) { + return $this->readVerified($this->fd, $length); + } + return null; + } + + private function readSerializedBinary($fd) { + if (($length = $this->readSingleFormat("V", $fd, 4))) { + if (false === ($data = unserialize($this->readVerified($fd, $length)))) { + throw new Exception; + } + return $data; + } + return null; + } + + private function readStub() { + $stub = ""; + while (!feof($this->fd)) { + $line = fgets($this->fd); + $stub .= $line; + if (false !== stripos($line, self::HALT_COMPILER)) { + /* check for '?>' on a separate line */ + if ('?>' === $this->readVerified($this->fd, 2)) { + $stub .= '?>' . fgets($this->fd); + } else { + fseek($this->fd, -2, SEEK_CUR); + } + break; + } + } + return $stub; + } + + private function readManifest() { + $current = ftell($this->fd); + $header = $this->readFormat("Vlen/Vnum/napi/Vflags", $this->fd, 14); + $alias = $this->readStringBinary($this->fd); + $meta = $this->readSerializedBinary($this->fd); + $entries = []; + for ($i = 0; $i < $header["num"]; ++$i) { + $this->readEntry($entries); + } + $offset = ftell($this->fd); + if (($length = $offset - $current - 4) != $header["len"]) { + throw new Exception("Manifest length read was '$length', expected '{$header["len"]}'"); + } + return $header + compact("alias", "meta", "entries", "offset"); + } + + private function readEntry(array &$entries) { + if (!count($entries)) { + $offset = 0; + } else { + $last = end($entries); + $offset = $last["offset"] + $last["csize"]; + } + $file = $this->readStringBinary($this->fd); + if (!strlen($file)) { + throw new Exception("Empty file name encountered at offset '$offset'"); + } + $header = $this->readFormat("Vosize/Vstamp/Vcsize/Vcrc32/Vflags", $this->fd, 20); + $meta = $this->readSerializedBinary($this->fd); + $entries[$file] = $header + compact("meta", "offset"); + } + + private function readSignature() { + fseek($this->fd, -8, SEEK_END); + $sig = $this->readFormat("Vflags/Z4magic", $this->fd, 8); + $end = ftell($this->fd); + + if ($sig["magic"] !== "GBMB") { + throw new Exception("Invalid signature magic value '{$sig["magic"]}"); + } + + switch ($sig["flags"]) { + case self::SIG_OPENSSL: + fseek($this->fd, -12, SEEK_END); + if (($hash = $this->readSingleFormat("V", $this->fd, 4))) { + $offset = 4 + $hash; + fseek($this->fd, -$offset, SEEK_CUR); + $hash = $this->readVerified($this->fd, $hash); + fseek($this->fd, 0, SEEK_SET); + $valid = openssl_verify($this->readVerified($this->fd, $end - $offset - 8), + $hash, @file_get_contents($this->file.".pubkey")) === 1; + } + break; + + case self::SIG_MD5: + case self::SIG_SHA1: + case self::SIG_SHA256: + case self::SIG_SHA512: + $offset = 8 + self::$siglen[$sig["flags"]]; + fseek($this->fd, -$offset, SEEK_END); + $hash = $this->readVerified($this->fd, self::$siglen[$sig["flags"]]); + $algo = hash_init(self::$sigalg[$sig["flags"]]); + fseek($this->fd, 0, SEEK_SET); + hash_update_stream($algo, $this->fd, $end - $offset); + $valid = hash_final($algo, true) === $hash; + break; + + default: + throw new Exception("Invalid signature type '{$sig["flags"]}"); + } + + return $sig + compact("hash", "valid"); + } +} + + +namespace pharext; + +if (extension_loaded("Phar")) { + \Phar::interceptFileFuncs(); + \Phar::mapPhar(); + $phardir = "phar://".__FILE__; +} else { + $archive = new Archive(__FILE__); + $phardir = $archive->extract(); +} + +set_include_path("$phardir:". get_include_path()); + +$installer = new Installer(); +$installer->run($argc, $argv); + +__HALT_COMPILER(); ?> +³8*a:7:{s:7:"version";s:5:"4.1.1";s:6:"header";s:49:"pharext v4.1.1 (c) Michael Wallner ";s:4:"date";s:10:"2015-09-28";s:4:"name";s:6:"propro";s:7:"release";s:6:"master";s:7:"license";s:1345:"Copyright (c) 2013, Michael Wallner . +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +";s:4:"type";s:9:"extension";}pharext/Archive.php l V4-ÔI¶pharext/Cli/Args/Help.phpÉ l VÉ gX'¶pharext/Cli/Args.php l V?nö¶pharext/Cli/Command.phpk l Vk d„aê¶pharext/Command.php l VÔm`Ͷpharext/Exception.phpc l VcU†Ï{¶pharext/ExecCmd.php l V¹l”ʶpharext/Installer.php& l V&ød&À¶pharext/License.php“ l V“îòE¶pharext/Metadata.php• l V•¿Úž¶pharext/Openssl/PrivateKey.phpÁ l VÁ&æP¶pharext/Packager.phpÌ! l VÌ!0<¶pharext/SourceDir/Basic.phpz l Vz÷+Ôâ¶pharext/SourceDir/Git.phpZ l VZÉÎ\¶pharext/SourceDir/Pecl.phpø l Vøãùжpharext/SourceDir.php½ l V½3·#¶pharext/Task/Activate.phpÜ l VÜ I“¶pharext/Task/Askpass.phpU l VU‡*¶ pharext/Task/BundleGenerator.php} l V} ï`Y¶pharext/Task/Cleanup.php l VÉI€B¶pharext/Task/Configure.phpT l VT}Ëì¶pharext/Task/Extract.phpp l Vp[¨Û̶pharext/Task/GitClone.phpm l Vmóyµ@¶pharext/Task/Make.phpª l Vªœç6 ¶pharext/Task/PaxFixup.php¬ l V¬y⯶pharext/Task/PeclFixup.phpœ l Vœeùtš¶pharext/Task/PharBuild.phpâ l Vâζ0ɶpharext/Task/PharCompress.phpc l Vc½³Ï¶pharext/Task/PharRename.phpä l VäŠ[Þ˶pharext/Task/PharSign.php¨ l V¨Ûº¦i¶pharext/Task/PharStub.phpæ l VæY|­›¶pharext/Task/Phpize.php l Vù 2Ѷpharext/Task/StreamFetch.php l Vˆîs\¶pharext/Task.phpw l Vw ÄIǶpharext/Tempdir.phpµ l Vµë–,¶pharext/Tempfile.php l V®ô¶pharext/Tempname.phpt l Vtžn<¶pharext/Updater.php l VžÏv¶pharext_installer.phpÝ l VÝŒÞq¶pharext_packager.phpb l VbîVÓ϶pharext_updater.phph l Vh Êúj¶.gitattributes2 l V2¡øNt¶ +.gitignoreº l VºœÆwg¶CREDITS l Vu÷BζDoxyfilea* l Va*¯d¶LICENSEA l VA¾¬Jþ¶ README.mdñ l Vñ-)u¶ config.m4 l V k"¶ +config.w32Ö l VÖÈ5²¶ package.xmlµ l VµÈjg¶ php_propro.c08 l V08™ÿ^¶ php_propro.hO l VOG+™¶php_propro_api.hý l Vý´ #•¶tests/001.phpt9 l V92Õ½A¶tests/002.phpt8 l V8L¶tests/003.phptï l VïU8Ìå¶ 16, + self::SIG_SHA1 => 20, + self::SIG_SHA256 => 32, + self::SIG_SHA512 => 64, + self::SIG_OPENSSL=> 0 + ]; + + private static $sigalg = [ + self::SIG_MD5 => "md5", + self::SIG_SHA1 => "sha1", + self::SIG_SHA256 => "sha256", + self::SIG_SHA512 => "sha512", + self::SIG_OPENSSL=> "openssl" + ]; + + private static $sigtyp = [ + self::SIG_MD5 => "MD5", + self::SIG_SHA1 => "SHA-1", + self::SIG_SHA256 => "SHA-256", + self::SIG_SHA512 => "SHA-512", + self::SIG_OPENSSL=> "OpenSSL", + ]; + + const PERM_FILE_MASK = 0x01ff; + const COMP_FILE_MASK = 0xf000; + const COMP_GZ_FILE = 0x1000; + const COMP_BZ2_FILE = 0x2000; + + const COMP_PHAR_MASK= 0xf000; + const COMP_PHAR_GZ = 0x1000; + const COMP_PHAR_BZ2 = 0x2000; + + private $file; + private $fd; + private $stub; + private $manifest; + private $signature; + private $extracted; + + function __construct($file = null) { + if (strlen($file)) { + $this->open($file); + } + } + + function open($file) { + if (!$this->fd = @fopen($file, "r")) { + throw new Exception; + } + $this->file = $file; + $this->stub = $this->readStub(); + $this->manifest = $this->readManifest(); + $this->signature = $this->readSignature(); + } + + function getIterator() { + return new RecursiveDirectoryIterator($this->extract()); + } + + function extract() { + return $this->extracted ?: $this->extractTo(new Tempdir("archive")); + } + + function extractTo($dir) { + if ((string) $this->extracted == (string) $dir) { + return $this->extracted; + } + foreach ($this->manifest["entries"] as $file => $entry) { + fseek($this->fd, $this->manifest["offset"]+$entry["offset"]); + $path = "$dir/$file"; + $copy = stream_copy_to_stream($this->fd, $this->outFd($path, $entry["flags"]), $entry["csize"]); + if ($entry["osize"] != $copy) { + throw new Exception("Copied '$copy' of '$file', expected '{$entry["osize"]}' from '{$entry["csize"]}"); + } + + $crc = hexdec(hash_file("crc32b", $path)); + if ($crc !== $entry["crc32"]) { + throw new Exception("CRC mismatch of '$file': '$crc' != '{$entry["crc32"]}"); + } + + chmod($path, $entry["flags"] & self::PERM_FILE_MASK); + touch($path, $entry["stamp"]); + } + return $this->extracted = $dir; + } + + function offsetExists($o) { + return isset($this->entries[$o]); + } + + function offsetGet($o) { + $this->extract(); + return new SplFileInfo($this->extracted."/$o"); + } + + function offsetSet($o, $v) { + throw new Exception("Archive is read-only"); + } + + function offsetUnset($o) { + throw new Exception("Archive is read-only"); + } + + function getSignature() { + /* compatible with Phar::getSignature() */ + return [ + "hash_type" => self::$sigtyp[$this->signature["flags"]], + "hash" => strtoupper(bin2hex($this->signature["hash"])), + ]; + } + + function getPath() { + /* compatible with Phar::getPath() */ + return new SplFileInfo($this->file); + } + + function getMetadata($key = null) { + if (isset($key)) { + return $this->manifest["meta"][$key]; + } + return $this->manifest["meta"]; + } + + private function outFd($path, $flags) { + $dirn = dirname($path); + if (!is_dir($dirn) && !@mkdir($dirn, 0777, true)) { + throw new Exception; + } + if (!$fd = @fopen($path, "w")) { + throw new Exception; + } + switch ($flags & self::COMP_FILE_MASK) { + case self::COMP_GZ_FILE: + if (!@stream_filter_append($fd, "zlib.inflate")) { + throw new Exception; + } + break; + case self::COMP_BZ2_FILE: + if (!@stream_filter_append($fd, "bz2.decompress")) { + throw new Exception; + } + break; + } + + } + private function readVerified($fd, $len) { + if ($len != strlen($data = fread($fd, $len))) { + throw new Exception("Unexpected EOF"); + } + return $data; + } + + private function readFormat($format, $fd, $len) { + if (false === ($data = @unpack($format, $this->readVerified($fd, $len)))) { + throw new Exception; + } + return $data; + } + + private function readSingleFormat($format, $fd, $len) { + return current($this->readFormat($format, $fd, $len)); + } + + private function readStringBinary($fd) { + if (($length = $this->readSingleFormat("V", $fd, 4))) { + return $this->readVerified($this->fd, $length); + } + return null; + } + + private function readSerializedBinary($fd) { + if (($length = $this->readSingleFormat("V", $fd, 4))) { + if (false === ($data = unserialize($this->readVerified($fd, $length)))) { + throw new Exception; + } + return $data; + } + return null; + } + + private function readStub() { + $stub = ""; + while (!feof($this->fd)) { + $line = fgets($this->fd); + $stub .= $line; + if (false !== stripos($line, self::HALT_COMPILER)) { + /* check for '?>' on a separate line */ + if ('?>' === $this->readVerified($this->fd, 2)) { + $stub .= '?>' . fgets($this->fd); + } else { + fseek($this->fd, -2, SEEK_CUR); + } + break; + } + } + return $stub; + } + + private function readManifest() { + $current = ftell($this->fd); + $header = $this->readFormat("Vlen/Vnum/napi/Vflags", $this->fd, 14); + $alias = $this->readStringBinary($this->fd); + $meta = $this->readSerializedBinary($this->fd); + $entries = []; + for ($i = 0; $i < $header["num"]; ++$i) { + $this->readEntry($entries); + } + $offset = ftell($this->fd); + if (($length = $offset - $current - 4) != $header["len"]) { + throw new Exception("Manifest length read was '$length', expected '{$header["len"]}'"); + } + return $header + compact("alias", "meta", "entries", "offset"); + } + + private function readEntry(array &$entries) { + if (!count($entries)) { + $offset = 0; + } else { + $last = end($entries); + $offset = $last["offset"] + $last["csize"]; + } + $file = $this->readStringBinary($this->fd); + if (!strlen($file)) { + throw new Exception("Empty file name encountered at offset '$offset'"); + } + $header = $this->readFormat("Vosize/Vstamp/Vcsize/Vcrc32/Vflags", $this->fd, 20); + $meta = $this->readSerializedBinary($this->fd); + $entries[$file] = $header + compact("meta", "offset"); + } + + private function readSignature() { + fseek($this->fd, -8, SEEK_END); + $sig = $this->readFormat("Vflags/Z4magic", $this->fd, 8); + $end = ftell($this->fd); + + if ($sig["magic"] !== "GBMB") { + throw new Exception("Invalid signature magic value '{$sig["magic"]}"); + } + + switch ($sig["flags"]) { + case self::SIG_OPENSSL: + fseek($this->fd, -12, SEEK_END); + if (($hash = $this->readSingleFormat("V", $this->fd, 4))) { + $offset = 4 + $hash; + fseek($this->fd, -$offset, SEEK_CUR); + $hash = $this->readVerified($this->fd, $hash); + fseek($this->fd, 0, SEEK_SET); + $valid = openssl_verify($this->readVerified($this->fd, $end - $offset - 8), + $hash, @file_get_contents($this->file.".pubkey")) === 1; + } + break; + + case self::SIG_MD5: + case self::SIG_SHA1: + case self::SIG_SHA256: + case self::SIG_SHA512: + $offset = 8 + self::$siglen[$sig["flags"]]; + fseek($this->fd, -$offset, SEEK_END); + $hash = $this->readVerified($this->fd, self::$siglen[$sig["flags"]]); + $algo = hash_init(self::$sigalg[$sig["flags"]]); + fseek($this->fd, 0, SEEK_SET); + hash_update_stream($algo, $this->fd, $end - $offset); + $valid = hash_final($algo, true) === $hash; + break; + + default: + throw new Exception("Invalid signature type '{$sig["flags"]}"); + } + + return $sig + compact("hash", "valid"); + } +} +prog = $prog; + $this->args = $args; + } + + function __toString() { + $usage = "Usage:\n\n \$ "; + $usage .= $this->prog; + + list($flags, $required, $optional, $positional) = $this->listSpec(); + if ($flags) { + $usage .= $this->dumpFlags($flags); + } + if ($required) { + $usage .= $this->dumpRequired($required); + } + if ($optional) { + $usage .= $this->dumpOptional($optional); + } + if ($positional) { + $usage .= $this->dumpPositional($positional); + } + + $help = $this->dumpHelp($positional); + + return $usage . "\n\n" . $help . "\n"; + } + + function listSpec() { + $flags = []; + $required = []; + $optional = []; + $positional = []; + foreach ($this->args->getSpec() as $spec) { + if (is_numeric($spec[0])) { + $positional[] = $spec; + } elseif ($spec[3] & Args::REQUIRED) { + $required[] = $spec; + } elseif ($spec[3] & (Args::OPTARG|Args::REQARG)) { + $optional[] = $spec; + } else { + $flags[] = $spec; + } + } + + return [$flags, $required, $optional, $positional] + + compact("flags", "required", "optional", "positional"); + } + + function dumpFlags(array $flags) { + return sprintf(" [-%s]", implode("", array_column($flags, 0))); + } + + function dumpRequired(array $required) { + $dump = ""; + foreach ($required as $req) { + $dump .= sprintf(" -%s <%s>", $req[0], $req[1]); + } + return $dump; + } + + function dumpOptional(array $optional) { + $req = array_filter($optional, function($a) { + return $a[3] & Args::REQARG; + }); + $opt = array_filter($optional, function($a) { + return $a[3] & Args::OPTARG; + }); + + $dump = ""; + if ($req) { + $dump .= sprintf(" [-%s ]", implode("|-", array_column($req, 0))); + } + if ($opt) { + $dump .= sprintf(" [-%s []]", implode("|-", array_column($opt, 0))); + } + return $dump; + } + + function dumpPositional(array $positional) { + $dump = " [--]"; + foreach ($positional as $pos) { + if ($pos[3] & Args::REQUIRED) { + $dump .= sprintf(" <%s>", $pos[1]); + } else { + $dump .= sprintf(" [<%s>]", $pos[1]); + } + if ($pos[3] & Args::MULTI) { + $dump .= sprintf(" [<%s>]...", $pos[1]); + } + } + return $dump; + } + + function calcMaxLen() { + $spc = $this->args->getSpec(); + $max = max(array_map("strlen", array_column($spc, 1))); + $max += $max % 8 + 2; + return $max; + } + + function dumpHelp() { + $max = $this->calcMaxLen(); + $dump = ""; + foreach ($this->args->getSpec() as $spec) { + $dump .= " "; + if (is_numeric($spec[0])) { + $dump .= sprintf("-- %s ", $spec[1]); + } elseif (isset($spec[0])) { + $dump .= sprintf("-%s|", $spec[0]); + } + if (!is_numeric($spec[0])) { + $dump .= sprintf("--%s ", $spec[1]); + } + if ($spec[3] & Args::REQARG) { + $dump .= " "; + } elseif ($spec[3] & Args::OPTARG) { + $dump .= "[]"; + } else { + $dump .= " "; + } + + $dump .= str_repeat(" ", $max-strlen($spec[1])+3*!isset($spec[0])); + $dump .= $spec[2]; + + if ($spec[3] & Args::REQUIRED) { + $dump .= " (REQUIRED)"; + } + if ($spec[3] & Args::MULTI) { + $dump .= " (MULTIPLE)"; + } + if (isset($spec[4])) { + $dump .= sprintf(" [%s]", $spec[4]); + } + $dump .= "\n"; + } + return $dump; + } +} +compile($spec); + } + + } + + /** + * Compile the original spec + * @param array|Traversable $spec + * @return pharext\Cli\Args self + */ + public function compile($spec) { + foreach ($spec as $arg) { + if (isset($arg[0]) && is_numeric($arg[0])) { + $arg[3] &= ~0xf00; + $this->spec["--".$arg[0]] = $arg; + } elseif (isset($arg[0])) { + $this->spec["-".$arg[0]] = $arg; + $this->spec["--".$arg[1]] = $arg; + } else { + $this->spec["--".$arg[1]] = $arg; + } + $this->orig[] = $arg; + } + return $this; + } + + /** + * Get original spec + * @return array + */ + public function getSpec() { + return $this->orig; + } + + /** + * Get compiled spec + * @return array + */ + public function getCompiledSpec() { + return $this->spec; + } + + /** + * Parse command line arguments according to the compiled spec. + * + * The Generator yields any parsing errors. + * Parsing will stop when all arguments are processed or the first option + * flagged Cli\Args::HALT was encountered. + * + * @param int $argc + * @param array $argv + * @return Generator + */ + public function parse($argc, array $argv) { + for ($f = false, $p = 0, $i = 0; $i < $argc; ++$i) { + $o = $argv[$i]; + + if ($o{0} === "-" && strlen($o) > 2 && $o{1} !== "-") { + // multiple short opts, e.g. -vps + $argc += strlen($o) - 2; + array_splice($argv, $i, 1, array_map(function($s) { + return "-$s"; + }, str_split(substr($o, 1)))); + $o = $argv[$i]; + } elseif ($o{0} === "-" && strlen($o) > 2 && $o{1} === "-" && 0 < ($eq = strpos($o, "="))) { + // long opt with argument, e.g. --foo=bar + $argc++; + array_splice($argv, $i, 1, [ + substr($o, 0, $eq++), + substr($o, $eq) + ]); + $o = $argv[$i]; + } elseif ($o === "--") { + // only positional args following + $f = true; + continue; + } + + if ($f || !isset($this->spec[$o])) { + if ($o{0} !== "-" && isset($this->spec["--$p"])) { + $this[$p] = $o; + if (!$this->optIsMulti($p)) { + ++$p; + } + } else { + yield sprintf("Unknown option %s", $o); + } + } elseif (!$this->optAcceptsArg($o)) { + $this[$o] = true; + } elseif ($i+1 < $argc && !isset($this->spec[$argv[$i+1]])) { + $this[$o] = $argv[++$i]; + } elseif ($this->optRequiresArg($o)) { + yield sprintf("Option --%s requires an argument", $this->optLongName($o)); + } else { + // OPTARG + $this[$o] = $this->optDefaultArg($o); + } + + if ($this->optHalts($o)) { + return; + } + } + } + + /** + * Validate that all required options were given. + * + * The Generator yields any validation errors. + * + * @return Generator + */ + public function validate() { + $required = array_filter($this->orig, function($spec) { + return $spec[3] & self::REQUIRED; + }); + foreach ($required as $req) { + if ($req[3] & self::MULTI) { + if (is_array($this[$req[0]])) { + continue; + } + } elseif (strlen($this[$req[0]])) { + continue; + } + if (is_numeric($req[0])) { + yield sprintf("Argument <%s> is required", $req[1]); + } else { + yield sprintf("Option --%s is required", $req[1]); + } + } + } + + + public function toArray() { + $args = []; + foreach ($this->spec as $spec) { + $opt = $this->opt($spec[1]); + $args[$opt] = $this[$opt]; + } + return $args; + } + + /** + * Retreive the default argument of an option + * @param string $o + * @return mixed + */ + private function optDefaultArg($o) { + $o = $this->opt($o); + if (isset($this->spec[$o][4])) { + return $this->spec[$o][4]; + } + return null; + } + + /** + * Retrieve the help message of an option + * @param string $o + * @return string + */ + private function optHelp($o) { + $o = $this->opt($o); + if (isset($this->spec[$o][2])) { + return $this->spec[$o][2]; + } + return ""; + } + + /** + * Retrieve option's flags + * @param string $o + * @return int + */ + private function optFlags($o) { + $o = $this->opt($o); + if (isset($this->spec[$o])) { + return $this->spec[$o][3]; + } + return null; + } + + /** + * Check whether an option is flagged for halting argument processing + * @param string $o + * @return boolean + */ + private function optHalts($o) { + return $this->optFlags($o) & self::HALT; + } + + /** + * Check whether an option needs an argument + * @param string $o + * @return boolean + */ + private function optRequiresArg($o) { + return $this->optFlags($o) & self::REQARG; + } + + /** + * Check wether an option accepts any argument + * @param string $o + * @return boolean + */ + private function optAcceptsArg($o) { + return $this->optFlags($o) & 0xf00; + } + + /** + * Check whether an option can be used more than once + * @param string $o + * @return boolean + */ + private function optIsMulti($o) { + return $this->optFlags($o) & self::MULTI; + } + + /** + * Retreive the long name of an option + * @param string $o + * @return string + */ + private function optLongName($o) { + $o = $this->opt($o); + return is_numeric($this->spec[$o][0]) ? $this->spec[$o][0] : $this->spec[$o][1]; + } + + /** + * Retreive the short name of an option + * @param string $o + * @return string + */ + private function optShortName($o) { + $o = $this->opt($o); + return is_numeric($this->spec[$o][0]) ? null : $this->spec[$o][0]; + } + + /** + * Retreive the canonical name (--long-name) of an option + * @param string $o + * @return string + */ + private function opt($o) { + if (is_numeric($o)) { + return "--$o"; + } + if ($o{0} !== '-') { + if (strlen($o) > 1) { + $o = "-$o"; + } + $o = "-$o"; + } + return $o; + } + + /**@+ + * Implements ArrayAccess and virtual properties + */ + function offsetExists($o) { + $o = $this->opt($o); + return isset($this->args[$o]); + } + function __isset($o) { + return $this->offsetExists($o); + } + function offsetGet($o) { + $o = $this->opt($o); + if (isset($this->args[$o])) { + return $this->args[$o]; + } + return $this->optDefaultArg($o); + } + function __get($o) { + return $this->offsetGet($o); + } + function offsetSet($o, $v) { + $osn = $this->optShortName($o); + $oln = $this->optLongName($o); + if ($this->optIsMulti($o)) { + if (isset($osn)) { + $this->args["-$osn"][] = $v; + } + $this->args["--$oln"][] = $v; + } else { + if (isset($osn)) { + $this->args["-$osn"] = $v; + } + $this->args["--$oln"] = $v; + } + } + function __set($o, $v) { + $this->offsetSet($o, $v); + } + function offsetUnset($o) { + unset($this->args["-".$this->optShortName($o)]); + unset($this->args["--".$this->optLongName($o)]); + } + function __unset($o) { + $this->offsetUnset($o); + } + /**@-*/ +} +args; + } + + /** + * Retrieve metadata of the currently running phar + * @param string $key + * @return mixed + */ + public function metadata($key = null) { + if (extension_loaded("Phar")) { + $running = new Phar(Phar::running(false)); + } else { + $running = new Archive(PHAREXT_PHAR); + } + + if ($key === "signature") { + $sig = $running->getSignature(); + return sprintf("%s signature of %s\n%s", + $sig["hash_type"], + $this->metadata("name"), + chunk_split($sig["hash"], 64, "\n")); + } + + $metadata = $running->getMetadata(); + if (isset($key)) { + return $metadata[$key]; + } + return $metadata; + } + + /** + * Output pharext vX.Y.Z header + */ + public function header() { + if (!headers_sent()) { + /* only display header, if we didn't generate any output yet */ + printf("%s\n\n", $this->metadata("header")); + } + } + + /** + * @inheritdoc + * @see \pharext\Command::debug() + */ + public function debug($fmt) { + if ($this->args->verbose) { + vprintf($fmt, array_slice(func_get_args(), 1)); + } + } + + /** + * @inheritdoc + * @see \pharext\Command::info() + */ + public function info($fmt) { + if (!$this->args->quiet) { + vprintf($fmt, array_slice(func_get_args(), 1)); + } + } + + /** + * @inheritdoc + * @see \pharext\Command::warn() + */ + public function warn($fmt) { + if (!$this->args->quiet) { + if (!isset($fmt)) { + $fmt = "%s\n"; + $arg = error_get_last()["message"]; + } else { + $arg = array_slice(func_get_args(), 1); + } + vfprintf(STDERR, "Warning: $fmt", $arg); + } + } + + /** + * @inheritdoc + * @see \pharext\Command::error() + */ + public function error($fmt) { + if (!isset($fmt)) { + $fmt = "%s\n"; + $arg = error_get_last()["message"]; + } else { + $arg = array_slice(func_get_args(), 1); + } + vfprintf(STDERR, "ERROR: $fmt", $arg); + } + + /** + * Output command line help message + * @param string $prog + */ + public function help($prog) { + print new Args\Help($prog, $this->args); + } + + /** + * Verbosity + * @return boolean + */ + public function verbosity() { + if ($this->args->verbose) { + return true; + } elseif ($this->args->quiet) { + return false; + } else { + return null; + } + } +} +command = $command; + $this->verbose = $verbose; + } + + /** + * (Re-)set sudo command + * @param string $sudo + */ + public function setSu($sudo = false) { + $this->sudo = $sudo; + } + + /** + * Execute a program with escalated privileges handling interactive password prompt + * @param string $command + * @param bool $verbose + * @return int exit status + */ + private function suExec($command, $verbose = null) { + if (!($proc = proc_open($command, [STDIN,["pipe","w"],["pipe","w"]], $pipes))) { + $this->status = -1; + throw new Exception("Failed to run {$command}"); + } + + $stdout = $pipes[1]; + $passwd = 0; + $checks = 10; + + while (!feof($stdout)) { + $R = [$stdout]; $W = []; $E = []; + if (!stream_select($R, $W, $E, null)) { + continue; + } + $data = fread($stdout, 0x1000); + /* only check a few times */ + if ($passwd < $checks) { + $passwd++; + if (stristr($data, "password")) { + $passwd = $checks + 1; + printf("\n%s", $data); + continue; + } + } elseif ($passwd > $checks) { + /* new line after pw entry */ + printf("\n"); + $passwd = $checks; + } + + if ($verbose === null) { + print $this->progress($data, 0); + } else { + if ($verbose) { + printf("%s", $data); + } + $this->output .= $data; + } + } + if ($verbose === null) { + $this->progress("", PHP_OUTPUT_HANDLER_FINAL); + } + return $this->status = proc_close($proc); + } + + /** + * Output handler that displays some progress while soaking output + * @param string $string + * @param int $flags + * @return string + */ + private function progress($string, $flags) { + static $counter = 0; + static $symbols = ["\\","|","/","-"]; + + $this->output .= $string; + + if (false !== strpos($string, "\n")) { + ++$counter; + } + + return $flags & PHP_OUTPUT_HANDLER_FINAL + ? " \r" + : sprintf(" %s\r", $symbols[$counter % 4]); + } + + /** + * Run the command + * @param array $args + * @return \pharext\ExecCmd self + * @throws \pharext\Exception + */ + public function run(array $args = null) { + $exec = escapeshellcmd($this->command); + if ($args) { + $exec .= " ". implode(" ", array_map("escapeshellarg", (array) $args)); + } + + if ($this->sudo) { + $this->suExec(sprintf($this->sudo." 2>&1", $exec), $this->verbose); + } elseif ($this->verbose) { + ob_start(function($s) { + $this->output .= $s; + return $s; + }, 1); + passthru($exec, $this->status); + ob_end_flush(); + } elseif ($this->verbose !== false /* !quiet */) { + ob_start([$this, "progress"], 1); + passthru($exec . " 2>&1", $this->status); + ob_end_flush(); + } else { + exec($exec ." 2>&1", $output, $this->status); + $this->output = implode("\n", $output); + } + + if ($this->status) { + throw new Exception("Command {$exec} failed ({$this->status})"); + } + + return $this; + } + + /** + * Retrieve exit code of cmd run + * @return int + */ + public function getStatus() { + return $this->status; + } + + /** + * Retrieve output of cmd run + * @return string + */ + public function getOutput() { + return $this->output; + } +} +args = new Cli\Args([ + ["h", "help", "Display help", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + ["v", "verbose", "More output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["q", "quiet", "Less output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["p", "prefix", "PHP installation prefix if phpize is not in \$PATH, e.g. /opt/php7", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG], + ["n", "common-name", "PHP common program name, e.g. php5 or zts-php", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG, + "php"], + ["c", "configure", "Additional extension configure flags, e.g. -c --with-flag", + Cli\Args::OPTIONAL|Cli\Args::MULTI|Cli\Args::REQARG], + ["s", "sudo", "Installation might need increased privileges", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::OPTARG, + "sudo -S %s"], + ["i", "ini", "Activate in this php.ini instead of loaded default php.ini", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG], + [null, "signature", "Show package signature", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "license", "Show package license", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "name", "Show package name", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "date", "Show package release date", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "release", "Show package release version", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "version", "Show pharext version", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + ]); + } + + /** + * Perform cleaniup + */ + function __destruct() { + foreach ($this->cleanup as $cleanup) { + $cleanup->run(); + } + } + + private function extract($phar) { + $temp = (new Task\Extract($phar))->run($this->verbosity()); + $this->cleanup[] = new Task\Cleanup($temp); + return $temp; + } + + private function hooks(SplObjectStorage $phars) { + $hook = []; + foreach ($phars as $phar) { + if (isset($phar["pharext_package.php"])) { + $sdir = include $phar["pharext_package.php"]; + if ($sdir instanceof SourceDir) { + $this->args->compile($sdir->getArgs()); + $hook[] = $sdir; + } + } + } + return $hook; + } + + private function load() { + $list = new SplObjectStorage(); + $phar = extension_loaded("Phar") + ? new Phar(Phar::running(false)) + : new Archive(PHAREXT_PHAR); + $temp = $this->extract($phar); + + foreach ($phar as $entry) { + $dep_file = $entry->getBaseName(); + if (fnmatch("*.ext.phar*", $dep_file)) { + $dep_phar = extension_loaded("Phar") + ? new Phar("$temp/$dep_file") + : new Archive("$temp/$dep_file"); + $list[$dep_phar] = $this->extract($dep_phar); + } + } + + /* the actual ext.phar at last */ + $list[$phar] = $temp; + return $list; + } + + /** + * @inheritdoc + * @see \pharext\Command::run() + */ + public function run($argc, array $argv) { + try { + /* load the phar(s) */ + $list = $this->load(); + /* installer hooks */ + $hook = $this->hooks($list); + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EEXTRACT); + } + + /* standard arg stuff */ + $errs = []; + $prog = array_shift($argv); + foreach ($this->args->parse(--$argc, $argv) as $error) { + $errs[] = $error; + } + + if ($this->args["help"]) { + $this->header(); + $this->help($prog); + exit; + } + try { + foreach (["signature", "name", "date", "license", "release", "version"] as $opt) { + if ($this->args[$opt]) { + printf("%s\n", $this->metadata($opt)); + exit; + } + } + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EARGS); + } + + foreach ($this->args->validate() as $error) { + $errs[] = $error; + } + + if ($errs) { + if (!$this->args["quiet"]) { + $this->header(); + } + foreach ($errs as $err) { + $this->error("%s\n", $err); + } + if (!$this->args["quiet"]) { + $this->help($prog); + } + exit(self::EARGS); + } + + try { + /* post process hooks */ + foreach ($hook as $sdir) { + $sdir->setArgs($this->args); + } + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EARGS); + } + + /* install packages */ + try { + foreach ($list as $phar) { + $this->info("Installing %s ...\n", basename($phar->getPath())); + $this->install($list[$phar]); + $this->activate($list[$phar]); + $this->info("Successfully installed %s!\n", basename($phar->getPath())); + } + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EINSTALL); + } + } + + /** + * Phpize + trinity + */ + private function install($temp) { + // phpize + $phpize = new Task\Phpize($temp, $this->args->prefix, $this->args->{"common-name"}); + $phpize->run($this->verbosity()); + + // configure + $configure = new Task\Configure($temp, $this->args->configure, $this->args->prefix, $this->args->{"common-name"}); + $configure->run($this->verbosity()); + + // make + $make = new Task\Make($temp); + $make->run($this->verbosity()); + + // install + $sudo = isset($this->args->sudo) ? $this->args->sudo : null; + $install = new Task\Make($temp, ["install"], $sudo); + $install->run($this->verbosity()); + } + + private function activate($temp) { + if ($this->args->ini) { + $files = [$this->args->ini]; + } else { + $files = array_filter(array_map("trim", explode(",", php_ini_scanned_files()))); + $files[] = php_ini_loaded_file(); + } + + $sudo = isset($this->args->sudo) ? $this->args->sudo : null; + $type = $this->metadata("type") ?: "extension"; + + $activate = new Task\Activate($temp, $files, $type, $this->args->prefix, $this->args{"common-name"}, $sudo); + if (!$activate->run($this->verbosity())) { + $this->info("Extension already activated ...\n"); + } + } +} +mergeLicensePattern($name, strtolower($name)); + } + $exts = []; + foreach (["t{,e}xt", "rst", "asc{,i,ii}", "m{,ark}d{,own}", "htm{,l}"] as $ext) { + $exts[] = $this->mergeLicensePattern(strtoupper($ext), $ext); + } + + $pattern = "{". implode(",", $names) ."}{,.{". implode(",", $exts) ."}}"; + + if (($glob = glob("$dir/$pattern", GLOB_BRACE))) { + return current($glob); + } + } + + private function mergeLicensePattern($upper, $lower) { + $pattern = ""; + $length = strlen($upper); + for ($i = 0; $i < $length; ++$i) { + if ($lower{$i} === $upper{$i}) { + $pattern .= $upper{$i}; + } else { + $pattern .= "[" . $upper{$i} . $lower{$i} . "]"; + } + } + return $pattern; + } + + public function readLicense($file) { + $text = file_get_contents($file); + switch (strtolower(pathinfo($file, PATHINFO_EXTENSION))) { + case "htm": + case "html": + $text = strip_tags($text); + break; + } + return $text; + } +} +", self::version()); + } + + static function date() { + return gmdate("Y-m-d"); + } + + static function all() { + return [ + "version" => self::version(), + "header" => self::header(), + "date" => self::date(), + ]; + } +} +key); + $this->pub = openssl_pkey_get_details($key)["key"]; + } + + /** + * Sign the PHAR + * @param \Phar $package + */ + function sign(\Phar $package) { + $package->setSignatureAlgorithm(\Phar::OPENSSL, $this->key); + } + + /** + * Export the public key to a file + * @param string $file + * @throws \pharext\Exception + */ + function exportPublicKey($file) { + if (!file_put_contents("$file.tmp", $this->pub) || !rename("$file.tmp", $file)) { + throw new Exception; + } + } +} +args = new Cli\Args([ + ["h", "help", "Display this help", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + ["v", "verbose", "More output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["q", "quiet", "Less output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["n", "name", "Extension name", + Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG], + ["r", "release", "Extension release version", + Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG], + ["s", "source", "Extension source directory", + Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG], + ["g", "git", "Use `git ls-tree` to determine file list", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["b", "branch", "Checkout this tag/branch", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG], + ["p", "pecl", "Use PECL package.xml to determine file list, name and release", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["d", "dest", "Destination directory", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG, + "."], + ["z", "gzip", "Create additional PHAR compressed with gzip", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["Z", "bzip", "Create additional PHAR compressed with bzip", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["S", "sign", "Sign the PHAR with a private key", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG], + ["E", "zend", "Mark as Zend Extension", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + [null, "signature", "Show pharext signature", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "license", "Show pharext license", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "version", "Show pharext version", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + ]); + } + + /** + * Perform cleaniup + */ + function __destruct() { + foreach ($this->cleanup as $cleanup) { + $cleanup->run(); + } + } + + /** + * @inheritdoc + * @see \pharext\Command::run() + */ + public function run($argc, array $argv) { + $errs = []; + $prog = array_shift($argv); + foreach ($this->args->parse(--$argc, $argv) as $error) { + $errs[] = $error; + } + + if ($this->args["help"]) { + $this->header(); + $this->help($prog); + exit; + } + try { + foreach (["signature", "license", "version"] as $opt) { + if ($this->args[$opt]) { + printf("%s\n", $this->metadata($opt)); + exit; + } + } + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EARGS); + } + + try { + /* source needs to be evaluated before Cli\Args validation, + * so e.g. name and version can be overriden and Cli\Args + * does not complain about missing arguments + */ + $this->loadSource(); + } catch (\Exception $e) { + $errs[] = $e->getMessage(); + } + + foreach ($this->args->validate() as $error) { + $errs[] = $error; + } + + if ($errs) { + if (!$this->args["quiet"]) { + $this->header(); + } + foreach ($errs as $err) { + $this->error("%s\n", $err); + } + printf("\n"); + if (!$this->args["quiet"]) { + $this->help($prog); + } + exit(self::EARGS); + } + + $this->createPackage(); + } + + /** + * Download remote source + * @param string $source + * @return string local source + */ + private function download($source) { + if ($this->args->git) { + $task = new Task\GitClone($source, $this->args->branch); + } else { + /* print newline only once */ + $done = false; + $task = new Task\StreamFetch($source, function($bytes_pct) use(&$done) { + if (!$done) { + $this->info(" %3d%% [%s>%s] \r", + floor($bytes_pct*100), + str_repeat("=", round(50*$bytes_pct)), + str_repeat(" ", round(50*(1-$bytes_pct))) + ); + if ($bytes_pct == 1) { + $done = true; + $this->info("\n"); + } + } + }); + } + $local = $task->run($this->verbosity()); + + $this->cleanup[] = new Task\Cleanup($local); + return $local; + } + + /** + * Extract local archive + * @param stirng $source + * @return string extracted directory + */ + private function extract($source) { + try { + $task = new Task\Extract($source); + $dest = $task->run($this->verbosity()); + } catch (\Exception $e) { + if (false === strpos($e->getMessage(), "checksum mismatch")) { + throw $e; + } + $dest = (new Task\PaxFixup($source))->run($this->verbosity()); + } + + $this->cleanup[] = new Task\Cleanup($dest); + return $dest; + } + + /** + * Localize a possibly remote source + * @param string $source + * @return string local source directory + */ + private function localize($source) { + if (!stream_is_local($source) || ($this->args->git && isset($this->args->branch))) { + $source = $this->download($source); + $this->cleanup[] = new Task\Cleanup($source); + } + $source = realpath($source); + if (!is_dir($source)) { + $source = $this->extract($source); + $this->cleanup[] = new Task\Cleanup($source); + + if (!$this->args->git) { + $source = (new Task\PeclFixup($source))->run($this->verbosity()); + } + } + return $source; + } + + /** + * Load the source dir + * @throws \pharext\Exception + */ + private function loadSource(){ + if ($this->args["source"]) { + $source = $this->localize($this->args["source"]); + + if ($this->args["pecl"]) { + $this->source = new SourceDir\Pecl($source); + } elseif ($this->args["git"]) { + $this->source = new SourceDir\Git($source); + } elseif (is_file("$source/pharext_package.php")) { + $this->source = include "$source/pharext_package.php"; + } else { + $this->source = new SourceDir\Basic($source); + } + + if (!$this->source instanceof SourceDir) { + throw new Exception("Unknown source dir $source"); + } + + foreach ($this->source->getPackageInfo() as $key => $val) { + $this->args->$key = $val; + } + } + } + + /** + * Creates the extension phar + */ + private function createPackage() { + try { + $meta = array_merge(Metadata::all(), [ + "name" => $this->args->name, + "release" => $this->args->release, + "license" => $this->source->getLicense(), + "type" => $this->args->zend ? "zend_extension" : "extension", + ]); + $file = (new Task\PharBuild($this->source, __DIR__."/../pharext_installer.php", $meta))->run($this->verbosity()); + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EBUILD); + } + + try { + if ($this->args->sign) { + $this->info("Using private key to sign phar ...\n"); + $pass = (new Task\Askpass)->run($this->verbosity()); + $sign = new Task\PharSign($file, $this->args->sign, $pass); + $pkey = $sign->run($this->verbosity()); + } + + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::ESIGN); + } + + if ($this->args->gzip) { + try { + $gzip = (new Task\PharCompress($file, Phar::GZ))->run(); + $move = new Task\PharRename($gzip, $this->args->dest, $this->args->name ."-". $this->args->release); + $name = $move->run($this->verbosity()); + + $this->info("Created gzipped phar %s\n", $name); + + if ($this->args->sign) { + $sign = new Task\PharSign($name, $this->args->sign, $pass); + $sign->run($this->verbosity())->exportPublicKey($name.".pubkey"); + } + + } catch (\Exception $e) { + $this->warn("%s\n", $e->getMessage()); + } + } + + if ($this->args->bzip) { + try { + $bzip = (new Task\PharCompress($file, Phar::BZ2))->run(); + $move = new Task\PharRename($bzip, $this->args->dest, $this->args->name ."-". $this->args->release); + $name = $move->run($this->verbosity()); + + $this->info("Created bzipped phar %s\n", $name); + + if ($this->args->sign) { + $sign = new Task\PharSign($name, $this->args->sign, $pass); + $sign->run($this->verbosity())->exportPublicKey($name.".pubkey"); + } + + } catch (\Exception $e) { + $this->warn("%s\n", $e->getMessage()); + } + } + + try { + $move = new Task\PharRename($file, $this->args->dest, $this->args->name ."-". $this->args->release); + $name = $move->run($this->verbosity()); + + $this->info("Created executable phar %s\n", $name); + + if (isset($pkey)) { + $pkey->exportPublicKey($name.".pubkey"); + } + + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EBUILD); + } + } +} +path = $path; + } + + public function getBaseDir() { + return $this->path; + } + + public function getPackageInfo() { + return []; + } + + public function getLicense() { + if (($file = $this->findLicense($this->getBaseDir()))) { + return $this->readLicense($file); + } + return "UNKNOWN"; + } + + public function getArgs() { + return []; + } + + public function setArgs(Args $args) { + } + + public function filter($current, $key, $iterator) { + $sub = $current->getSubPath(); + if ($sub === ".git" || $sub === ".hg" || $sub === ".svn") { + return false; + } + return true; + } + + public function getIterator() { + $rdi = new RecursiveDirectoryIterator($this->path, + FilesystemIterator::CURRENT_AS_SELF | // needed for 5.5 + FilesystemIterator::KEY_AS_PATHNAME | + FilesystemIterator::SKIP_DOTS); + $rci = new RecursiveCallbackFilterIterator($rdi, [$this, "filter"]); + $rii = new RecursiveIteratorIterator($rci); + foreach ($rii as $path => $child) { + if (!$child->isDir()) { + yield realpath($path); + } + } + } +} +path = $path; + } + + /** + * @inheritdoc + * @see \pharext\SourceDir::getBaseDir() + */ + public function getBaseDir() { + return $this->path; + } + + /** + * @inheritdoc + * @return array + */ + public function getPackageInfo() { + return []; + } + + /** + * @inheritdoc + * @return string + */ + public function getLicense() { + if (($file = $this->findLicense($this->getBaseDir()))) { + return $this->readLicense($file); + } + return "UNKNOWN"; + } + + /** + * @inheritdoc + * @return array + */ + public function getArgs() { + return []; + } + + /** + * @inheritdoc + */ + public function setArgs(Args $args) { + } + + /** + * Generate a list of files by `git ls-files` + * @return Generator + */ + private function generateFiles() { + $pwd = getcwd(); + chdir($this->path); + if (($pipe = popen("git ls-tree -r --name-only HEAD", "r"))) { + $path = realpath($this->path); + while (!feof($pipe)) { + if (strlen($file = trim(fgets($pipe)))) { + /* there may be symlinks, so no realpath here */ + yield "$path/$file"; + } + } + pclose($pipe); + } + chdir($pwd); + } + + /** + * Implements IteratorAggregate + * @see IteratorAggregate::getIterator() + */ + public function getIterator() { + return $this->generateFiles(); + } +} +file = "$path/package2.xml"); + } elseif (is_file("$path/package.xml")) { + $sxe = simplexml_load_file($this->file = "$path/package.xml"); + } else { + throw new Exception("Missing package.xml in $path"); + } + + $sxe->registerXPathNamespace("pecl", $sxe->getDocNamespaces()[""]); + + $this->sxe = $sxe; + $this->path = realpath($path); + } + + /** + * @inheritdoc + * @see \pharext\SourceDir::getBaseDir() + */ + public function getBaseDir() { + return $this->path; + } + + /** + * Retrieve gathered package info + * @return Generator + */ + public function getPackageInfo() { + if (($name = $this->sxe->xpath("/pecl:package/pecl:name"))) { + yield "name" => (string) $name[0]; + } + if (($release = $this->sxe->xpath("/pecl:package/pecl:version/pecl:release"))) { + yield "release" => (string) $release[0]; + } + if ($this->sxe->xpath("/pecl:package/pecl:zendextsrcrelease")) { + yield "zend" => true; + } + } + + /** + * @inheritdoc + * @return string + */ + public function getLicense() { + if (($license = $this->sxe->xpath("/pecl:package/pecl:license"))) { + if (($file = $this->findLicense($this->getBaseDir(), $license[0]["filesource"]))) { + return $this->readLicense($file); + } + } + if (($file = $this->findLicense($this->getBaseDir()))) { + return $this->readLicense($file); + } + if ($license) { + return $license[0] ." ". $license[0]["uri"]; + } + return "UNKNOWN"; + } + + /** + * @inheritdoc + * @see \pharext\SourceDir::getArgs() + */ + public function getArgs() { + $configure = $this->sxe->xpath("/pecl:package/pecl:extsrcrelease/pecl:configureoption"); + foreach ($configure as $cfg) { + yield [null, $cfg["name"], ucfirst($cfg["prompt"]), Args::OPTARG, + strlen($cfg["default"]) ? $cfg["default"] : null]; + } + $configure = $this->sxe->xpath("/pecl:package/pecl:zendextsrcrelease/pecl:configureoption"); + foreach ($configure as $cfg) { + yield [null, $cfg["name"], ucfirst($cfg["prompt"]), Args::OPTARG, + strlen($cfg["default"]) ? $cfg["default"] : null]; + } + } + + /** + * @inheritdoc + * @see \pharext\SourceDir::setArgs() + */ + public function setArgs(Args $args) { + $configure = $this->sxe->xpath("/pecl:package/pecl:extsrcrelease/pecl:configureoption"); + foreach ($configure as $cfg) { + if (isset($args[$cfg["name"]])) { + $args->configure = "--{$cfg["name"]}={$args[$cfg["name"]]}"; + } + } + $configure = $this->sxe->xpath("/pecl:package/pecl:zendextsrcrelease/pecl:configureoption"); + foreach ($configure as $cfg) { + if (isset($args[$cfg["name"]])) { + $args->configure = "--{$cfg["name"]}={$args[$cfg["name"]]}"; + } + } + } + + /** + * Compute the path of a file by parent dir nodes + * @param \SimpleXMLElement $ele + * @return string + */ + private function dirOf($ele) { + $path = ""; + while (($ele = current($ele->xpath(".."))) && $ele->getName() == "dir") { + $path = trim($ele["name"], "/") ."/". $path ; + } + return trim($path, "/"); + } + + /** + * Generate a list of files from the package.xml + * @return Generator + */ + private function generateFiles() { + /* hook */ + $temp = tmpfile(); + fprintf($temp, " $temp; + + /* deps */ + $dependencies = $this->sxe->xpath("/pecl:package/pecl:dependencies/pecl:required/pecl:package"); + foreach ($dependencies as $key => $dep) { + if (($glob = glob("{$this->path}/{$dep->name}-*.ext.phar*"))) { + usort($glob, function($a, $b) { + return version_compare( + substr($a, strpos(".ext.phar", $a)), + substr($b, strpos(".ext.phar", $b)) + ); + }); + yield end($glob); + } + } + + /* files */ + yield realpath($this->file); + foreach ($this->sxe->xpath("//pecl:file") as $file) { + yield realpath($this->path ."/". $this->dirOf($file) ."/". $file["name"]); + } + } + + /** + * Implements IteratorAggregate + * @see IteratorAggregate::getIterator() + */ + public function getIterator() { + return $this->generateFiles(); + } +} +cwd = $cwd; + $this->type = $type; + $this->sudo = $sudo; + if (!$this->inis = $inis) { + throw new Exception("No PHP INIs given"); + } + $cmd = $common_name . "-config"; + if (isset($prefix)) { + $cmd = $prefix . "/bin/" . $cmd; + } + $this->php_config = $cmd; + } + + /** + * @param bool $verbose + * @return boolean false, if extension was already activated + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Running INI activation ...\n"); + } + $extension = basename(current(glob("{$this->cwd}/modules/*.so"))); + + if ($this->type === "zend_extension") { + $pattern = preg_quote((new ExecCmd($this->php_config))->run(["--extension-dir"])->getOutput() . "/$extension", "/"); + } else { + $pattern = preg_quote($extension, "/"); + } + + foreach ($this->inis as $file) { + if ($verbose) { + printf("Checking %s ...\n", $file); + } + if (!file_exists($file)) { + throw new Exception(sprintf("INI file '%s' does not exist", $file)); + } + $temp = new Tempfile("phpini"); + foreach (file($file) as $line) { + if (preg_match("/^\s*{$this->type}\s*=\s*[\"']?{$pattern}[\"']?\s*(;.*)?\$/", $line)) { + return false; + } + fwrite($temp->getStream(), $line); + } + } + + /* not found; append to last processed file, which is the main by default */ + if ($verbose) { + printf("Activating in %s ...\n", $file); + } + fprintf($temp->getStream(), $this->type . "=%s\n", $extension); + $temp->closeStream(); + + $path = $temp->getPathname(); + $stat = stat($file); + + // owner transfer + $ugid = sprintf("%d:%d", $stat["uid"], $stat["gid"]); + $cmd = new ExecCmd("chown", $verbose); + if (isset($this->sudo)) { + $cmd->setSu($this->sudo); + } + $cmd->run([$ugid, $path]); + + // permission transfer + $perm = decoct($stat["mode"] & 0777); + $cmd = new ExecCmd("chmod", $verbose); + if (isset($this->sudo)) { + $cmd->setSu($this->sudo); + } + $cmd->run([$perm, $path]); + + // rename + $cmd = new ExecCmd("mv", $verbose); + if (isset($this->sudo)) { + $cmd->setSu($this->sudo); + } + $cmd->run([$path, $file]); + + if ($verbose) { + printf("Replaced %s ...\n", $file); + } + + return true; + } +} +prompt = $prompt; + } + + /** + * @param bool $verbose + * @return string + */ + public function run($verbose = false) { + system("stty -echo"); + printf("%s ", $this->prompt); + $pass = fgets(STDIN, 1024); + printf("\n"); + system("stty echo"); + if (substr($pass, -1) == "\n") { + $pass = substr($pass, 0, -1); + } + return $pass; + } +} +rewind(); $rii->valid(); $rii->next()) { + if (!$rii->isDot()) { + yield $rii->getSubPathname() => $rii->key(); + } + } + } +} +rm = $rm; + } + + /** + * @param bool $verbose + */ + public function run($verbose = false) { + if ($verbose) { + printf("Cleaning up %s ...\n", $this->rm); + } + if ($this->rm instanceof Tempfile) { + unset($this->rm); + } elseif (is_dir($this->rm)) { + $rdi = new RecursiveDirectoryIterator($this->rm, + FilesystemIterator::CURRENT_AS_SELF | // needed for 5.5 + FilesystemIterator::KEY_AS_PATHNAME | + FilesystemIterator::SKIP_DOTS); + $rii = new RecursiveIteratorIterator($rdi, + RecursiveIteratorIterator::CHILD_FIRST); + foreach ($rii as $path => $child) { + if ($child->isDir()) { + @rmdir($path); + } else { + @unlink($path); + } + } + @rmdir($this->rm); + } elseif (file_exists($this->rm)) { + @unlink($this->rm); + } + } +} +cwd = $cwd; + $cmd = $common_name . "-config"; + if (isset($prefix)) { + $cmd = $prefix . "/bin/" . $cmd; + } + $this->args = ["--with-php-config=$cmd"]; + if ($args) { + $this->args = array_merge($this->args, $args); + } + } + + public function run($verbose = false) { + if ($verbose !== false) { + printf("Running ./configure ...\n"); + } + $pwd = getcwd(); + if (!chdir($this->cwd)) { + throw new Exception; + } + try { + $cmd = new ExecCmd("./configure", $verbose); + $cmd->run($this->args); + } finally { + chdir($pwd); + } + } +} +source = $source; + } else { + $this->source = new PharData($source); + } + } + + /** + * @param bool $verbose + * @return \pharext\Tempdir + */ + public function run($verbose = false) { + if ($verbose) { + printf("Extracting %s ...\n", basename($this->source->getPath())); + } + if ($this->source instanceof Archive) { + return $this->source->extract(); + } + $dest = new Tempdir("extract"); + $this->source->extractTo($dest); + return $dest; + } +} +source = $source; + $this->branch = $branch; + } + + /** + * @param bool $verbose + * @return \pharext\Tempdir + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Fetching %s ...\n", $this->source); + } + $local = new Tempdir("gitclone"); + $cmd = new ExecCmd("git", $verbose); + if (strlen($this->branch)) { + $cmd->run(["clone", "--depth", 1, "--branch", $this->branch, $this->source, $local]); + } else { + $cmd->run(["clone", $this->source, $local]); + } + return $local; + } +} +cwd = $cwd; + $this->sudo = $sudo; + $this->args = $args; + } + + /** + * + * @param bool $verbose + * @throws \pharext\Exception + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Running make"); + if ($this->args) { + foreach ($this->args as $arg) { + printf(" %s", $arg); + } + } + printf(" ...\n"); + } + $pwd = getcwd(); + if (!chdir($this->cwd)) { + throw new Exception; + } + try { + $cmd = new ExecCmd("make", $verbose); + if (isset($this->sudo)) { + $cmd->setSu($this->sudo); + } + $args = $this->args; + if (!$verbose) { + $args = array_merge((array) $args, ["-s"]); + } + $cmd->run($args); + } finally { + chdir($pwd); + } + } +} +source = $source; + } + + private function openArchive($source) { + $hdr = file_get_contents($source, false, null, 0, 3); + if ($hdr === "\x1f\x8b\x08") { + $fd = fopen("compress.zlib://$source", "r"); + } elseif ($hdr === "BZh") { + $fd = fopen("compress.bzip2://$source", "r"); + } else { + $fd = fopen($source, "r"); + } + if (!is_resource($fd)) { + throw new Exception; + } + return $fd; + } + + public function run($verbose = false) { + if ($verbose !== false) { + printf("Fixing up a tarball with global pax header ...\n"); + } + $temp = new Tempfile("paxfix"); + stream_copy_to_stream($this->openArchive($this->source), + $temp->getStream(), -1, 1024); + $temp->closeStream(); + return (new Extract((string) $temp))->run($verbose); + } +}source = $source; + } + + /** + * @param bool $verbose + * @return string sanitized source location + * @throws \pahrext\Exception + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Sanitizing PECL dir ...\n"); + } + $dirs = glob("{$this->source}/*", GLOB_ONLYDIR); + $files = array_diff(glob("{$this->source}/*"), $dirs); + $check = array_reduce($files, function($r, $v) { + return $v && fnmatch("package*.xml", basename($v)); + }, true); + + if (count($dirs) !== 1 || !$check) { + throw new Exception("Does not look like an extracted PECL dir: {$this->source}"); + } + + $dest = current($dirs); + + foreach ($files as $file) { + if ($verbose) { + printf("Moving %s into %s ...\n", basename($file), basename($dest)); + } + if (!rename($file, "$dest/" . basename($file))) { + throw new Exception; + } + } + + return $dest; + } +} +source = $source; + $this->stub = $stub; + $this->meta = $meta; + $this->readonly = $readonly; + } + + /** + * @param bool $verbose + * @return \pharext\Tempname + * @throws \pharext\Exception + */ + public function run($verbose = false) { + /* Phar::compress() and ::convert*() use strtok("."), ugh! + * so, be sure to not use any other dots in the filename + * except for .phar + */ + $temp = new Tempname("", "-pharext.phar"); + + $phar = new Phar($temp); + $phar->startBuffering(); + + if ($this->meta) { + $phar->setMetadata($this->meta); + } + if ($this->stub) { + (new PharStub($phar, $this->stub))->run($verbose); + } + + $phar->buildFromIterator((new Task\BundleGenerator)->run()); + + if ($this->source) { + if ($verbose) { + $bdir = $this->source->getBaseDir(); + $blen = strlen($bdir); + foreach ($this->source as $index => $file) { + if (is_resource($file)) { + printf("Packaging %s ...\n", $index); + $phar[$index] = $file; + } else { + printf("Packaging %s ...\n", $index = trim(substr($file, $blen), "/")); + $phar->addFile($file, $index); + } + } + } else { + $phar->buildFromIterator($this->source, $this->source->getBaseDir()); + } + } + + $phar->stopBuffering(); + + if (!chmod($temp, fileperms($temp) | 0111)) { + throw new Exception; + } + + return $temp; + } +}file = $file; + $this->package = new Phar($file); + $this->encoding = $encoding; + + switch ($encoding) { + case Phar::GZ: + $this->extension = ".gz"; + break; + case Phar::BZ2: + $this->extension = ".bz2"; + break; + } + } + + /** + * @param bool $verbose + * @return string + */ + public function run($verbose = false) { + if ($verbose) { + printf("Compressing %s ...\n", basename($this->package->getPath())); + } + /* stop shebang */ + $stub = $this->package->getStub(); + $phar = $this->package->compress($this->encoding); + $phar->setStub(substr($stub, strpos($stub, "\n")+1)); + return $this->file . $this->extension; + } +} +phar = $phar; + $this->dest = $dest; + $this->name = $name; + } + + /** + * @param bool $verbose + * @return string path to renamed phar + * @throws \pharext\Exception + */ + public function run($verbose = false) { + $extension = substr(strstr($this->phar, "-pharext.phar"), 8); + $name = sprintf("%s/%s.ext%s", $this->dest, $this->name, $extension); + + if ($verbose) { + printf("Renaming %s to %s ...\n", basename($this->phar), basename($name)); + } + + if (!rename($this->phar, $name)) { + throw new Exception; + } + + return $name; + } +} +phar = $phar; + } else { + $this->phar = new Phar($phar); + } + $this->pkey = new Openssl\PrivateKey($pkey, $pass); + } + + /** + * @param bool $verbose + * @return \pharext\Openssl\PrivateKey + */ + public function run($verbose = false) { + if ($verbose) { + printf("Signing %s ...\n", basename($this->phar->getPath())); + } + $this->pkey->sign($this->phar); + return $this->pkey; + } +} +phar = $phar; + if (!file_exists($this->stub = $stub)) { + throw new Exception("File '$stub' does not exist"); + } + } + + /** + * @param bool $verbose + */ + function run($verbose = false) { + if ($verbose) { + printf("Using stub '%s'...\n", basename($this->stub)); + } + $stub = preg_replace_callback('/^#include <([^>]+)>/m', function($includes) { + return file_get_contents($includes[1], true, null, 5); + }, file_get_contents($this->stub)); + if ($this->phar->isCompressed() && substr($stub, 0, 2) === "#!") { + $stub = substr($stub, strpos($stub, "\n")+1); + } + $this->phar->setStub($stub); + } +} +cwd = $cwd; + $cmd = $common_name . "ize"; + if (isset($prefix)) { + $cmd = $prefix . "/bin/" . $cmd; + } + $this->phpize = $cmd; + } + + /** + * @param bool $verbose + * @throws \pharext\Exception + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Running %s ...\n", $this->phpize); + } + $pwd = getcwd(); + if (!chdir($this->cwd)) { + throw new Exception; + } + try { + $cmd = new ExecCmd($this->phpize, $verbose); + $cmd->run(); + } finally { + chdir($pwd); + } + } +} +source = $source; + $this->progress = $progress; + } + + private function createStreamContext() { + $progress = $this->progress; + + /* avoid bytes_max bug of older PHP versions */ + $maxbytes = 0; + return stream_context_create([],["notification" => function($notification, $severity, $message, $code, $bytes_cur, $bytes_max) use($progress, &$maxbytes) { + if ($bytes_max > $maxbytes) { + $maxbytes = $bytes_max; + } + switch ($notification) { + case STREAM_NOTIFY_CONNECT: + $progress(0); + break; + case STREAM_NOTIFY_PROGRESS: + $progress($maxbytes > 0 ? $bytes_cur/$maxbytes : .5); + break; + case STREAM_NOTIFY_COMPLETED: + /* this is sometimes not generated, why? */ + $progress(1); + break; + } + }]); + } + + /** + * @param bool $verbose + * @return \pharext\Task\Tempfile + * @throws \pharext\Exception + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Fetching %s ...\n", $this->source); + } + $context = $this->createStreamContext(); + + if (!$remote = fopen($this->source, "r", false, $context)) { + throw new Exception; + } + + $local = new Tempfile("remote"); + if (!stream_copy_to_stream($remote, $local->getStream())) { + throw new Exception; + } + $local->closeStream(); + + /* STREAM_NOTIFY_COMPLETED is not generated, see above */ + call_user_func($this->progress, 1); + + return $local; + } +} +handle = fopen($path, "x"); + } while (!is_resource($this->handle) && $tries++ < 10); + umask($omask); + + if (!is_resource($this->handle)) { + throw new Exception("Could not create temporary file"); + } + + parent::__construct($path); + } + + /** + * Unlink the file + */ + public function __destruct() { + if (is_file($this->getPathname())) { + @unlink($this->getPathname()); + } + } + + /** + * Close the stream + */ + public function closeStream() { + fclose($this->handle); + } + + /** + * Retrieve the stream resource + * @return resource + */ + public function getStream() { + return $this->handle; + } +} +getUser(); + if (!is_dir($temp) && !mkdir($temp, 0700, true)) { + throw new Exception; + } + $this->name = $temp ."/". uniqid($prefix) . $suffix; + } + + private function getUser() { + if (extension_loaded("posix") && function_exists("posix_getpwuid")) { + return posix_getpwuid(posix_getuid())["name"]; + } + return trim(`whoami 2>/dev/null`) + ?: trim(`id -nu 2>/dev/null`) + ?: getenv("USER") + ?: get_current_user(); + } + + /** + * @return string + */ + public function __toString() { + return (string) $this->name; + } +} +args = new Cli\Args([ + ["h", "help", "Display this help", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + ["v", "verbose", "More output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["q", "quiet", "Less output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + [null, "signature", "Show pharext signature", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "license", "Show pharext license", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "version", "Show pharext version", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [0, "path", "Path to .ext.phar to update", + Cli\Args::REQUIRED|Cli\Args::MULTI], + ]); + } + + /** + * @inheritdoc + * @see \pharext\Command::run() + */ + public function run($argc, array $argv) { + $errs = []; + $prog = array_shift($argv); + foreach ($this->args->parse(--$argc, $argv) as $error) { + $errs[] = $error; + } + + if ($this->args["help"]) { + $this->header(); + $this->help($prog); + exit; + } + + try { + foreach (["signature", "license", "version"] as $opt) { + if ($this->args[$opt]) { + printf("%s\n", $this->metadata($opt)); + exit; + } + } + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EARGS); + } + + + foreach ($this->args->validate() as $error) { + $errs[] = $error; + } + + if ($errs) { + if (!$this->args["quiet"]) { + $this->header(); + } + foreach ($errs as $err) { + $this->error("%s\n", $err); + } + printf("\n"); + if (!$this->args["quiet"]) { + $this->help($prog); + } + exit(self::EARGS); + } + + foreach ($this->args[0] as $file) { + $info = new SplFileInfo($file); + + while ($info->isLink()) { + $info = new SplFileInfo($info->getLinkTarget()); + } + + if ($info->isFile()) { + if (!$this->updatePackage($info)) { + $this->warn("Cannot upgrade pre-v3 packages\n"); + } + } else { + $this->error("File '%s' does not exist\n", $file); + exit(self::EARGS); + } + } + } + + /** + * Replace the pharext core in an .ext.phar package + * @param string $temp path to temp phar + * @return boolean FALSE if the package is too old (pre-v3) to upgrade + */ + private function replacePharext($temp) { + $phar = new Phar($temp, Phar::CURRENT_AS_SELF); + $phar->startBuffering(); + + if (!$meta = $phar->getMetadata()) { + // don't upgrade pre-v3 packages + return false; + } + + // replace current pharext files + $core = (new Task\BundleGenerator)->run($this->verbosity()); + $phar->buildFromIterator($core); + $stub = __DIR__."/../pharext_installer.php"; + (new Task\PharStub($phar, $stub))->run($this->verbosity()); + + // check dependencies + foreach ($phar as $info) { + if (fnmatch("*.ext.phar*", $info->getBasename())) { + $this->updatePackage($info, $phar); + } + } + + $phar->stopBuffering(); + + $phar->setMetadata([ + "version" => Metadata::version(), + "header" => Metadata::header(), + ] + $meta); + + $this->info("Updated pharext version from '%s' to '%s'\n", + isset($meta["version"]) ? $meta["version"] : "(unknown)", + $phar->getMetadata()["version"]); + + return true; + } + + /** + * Update an .ext.phar package to the current pharext version + * @param SplFileInfo $file + * @param Phar $phar the parent phar containing $file as dependency + * @return boolean FALSE if the package is too old (pre-v3) to upgrade + * @throws Exception + */ + private function updatePackage(SplFileInfo $file, Phar $phar = null) { + $this->info("Updating pharext core in '%s'...\n", basename($file)); + + $temp = new Tempname("update", substr(strstr($file, ".ext.phar"), 4)); + + if (!copy($file->getPathname(), $temp)) { + throw new Exception; + } + if (!chmod($temp, $file->getPerms())) { + throw new Exception; + } + + if (!$this->replacePharext($temp)) { + return false; + } + + if ($phar) { + $phar->addFile($temp, $file); + } elseif (!rename($temp, $file->getPathname())) { + throw new Exception; + } + + return true; + } +} +#!/usr/bin/env php + +#include +#include +#include +#include + +namespace pharext; + +if (extension_loaded("Phar")) { + \Phar::interceptFileFuncs(); + \Phar::mapPhar(); + $phardir = "phar://".__FILE__; +} else { + $archive = new Archive(__FILE__); + $phardir = $archive->extract(); +} + +set_include_path("$phardir:". get_include_path()); + +$installer = new Installer(); +$installer->run($argc, $argv); + +__HALT_COMPILER(); +#!/usr/bin/php -dphar.readonly=0 +run($argc, $argv); + +__HALT_COMPILER(); +#!/usr/bin/php -dphar.readonly=0 +run($argc, $argv); + +__HALT_COMPILER(); +package.xml merge=touch +php_propro.h merge=touch + +# / +*~ +/*.tgz +/.deps +/*.lo +/*.la +/config.[^wm]* +/configure* +/lib* +/ac*.m4 +/ltmain.sh +/install-sh +/Make* +/mk* +/missing +/.libs +/build +/include +/modules +/autom4te* +/.dep.inc +run-tests.php +propro# Doxyfile 1.8.5 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = "Property proxy API" +PROJECT_NUMBER = +PROJECT_BRIEF = "A facility to manage extension object properties tied to C-struct members" +PROJECT_LOGO = +OUTPUT_DIRECTORY = +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = YES +QT_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 4 +ALIASES = +TCL_SUBST = +OPTIMIZE_OUTPUT_FOR_C = YES +OPTIMIZE_OUTPUT_JAVA = NO +OPTIMIZE_FOR_FORTRAN = NO +OPTIMIZE_OUTPUT_VHDL = NO +EXTENSION_MAPPING = +MARKDOWN_SUPPORT = YES +AUTOLINK_SUPPORT = YES +BUILTIN_STL_SUPPORT = NO +CPP_CLI_SUPPORT = NO +SIP_SUPPORT = NO +IDL_PROPERTY_SUPPORT = YES +DISTRIBUTE_GROUP_DOC = NO +SUBGROUPING = YES +INLINE_GROUPED_CLASSES = NO +INLINE_SIMPLE_STRUCTS = YES +TYPEDEF_HIDES_STRUCT = NO +LOOKUP_CACHE_SIZE = 0 +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = YES +EXTRACT_PRIVATE = NO +EXTRACT_PACKAGE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = NO +EXTRACT_LOCAL_METHODS = NO +EXTRACT_ANON_NSPACES = NO +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +FORCE_LOCAL_INCLUDES = NO +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_MEMBERS_CTORS_1ST = NO +SORT_GROUP_NAMES = NO +SORT_BY_SCOPE_NAME = NO +STRICT_PROTO_MATCHING = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +SHOW_FILES = YES +SHOW_NAMESPACES = YES +FILE_VERSION_FILTER = +LAYOUT_FILE = +CITE_BIB_FILES = +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = NO +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = php_propro.h +INPUT_ENCODING = UTF-8 +FILE_PATTERNS = +RECURSIVE = NO +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXCLUDE_SYMBOLS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +FILTER_SOURCE_PATTERNS = +USE_MDFILE_AS_MAINPAGE = +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = NO +REFERENCES_LINK_SOURCE = YES +SOURCE_TOOLTIPS = YES +USE_HTAGS = NO +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_EXTRA_STYLESHEET = +HTML_EXTRA_FILES = +HTML_COLORSTYLE_HUE = 220 +HTML_COLORSTYLE_SAT = 100 +HTML_COLORSTYLE_GAMMA = 80 +HTML_TIMESTAMP = NO +HTML_DYNAMIC_SECTIONS = NO +HTML_INDEX_NUM_ENTRIES = 100 +GENERATE_DOCSET = NO +DOCSET_FEEDNAME = "Doxygen generated docs" +DOCSET_BUNDLE_ID = org.doxygen.Project +DOCSET_PUBLISHER_ID = org.doxygen.Publisher +DOCSET_PUBLISHER_NAME = Publisher +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +CHM_INDEX_ENCODING = +BINARY_TOC = NO +TOC_EXPAND = NO +GENERATE_QHP = NO +QCH_FILE = +QHP_NAMESPACE = org.doxygen.Project +QHP_VIRTUAL_FOLDER = doc +QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = +QHG_LOCATION = +GENERATE_ECLIPSEHELP = NO +ECLIPSE_DOC_ID = org.doxygen.Project +DISABLE_INDEX = NO +GENERATE_TREEVIEW = YES +ENUM_VALUES_PER_LINE = 4 +TREEVIEW_WIDTH = 250 +EXT_LINKS_IN_WINDOW = NO +FORMULA_FONTSIZE = 10 +FORMULA_TRANSPARENT = YES +USE_MATHJAX = NO +MATHJAX_FORMAT = HTML-CSS +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest +MATHJAX_EXTENSIONS = +MATHJAX_CODEFILE = +SEARCHENGINE = YES +SERVER_BASED_SEARCH = NO +EXTERNAL_SEARCH = NO +SEARCHENGINE_URL = +SEARCHDATA_FILE = searchdata.xml +EXTERNAL_SEARCH_ID = +EXTRA_SEARCH_MAPPINGS = +#--------------------------------------------------------------------------- +# Configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4 +EXTRA_PACKAGES = +LATEX_HEADER = +LATEX_FOOTER = +LATEX_EXTRA_FILES = +PDF_HYPERLINKS = YES +USE_PDFLATEX = YES +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +LATEX_SOURCE_CODE = NO +LATEX_BIB_STYLE = plain +#--------------------------------------------------------------------------- +# Configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# Configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# Configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# Configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- +GENERATE_DOCBOOK = NO +DOCBOOK_OUTPUT = docbook +#--------------------------------------------------------------------------- +# Configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# Configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = DOXYGEN TSRMLS_C= TSRMLS_D= TSRMLS_CC= TSRMLS_DC= PHP_PROPRO_API= +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration options related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +EXTERNAL_PAGES = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +MSCGEN_PATH = +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = YES +DOT_NUM_THREADS = 0 +DOT_FONTNAME = Helvetica +DOT_FONTSIZE = 10 +DOT_FONTPATH = +CLASS_GRAPH = NO +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +UML_LIMIT_NUM_FIELDS = 10 +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = YES +CALLER_GRAPH = YES +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DOT_IMAGE_FORMAT = png +INTERACTIVE_SVG = NO +DOT_PATH = +DOTFILE_DIRS = +MSCFILE_DIRS = +DOT_GRAPH_MAX_NODES = 50 +MAX_DOT_GRAPH_DEPTH = 0 +DOT_TRANSPARENT = NO +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +Copyright (c) 2013, Michael Wallner . +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# pecl/propro + +## About: + +The "Property Proxy" extension provides a fairly transparent proxy for internal object properties hidden in custom non-zval implementations. + +## Installation: + +This extension is hosted at [PECL](http://pecl.php.net) and can be installed with [PEAR](http://pear.php.net)'s pecl command: + + # pecl install propro + +Also, watch out for self-installing [pharext](https://github.com/m6w6/pharext) packages attached to [releases](https://github.com/m6w6/ext-propro/releases). + +## Internals: + +> ***NOTE:*** + This extension mostly only provides infrastructure for other extensions. + See the [API docs here](http://m6w6.github.io/ext-propro/). + +## Documentation + +Userland documentation can be found at https://mdref.m6w6.name/propro +PHP_ARG_ENABLE(propro, whether to enable property proxy support, +[ --enable-propro Enable property proxy support]) + +if test "$PHP_PROPRO" != "no"; then + PHP_INSTALL_HEADERS(ext/propro, php_propro.h php_propro_api.h) + PHP_NEW_EXTENSION(propro, php_propro.c, $ext_shared) +fi + +ARG_ENABLE("propro", "for propro support", "no"); + +if (PHP_PROPRO == "yes") { + EXTENSION("propro", "php_propro.c"); + + AC_DEFINE("HAVE_PROPRO", 1); + PHP_INSTALL_HEADERS("ext/propro", "php_propro.h"); +} + + + propro + pecl.php.net + Property proxy + A reusable split-off of pecl_http's property proxy API. + + Michael Wallner + mike + mike@php.net + yes + + 2013-12-05 + + 2.0.0-dev + 2.0.0 + + + stable + stable + + BSD, revised + + + + + + + + + + + + + + + + + + + + + + 7.0.0 + + + 1.4.0 + + + + propro + + + +/* + +--------------------------------------------------------------------+ + | PECL :: propro | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2013 Michael Wallner | + +--------------------------------------------------------------------+ +*/ + + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + +#include "php_propro_api.h" + +#define DEBUG_PROPRO 0 + +static inline zval *get_referenced_zval(zval *ref) +{ + while (Z_ISREF_P(ref)) { + ref = Z_REFVAL_P(ref); + } + return ref; +} + +php_property_proxy_t *php_property_proxy_init(zval *container, zend_string *member) +{ + php_property_proxy_t *proxy = ecalloc(1, sizeof(*proxy)); + + ZVAL_COPY(&proxy->container, get_referenced_zval(container)); + proxy->member = zend_string_copy(member); + + return proxy; +} + +void php_property_proxy_free(php_property_proxy_t **proxy) +{ + if (*proxy) { + zval_ptr_dtor(&(*proxy)->container); + zend_string_release((*proxy)->member); + efree(*proxy); + *proxy = NULL; + } +} + +static zend_class_entry *php_property_proxy_class_entry; +static zend_object_handlers php_property_proxy_object_handlers; + +zend_class_entry *php_property_proxy_get_class_entry(void) +{ + return php_property_proxy_class_entry; +} + +static inline php_property_proxy_object_t *get_propro(zval *object); +static zval *get_parent_proxied_value(zval *object, zval *return_value); +static zval *get_proxied_value(zval *object, zval *return_value); +static zval *read_dimension(zval *object, zval *offset, int type, zval *return_value); +static ZEND_RESULT_CODE cast_proxied_value(zval *object, zval *return_value, int type); +static void write_dimension(zval *object, zval *offset, zval *value); +static void set_proxied_value(zval *object, zval *value); + +#if DEBUG_PROPRO +/* we do not really care about TS when debugging */ +static int level = 1; +static const char space[] = " "; +static const char *inoutstr[] = {"< return","="," > enter"}; + +static void _walk(php_property_proxy_object_t *obj) +{ + if (obj) { + if (!Z_ISUNDEF(obj->parent)) { + _walk(get_propro(&obj->parent)); + } + if (obj->proxy) { + fprintf(stderr, ".%s", obj->proxy->member->val); + } + } +} + +static void debug_propro(int inout, const char *f, + php_property_proxy_object_t *obj, zval *offset, zval *value TSRMLS_DC) +{ + fprintf(stderr, "#PP %p %s %s %s ", obj, &space[sizeof(space)-level], + inoutstr[inout+1], f); + + level += inout; + + _walk(obj); + + if (*f++=='d' + && *f++=='i' + && *f++=='m' + ) { + char *offset_str = "[]"; + zval *o = offset; + + if (o) { + convert_to_string_ex(o); + offset_str = Z_STRVAL_P(o); + } + + fprintf(stderr, ".%s", offset_str); + + if (o && o != offset) { + zval_ptr_dtor(o); + } + } + if (value && !Z_ISUNDEF_P(value)) { + const char *t[] = { + "UNDEF", + "NULL", + "FALSE", + "TRUE", + "int", + "float", + "string", + "Array", + "Object", + "resource", + "reference", + "constant", + "constant AST", + "_BOOL", + "callable", + "indirect", + "---", + "pointer" + }; + fprintf(stderr, " = (%s) ", t[Z_TYPE_P(value)&0xf]); + if (!Z_ISUNDEF_P(value) && Z_TYPE_P(value) != IS_INDIRECT) { + zend_print_flat_zval_r(value TSRMLS_CC); + } + } + + fprintf(stderr, "\n"); +} +#else +#define debug_propro(l, f, obj, off, val) +#endif + +php_property_proxy_object_t *php_property_proxy_object_new_ex( + zend_class_entry *ce, php_property_proxy_t *proxy) +{ + php_property_proxy_object_t *o; + + if (!ce) { + ce = php_property_proxy_class_entry; + } + + o = ecalloc(1, sizeof(*o) + sizeof(zval) * (ce->default_properties_count - 1)); + zend_object_std_init(&o->zo, ce); + object_properties_init(&o->zo, ce); + + o->proxy = proxy; + o->zo.handlers = &php_property_proxy_object_handlers; + + debug_propro(0, "init", o, NULL, NULL); + + return o; +} + +zend_object *php_property_proxy_object_new(zend_class_entry *ce) +{ + return &php_property_proxy_object_new_ex(ce, NULL)->zo; +} + +static void destroy_obj(zend_object *object) +{ + php_property_proxy_object_t *o = PHP_PROPRO_PTR(object); + + debug_propro(0, "dtor", o, NULL, NULL); + + if (o->proxy) { + php_property_proxy_free(&o->proxy); + } + if (!Z_ISUNDEF(o->parent)) { + zval_ptr_dtor(&o->parent); + ZVAL_UNDEF(&o->parent); + } + zend_object_std_dtor(object); +} + +static inline php_property_proxy_object_t *get_propro(zval *object) +{ + object = get_referenced_zval(object); + switch (Z_TYPE_P(object)) { + case IS_OBJECT: + break; + + EMPTY_SWITCH_DEFAULT_CASE(); + } + return PHP_PROPRO_PTR(Z_OBJ_P(object)); +} + +static inline zend_bool got_value(zval *container, zval *value) +{ + zval identical; + + if (!Z_ISUNDEF_P(value)) { + if (SUCCESS == is_identical_function(&identical, value, container)) { + if (Z_TYPE(identical) != IS_TRUE) { + return 1; + } + } + } + + return 0; +} + +static zval *get_parent_proxied_value(zval *object, zval *return_value) +{ + php_property_proxy_object_t *obj; + + obj = get_propro(object); + debug_propro(1, "parent_get", obj, NULL, NULL); + + if (obj->proxy) { + if (!Z_ISUNDEF(obj->parent)) { + get_proxied_value(&obj->parent, return_value); + } + } + + debug_propro(-1, "parent_get", obj, NULL, return_value); + + return return_value; +} + +static zval *get_proxied_value(zval *object, zval *return_value) +{ + zval *hash_value, *ref, prop_tmp; + php_property_proxy_object_t *obj; + + obj = get_propro(object); + debug_propro(1, "get", obj, NULL, NULL); + + if (obj->proxy) { + if (!Z_ISUNDEF(obj->parent)) { + zval parent_value; + + ZVAL_UNDEF(&parent_value); + get_parent_proxied_value(object, &parent_value); + + if (got_value(&obj->proxy->container, &parent_value)) { + zval_ptr_dtor(&obj->proxy->container); + ZVAL_COPY(&obj->proxy->container, &parent_value); + } + } + + ref = get_referenced_zval(&obj->proxy->container); + + switch (Z_TYPE_P(ref)) { + case IS_OBJECT: + RETVAL_ZVAL(zend_read_property(Z_OBJCE_P(ref), ref, + obj->proxy->member->val, obj->proxy->member->len, 0, &prop_tmp), + 0, 0); + break; + + case IS_ARRAY: + hash_value = zend_symtable_find(Z_ARRVAL_P(ref), obj->proxy->member); + + if (hash_value) { + RETVAL_ZVAL(hash_value, 0, 0); + } + break; + } + } + + debug_propro(-1, "get", obj, NULL, return_value); + + return return_value; +} + +static ZEND_RESULT_CODE cast_proxied_value(zval *object, zval *return_value, + int type) +{ + get_proxied_value(object, return_value); + + debug_propro(0, "cast", get_propro(object), NULL, return_value); + + if (!Z_ISUNDEF_P(return_value)) { + convert_to_explicit_type_ex(return_value, type); + return SUCCESS; + } + + return FAILURE; +} + +static void set_proxied_value(zval *object, zval *value) +{ + php_property_proxy_object_t *obj; + zval *ref; + + obj = get_propro(object); + debug_propro(1, "set", obj, NULL, value TSRMLS_CC); + + if (obj->proxy) { + if (!Z_ISUNDEF(obj->parent)) { + zval parent_value; + + ZVAL_UNDEF(&parent_value); + get_parent_proxied_value(object, &parent_value); + + if (got_value(&obj->proxy->container, &parent_value)) { + zval_ptr_dtor(&obj->proxy->container); + ZVAL_COPY(&obj->proxy->container, &parent_value); + } + } + + ref = get_referenced_zval(&obj->proxy->container); + + switch (Z_TYPE_P(ref)) { + case IS_OBJECT: + zend_update_property(Z_OBJCE_P(ref), ref, obj->proxy->member->val, + obj->proxy->member->len, value); + break; + + default: + convert_to_array(ref); + /* no break */ + + case IS_ARRAY: + Z_TRY_ADDREF_P(value); + zend_symtable_update(Z_ARRVAL_P(ref), obj->proxy->member, value); + break; + } + + if (!Z_ISUNDEF(obj->parent)) { + set_proxied_value(&obj->parent, &obj->proxy->container); + } + } + + debug_propro(-1, "set", obj, NULL, NULL); +} + +static zval *read_dimension(zval *object, zval *offset, int type, zval *return_value) +{ + zval proxied_value; + zend_string *member = offset ? zval_get_string(offset) : NULL; + + debug_propro(1, type == BP_VAR_R ? "dim_read" : "dim_read_ref", + get_propro(object), offset, NULL); + + ZVAL_UNDEF(&proxied_value); + get_proxied_value(object, &proxied_value); + + if (BP_VAR_R == type && member && !Z_ISUNDEF(proxied_value)) { + if (Z_TYPE(proxied_value) == IS_ARRAY) { + zval *hash_value = zend_symtable_find(Z_ARRVAL(proxied_value), + member); + + if (hash_value) { + RETVAL_ZVAL(hash_value, 1, 0); + } + } + } else { + php_property_proxy_t *proxy; + php_property_proxy_object_t *proxy_obj; + + if (!Z_ISUNDEF(proxied_value)) { + convert_to_array(&proxied_value); + Z_ADDREF(proxied_value); + } else { + array_init(&proxied_value); + set_proxied_value(object, &proxied_value); + } + + if (!member) { + member = zend_long_to_str(zend_hash_next_free_element( + Z_ARRVAL(proxied_value))); + } + + proxy = php_property_proxy_init(&proxied_value, member); + zval_ptr_dtor(&proxied_value); + + proxy_obj = php_property_proxy_object_new_ex(NULL, proxy); + ZVAL_COPY(&proxy_obj->parent, object); + RETVAL_OBJ(&proxy_obj->zo); + } + + if (member) { + zend_string_release(member); + } + + debug_propro(-1, type == BP_VAR_R ? "dim_read" : "dim_read_ref", + get_propro(object), offset, return_value); + + return return_value; +} + +static int has_dimension(zval *object, zval *offset, int check_empty) +{ + zval proxied_value; + int exists = 0; + + debug_propro(1, "dim_exists", get_propro(object), offset, NULL); + + ZVAL_UNDEF(&proxied_value); + get_proxied_value(object, &proxied_value); + if (Z_ISUNDEF(proxied_value)) { + exists = 0; + } else { + zend_string *zs = zval_get_string(offset); + + if (Z_TYPE(proxied_value) == IS_ARRAY) { + zval *zentry = zend_symtable_find(Z_ARRVAL(proxied_value), zs); + + if (!zentry) { + exists = 0; + } else { + if (check_empty) { + exists = !Z_ISNULL_P(zentry); + } else { + exists = 1; + } + } + } + + zend_string_release(zs); + } + + debug_propro(-1, "dim_exists", get_propro(object), offset, NULL); + + return exists; +} + +static void write_dimension(zval *object, zval *offset, zval *value) +{ + zval proxied_value; + + debug_propro(1, "dim_write", get_propro(object), offset, value); + + ZVAL_UNDEF(&proxied_value); + get_proxied_value(object, &proxied_value); + + if (!Z_ISUNDEF(proxied_value)) { + if (Z_TYPE(proxied_value) == IS_ARRAY) { + Z_ADDREF(proxied_value); + } else { + convert_to_array(&proxied_value); + } + } else { + array_init(&proxied_value); + } + + SEPARATE_ZVAL(value); + Z_TRY_ADDREF_P(value); + + if (offset) { + zend_string *zs = zval_get_string(offset); + zend_symtable_update(Z_ARRVAL(proxied_value), zs, value); + zend_string_release(zs); + } else { + zend_hash_next_index_insert(Z_ARRVAL(proxied_value), value); + } + + set_proxied_value(object, &proxied_value); + + debug_propro(-1, "dim_write", get_propro(object), offset, &proxied_value); + + zval_ptr_dtor(&proxied_value); +} + +static void unset_dimension(zval *object, zval *offset) +{ + zval proxied_value; + + debug_propro(1, "dim_unset", get_propro(object), offset, NULL); + + ZVAL_UNDEF(&proxied_value); + get_proxied_value(object, &proxied_value); + + if (Z_TYPE(proxied_value) == IS_ARRAY) { + zval *o = offset; + ZEND_RESULT_CODE rv; + + convert_to_string_ex(o); + rv = zend_symtable_del(Z_ARRVAL(proxied_value), Z_STR_P(o)); + if (SUCCESS == rv) { + set_proxied_value(object, &proxied_value); + } + + if (o != offset) { + zval_ptr_dtor(o); + } + } + + debug_propro(-1, "dim_unset", get_propro(object), offset, &proxied_value); +} + +ZEND_BEGIN_ARG_INFO_EX(ai_propro_construct, 0, 0, 2) + ZEND_ARG_INFO(1, object) + ZEND_ARG_INFO(0, member) + ZEND_ARG_OBJ_INFO(0, parent, php\\PropertyProxy, 1) +ZEND_END_ARG_INFO(); +static PHP_METHOD(propro, __construct) { + zend_error_handling zeh; + zval *container, *parent = NULL; + zend_string *member; + + zend_replace_error_handling(EH_THROW, NULL, &zeh); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "zS|O!", + &container, &member, &parent, + php_property_proxy_class_entry)) { + php_property_proxy_object_t *obj; + zval *ref = get_referenced_zval(container); + + switch (Z_TYPE_P(ref)) { + case IS_OBJECT: + case IS_ARRAY: + break; + default: + convert_to_array(ref); + } + obj = get_propro(getThis()); + obj->proxy = php_property_proxy_init(container, member); + if (parent) { + ZVAL_COPY(&obj->parent, parent); + } + } + zend_restore_error_handling(&zeh); +} + +static const zend_function_entry php_property_proxy_method_entry[] = { + PHP_ME(propro, __construct, ai_propro_construct, ZEND_ACC_PUBLIC) + {0} +}; + +static PHP_MINIT_FUNCTION(propro) +{ + zend_class_entry ce = {0}; + + INIT_NS_CLASS_ENTRY(ce, "php", "PropertyProxy", + php_property_proxy_method_entry); + php_property_proxy_class_entry = zend_register_internal_class(&ce); + php_property_proxy_class_entry->create_object = php_property_proxy_object_new; + php_property_proxy_class_entry->ce_flags |= ZEND_ACC_FINAL; + + memcpy(&php_property_proxy_object_handlers, zend_get_std_object_handlers(), + sizeof(zend_object_handlers)); + php_property_proxy_object_handlers.offset = XtOffsetOf(php_property_proxy_object_t, zo); + php_property_proxy_object_handlers.free_obj = destroy_obj; + php_property_proxy_object_handlers.set = set_proxied_value; + php_property_proxy_object_handlers.get = get_proxied_value; + php_property_proxy_object_handlers.cast_object = cast_proxied_value; + php_property_proxy_object_handlers.read_dimension = read_dimension; + php_property_proxy_object_handlers.write_dimension = write_dimension; + php_property_proxy_object_handlers.has_dimension = has_dimension; + php_property_proxy_object_handlers.unset_dimension = unset_dimension; + + return SUCCESS; +} + +PHP_MINFO_FUNCTION(propro) +{ + php_info_print_table_start(); + php_info_print_table_header(2, "Property proxy support", "enabled"); + php_info_print_table_row(2, "Extension version", PHP_PROPRO_VERSION); + php_info_print_table_end(); +} + +static const zend_function_entry propro_functions[] = { + {0} +}; + +zend_module_entry propro_module_entry = { + STANDARD_MODULE_HEADER, + "propro", + propro_functions, + PHP_MINIT(propro), + NULL, + NULL, + NULL, + PHP_MINFO(propro), + PHP_PROPRO_VERSION, + STANDARD_MODULE_PROPERTIES +}; + +#ifdef COMPILE_DL_PROPRO +ZEND_GET_MODULE(propro) +#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 + */ +/* + +--------------------------------------------------------------------+ + | PECL :: propro | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2013 Michael Wallner | + +--------------------------------------------------------------------+ +*/ + +#ifndef PHP_PROPRO_H +#define PHP_PROPRO_H + +extern zend_module_entry propro_module_entry; +#define phpext_propro_ptr &propro_module_entry + +#define PHP_PROPRO_VERSION "2.0.0dev" + +#ifdef PHP_WIN32 +# define PHP_PROPRO_API __declspec(dllexport) +#elif defined(__GNUC__) && __GNUC__ >= 4 +# define PHP_PROPRO_API extern __attribute__ ((visibility("default"))) +#else +# define PHP_PROPRO_API extern +#endif + +#ifdef ZTS +# include +#endif + +#define PHP_PROPRO_PTR(zo) (void*)(((char*)(zo))-(zo)->handlers->offset) + +#endif /* PHP_PROPRO_H */ + + +/* + * 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 + */ +/* + +--------------------------------------------------------------------+ + | PECL :: propro | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2013 Michael Wallner | + +--------------------------------------------------------------------+ +*/ + +#ifndef PHP_PROPRO_API_H +#define PHP_PROPRO_API_H + +#include "php_propro.h" + +/** + * The internal property proxy. + * + * Container for the object/array holding the proxied property. + */ +struct php_property_proxy { + /** The container holding the property */ + zval container; + /** The name of the proxied property */ + zend_string *member; +}; +typedef struct php_property_proxy php_property_proxy_t; + +/** + * The userland object. + * + * Return an object instance of php\\PropertyProxy to make your C-struct + * member accessible by reference from PHP userland. + * + * Example: + * ~~~~~~~~~~{.c} + * static zval *my_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *tmp) + * { + * zval *return_value; + * zend_string *member_name = zval_get_string(member); + * my_prophandler_t *handler = my_get_prophandler(member_name); + * + * if (!handler || type == BP_VAR_R || type == BP_VAR_IS) { + * return_value = zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp); + * + * if (handler) { + * handler->read(object, tmp); + * + * zval_ptr_dtor(return_value); + * ZVAL_COPY_VALUE(return_value, tmp); + * } + * } else { + * return_value = php_property_proxy_zval(object, member_name); + * } + * + * zend_string_release(member_name); + * + * return return_value; + * } + * ~~~~~~~~~~ + */ +struct php_property_proxy_object { + /** The actual property proxy */ + php_property_proxy_t *proxy; + /** Any parent property proxy object */ + zval parent; + /** The std zend_object */ + zend_object zo; +}; +typedef struct php_property_proxy_object php_property_proxy_object_t; + +/** + * Create a property proxy + * + * The property proxy will forward reads and writes to itself to the + * proxied property with name \a member_str of \a container. + * + * @param container the container holding the property + * @param member the name of the proxied property + * @return a new property proxy + */ +PHP_PROPRO_API php_property_proxy_t *php_property_proxy_init(zval *container, + zend_string *member); + +/** + * Destroy and free a property proxy. + * + * The destruction of the property proxy object calls this. + * + * @param proxy a pointer to the allocated property proxy + */ +PHP_PROPRO_API void php_property_proxy_free(php_property_proxy_t **proxy); + +/** + * Get the zend_class_entry of php\\PropertyProxy + * @return the class entry pointer + */ +PHP_PROPRO_API zend_class_entry *php_property_proxy_get_class_entry(void); + +/** + * Instantiate a new php\\PropertyProxy + * @param ce the property proxy or derived class entry + * @return the zend object + */ +PHP_PROPRO_API zend_object *php_property_proxy_object_new(zend_class_entry *ce); + +/** + * Instantiate a new php\\PropertyProxy with \a proxy + * @param ce the property proxy or derived class entry + * @param proxy the internal property proxy + * @return the property proxy + */ +PHP_PROPRO_API php_property_proxy_object_t *php_property_proxy_object_new_ex( + zend_class_entry *ce, php_property_proxy_t *proxy); + +#endif /* PHP_PROPRO_API_H */ + + +/* + * 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 + */ +--TEST-- +property proxy +--SKIPIF-- + +--FILE-- +prop; +$a = $c->anon; + +var_dump($c); + +echo "set\n"; +$a = 123; +echo "get\n"; +echo $a,"\n"; + +$p["foo"] = 123; +$p["bar"]["baz"]["a"]["b"]=987; + +var_dump($c); + +?> +DONE +--EXPECTF-- +Test +object(c)#%d (2) { + ["prop":"c":private]=> + NULL + ["anon":"c":private]=> + NULL +} +set +get +123 +object(c)#%d (2) { + ["prop":"c":private]=> + array(2) { + ["foo"]=> + int(123) + ["bar"]=> + array(1) { + ["baz"]=> + array(1) { + ["a"]=> + array(1) { + ["b"]=> + int(987) + } + } + } + } + ["anon":"c":private]=> + int(123) +} +DONE +--TEST-- +property proxy +--SKIPIF-- + +--FILE-- +storage, $p); + } + function __set($p, $v) { + $this->storage[$p] = $v; + } +} + +$c = new c; +$c->data["foo"] = 1; +var_dump( + isset($c->data["foo"]), + isset($c->data["bar"]) +); + +var_dump($c); + +$c->data[] = 1; +$c->data[] = 2; +$c->data[] = 3; +$c->data["bar"][] = 123; +$c->data["bar"][] = 456; + +var_dump($c); +unset($c->data["bar"][0]); + +var_dump($c); + +?> +DONE +--EXPECTF-- +Test +bool(true) +bool(false) +object(c)#%d (1) { + ["storage":"c":private]=> + array(1) { + ["data"]=> + array(1) { + ["foo"]=> + int(1) + } + } +} +object(c)#%d (1) { + ["storage":"c":private]=> + array(1) { + ["data"]=> + array(5) { + ["foo"]=> + int(1) + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + ["bar"]=> + array(2) { + [0]=> + int(123) + [1]=> + int(456) + } + } + } +} +object(c)#%d (1) { + ["storage":"c":private]=> + array(1) { + ["data"]=> + array(5) { + ["foo"]=> + int(1) + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + ["bar"]=> + array(1) { + [1]=> + int(456) + } + } + } +} +DONE +--TEST-- +property proxy +--SKIPIF-- + +--FILE-- +ref; +$r = 1; +var_dump($t); +$t->ref[] = 2; +var_dump($t); +?> +===DONE=== +--EXPECTF-- +Test +object(t)#%d (1) { + ["ref":"t":private]=> + int(1) +} +object(t)#%d (1) { + ["ref":"t":private]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } +} +===DONE===žhz%Ý dþ¨éñ ÜRÃ`ǕýGBMB \ No newline at end of file diff --git a/travis/raphf-master.ext.phar b/travis/raphf-master.ext.phar new file mode 100755 index 0000000..e2433d4 --- /dev/null +++ b/travis/raphf-master.ext.phar @@ -0,0 +1,6841 @@ +#!/usr/bin/env php +getUser(); + if (!is_dir($temp) && !mkdir($temp, 0700, true)) { + throw new Exception; + } + $this->name = $temp ."/". uniqid($prefix) . $suffix; + } + + private function getUser() { + if (extension_loaded("posix") && function_exists("posix_getpwuid")) { + return posix_getpwuid(posix_getuid())["name"]; + } + return trim(`whoami 2>/dev/null`) + ?: trim(`id -nu 2>/dev/null`) + ?: getenv("USER") + ?: get_current_user(); + } + + /** + * @return string + */ + public function __toString() { + return (string) $this->name; + } +} + + + +namespace pharext; + +/** + * Create a new temporary file + */ +class Tempfile extends \SplFileInfo +{ + /** + * @var resource + */ + private $handle; + + /** + * @param string $prefix uniqid() prefix + * @param string $suffix e.g. file extension + * @throws \pharext\Exception + */ + public function __construct($prefix, $suffix = ".tmp") { + $tries = 0; + $omask = umask(077); + do { + $path = new Tempname($prefix, $suffix); + $this->handle = fopen($path, "x"); + } while (!is_resource($this->handle) && $tries++ < 10); + umask($omask); + + if (!is_resource($this->handle)) { + throw new Exception("Could not create temporary file"); + } + + parent::__construct($path); + } + + /** + * Unlink the file + */ + public function __destruct() { + if (is_file($this->getPathname())) { + @unlink($this->getPathname()); + } + } + + /** + * Close the stream + */ + public function closeStream() { + fclose($this->handle); + } + + /** + * Retrieve the stream resource + * @return resource + */ + public function getStream() { + return $this->handle; + } +} + + + +namespace pharext; + +/** + * Create a temporary directory + */ +class Tempdir extends \SplFileInfo +{ + /** + * @param string $prefix prefix to uniqid() + * @throws \pharext\Exception + */ + public function __construct($prefix) { + $temp = new Tempname($prefix); + if (!is_dir($temp) && !mkdir($temp, 0700, true)) { + throw new Exception("Could not create tempdir: ".error_get_last()["message"]); + } + parent::__construct($temp); + } +} + + + +namespace pharext; + +use ArrayAccess; +use IteratorAggregate; +use RecursiveDirectoryIterator; +use SplFileInfo; + +use pharext\Exception; + +class Archive implements ArrayAccess, IteratorAggregate +{ + const HALT_COMPILER = "\137\137\150\141\154\164\137\143\157\155\160\151\154\145\162\50\51\73"; + const SIGNED = 0x10000; + const SIG_MD5 = 0x0001; + const SIG_SHA1 = 0x0002; + const SIG_SHA256 = 0x0003; + const SIG_SHA512 = 0x0004; + const SIG_OPENSSL= 0x0010; + + private static $siglen = [ + self::SIG_MD5 => 16, + self::SIG_SHA1 => 20, + self::SIG_SHA256 => 32, + self::SIG_SHA512 => 64, + self::SIG_OPENSSL=> 0 + ]; + + private static $sigalg = [ + self::SIG_MD5 => "md5", + self::SIG_SHA1 => "sha1", + self::SIG_SHA256 => "sha256", + self::SIG_SHA512 => "sha512", + self::SIG_OPENSSL=> "openssl" + ]; + + private static $sigtyp = [ + self::SIG_MD5 => "MD5", + self::SIG_SHA1 => "SHA-1", + self::SIG_SHA256 => "SHA-256", + self::SIG_SHA512 => "SHA-512", + self::SIG_OPENSSL=> "OpenSSL", + ]; + + const PERM_FILE_MASK = 0x01ff; + const COMP_FILE_MASK = 0xf000; + const COMP_GZ_FILE = 0x1000; + const COMP_BZ2_FILE = 0x2000; + + const COMP_PHAR_MASK= 0xf000; + const COMP_PHAR_GZ = 0x1000; + const COMP_PHAR_BZ2 = 0x2000; + + private $file; + private $fd; + private $stub; + private $manifest; + private $signature; + private $extracted; + + function __construct($file = null) { + if (strlen($file)) { + $this->open($file); + } + } + + function open($file) { + if (!$this->fd = @fopen($file, "r")) { + throw new Exception; + } + $this->file = $file; + $this->stub = $this->readStub(); + $this->manifest = $this->readManifest(); + $this->signature = $this->readSignature(); + } + + function getIterator() { + return new RecursiveDirectoryIterator($this->extract()); + } + + function extract() { + return $this->extracted ?: $this->extractTo(new Tempdir("archive")); + } + + function extractTo($dir) { + if ((string) $this->extracted == (string) $dir) { + return $this->extracted; + } + foreach ($this->manifest["entries"] as $file => $entry) { + fseek($this->fd, $this->manifest["offset"]+$entry["offset"]); + $path = "$dir/$file"; + $copy = stream_copy_to_stream($this->fd, $this->outFd($path, $entry["flags"]), $entry["csize"]); + if ($entry["osize"] != $copy) { + throw new Exception("Copied '$copy' of '$file', expected '{$entry["osize"]}' from '{$entry["csize"]}"); + } + + $crc = hexdec(hash_file("crc32b", $path)); + if ($crc !== $entry["crc32"]) { + throw new Exception("CRC mismatch of '$file': '$crc' != '{$entry["crc32"]}"); + } + + chmod($path, $entry["flags"] & self::PERM_FILE_MASK); + touch($path, $entry["stamp"]); + } + return $this->extracted = $dir; + } + + function offsetExists($o) { + return isset($this->entries[$o]); + } + + function offsetGet($o) { + $this->extract(); + return new SplFileInfo($this->extracted."/$o"); + } + + function offsetSet($o, $v) { + throw new Exception("Archive is read-only"); + } + + function offsetUnset($o) { + throw new Exception("Archive is read-only"); + } + + function getSignature() { + /* compatible with Phar::getSignature() */ + return [ + "hash_type" => self::$sigtyp[$this->signature["flags"]], + "hash" => strtoupper(bin2hex($this->signature["hash"])), + ]; + } + + function getPath() { + /* compatible with Phar::getPath() */ + return new SplFileInfo($this->file); + } + + function getMetadata($key = null) { + if (isset($key)) { + return $this->manifest["meta"][$key]; + } + return $this->manifest["meta"]; + } + + private function outFd($path, $flags) { + $dirn = dirname($path); + if (!is_dir($dirn) && !@mkdir($dirn, 0777, true)) { + throw new Exception; + } + if (!$fd = @fopen($path, "w")) { + throw new Exception; + } + switch ($flags & self::COMP_FILE_MASK) { + case self::COMP_GZ_FILE: + if (!@stream_filter_append($fd, "zlib.inflate")) { + throw new Exception; + } + break; + case self::COMP_BZ2_FILE: + if (!@stream_filter_append($fd, "bz2.decompress")) { + throw new Exception; + } + break; + } + + } + private function readVerified($fd, $len) { + if ($len != strlen($data = fread($fd, $len))) { + throw new Exception("Unexpected EOF"); + } + return $data; + } + + private function readFormat($format, $fd, $len) { + if (false === ($data = @unpack($format, $this->readVerified($fd, $len)))) { + throw new Exception; + } + return $data; + } + + private function readSingleFormat($format, $fd, $len) { + return current($this->readFormat($format, $fd, $len)); + } + + private function readStringBinary($fd) { + if (($length = $this->readSingleFormat("V", $fd, 4))) { + return $this->readVerified($this->fd, $length); + } + return null; + } + + private function readSerializedBinary($fd) { + if (($length = $this->readSingleFormat("V", $fd, 4))) { + if (false === ($data = unserialize($this->readVerified($fd, $length)))) { + throw new Exception; + } + return $data; + } + return null; + } + + private function readStub() { + $stub = ""; + while (!feof($this->fd)) { + $line = fgets($this->fd); + $stub .= $line; + if (false !== stripos($line, self::HALT_COMPILER)) { + /* check for '?>' on a separate line */ + if ('?>' === $this->readVerified($this->fd, 2)) { + $stub .= '?>' . fgets($this->fd); + } else { + fseek($this->fd, -2, SEEK_CUR); + } + break; + } + } + return $stub; + } + + private function readManifest() { + $current = ftell($this->fd); + $header = $this->readFormat("Vlen/Vnum/napi/Vflags", $this->fd, 14); + $alias = $this->readStringBinary($this->fd); + $meta = $this->readSerializedBinary($this->fd); + $entries = []; + for ($i = 0; $i < $header["num"]; ++$i) { + $this->readEntry($entries); + } + $offset = ftell($this->fd); + if (($length = $offset - $current - 4) != $header["len"]) { + throw new Exception("Manifest length read was '$length', expected '{$header["len"]}'"); + } + return $header + compact("alias", "meta", "entries", "offset"); + } + + private function readEntry(array &$entries) { + if (!count($entries)) { + $offset = 0; + } else { + $last = end($entries); + $offset = $last["offset"] + $last["csize"]; + } + $file = $this->readStringBinary($this->fd); + if (!strlen($file)) { + throw new Exception("Empty file name encountered at offset '$offset'"); + } + $header = $this->readFormat("Vosize/Vstamp/Vcsize/Vcrc32/Vflags", $this->fd, 20); + $meta = $this->readSerializedBinary($this->fd); + $entries[$file] = $header + compact("meta", "offset"); + } + + private function readSignature() { + fseek($this->fd, -8, SEEK_END); + $sig = $this->readFormat("Vflags/Z4magic", $this->fd, 8); + $end = ftell($this->fd); + + if ($sig["magic"] !== "GBMB") { + throw new Exception("Invalid signature magic value '{$sig["magic"]}"); + } + + switch ($sig["flags"]) { + case self::SIG_OPENSSL: + fseek($this->fd, -12, SEEK_END); + if (($hash = $this->readSingleFormat("V", $this->fd, 4))) { + $offset = 4 + $hash; + fseek($this->fd, -$offset, SEEK_CUR); + $hash = $this->readVerified($this->fd, $hash); + fseek($this->fd, 0, SEEK_SET); + $valid = openssl_verify($this->readVerified($this->fd, $end - $offset - 8), + $hash, @file_get_contents($this->file.".pubkey")) === 1; + } + break; + + case self::SIG_MD5: + case self::SIG_SHA1: + case self::SIG_SHA256: + case self::SIG_SHA512: + $offset = 8 + self::$siglen[$sig["flags"]]; + fseek($this->fd, -$offset, SEEK_END); + $hash = $this->readVerified($this->fd, self::$siglen[$sig["flags"]]); + $algo = hash_init(self::$sigalg[$sig["flags"]]); + fseek($this->fd, 0, SEEK_SET); + hash_update_stream($algo, $this->fd, $end - $offset); + $valid = hash_final($algo, true) === $hash; + break; + + default: + throw new Exception("Invalid signature type '{$sig["flags"]}"); + } + + return $sig + compact("hash", "valid"); + } +} + + +namespace pharext; + +if (extension_loaded("Phar")) { + \Phar::interceptFileFuncs(); + \Phar::mapPhar(); + $phardir = "phar://".__FILE__; +} else { + $archive = new Archive(__FILE__); + $phardir = $archive->extract(); +} + +set_include_path("$phardir:". get_include_path()); + +$installer = new Installer(); +$installer->run($argc, $argv); + +__HALT_COMPILER(); ?> +…=)a:7:{s:7:"version";s:5:"4.1.1";s:6:"header";s:49:"pharext v4.1.1 (c) Michael Wallner ";s:4:"date";s:10:"2015-09-28";s:4:"name";s:5:"raphf";s:7:"release";s:6:"master";s:7:"license";s:1345:"Copyright (c) 2013, Michael Wallner . +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +";s:4:"type";s:9:"extension";}pharext/Archive.phpók V4-ÔI¶pharext/Cli/Args/Help.phpÉ ók VÉ gX'¶pharext/Cli/Args.phpók V?nö¶pharext/Cli/Command.phpk ók Vk d„aê¶pharext/Command.phpók VÔm`Ͷpharext/Exception.phpcók VcU†Ï{¶pharext/ExecCmd.phpók V¹l”ʶpharext/Installer.php&ók V&ød&À¶pharext/License.php“ók V“îòE¶pharext/Metadata.php•ók V•¿Úž¶pharext/Openssl/PrivateKey.phpÁók VÁ&æP¶pharext/Packager.phpÌ!ók VÌ!0<¶pharext/SourceDir/Basic.phpzók Vz÷+Ôâ¶pharext/SourceDir/Git.phpZók VZÉÎ\¶pharext/SourceDir/Pecl.phpøók Vøãùжpharext/SourceDir.php½ók V½3·#¶pharext/Task/Activate.phpÜ ók VÜ I“¶pharext/Task/Askpass.phpUók VU‡*¶ pharext/Task/BundleGenerator.php}ók V} ï`Y¶pharext/Task/Cleanup.phpók VÉI€B¶pharext/Task/Configure.phpTók VT}Ëì¶pharext/Task/Extract.phppók Vp[¨Û̶pharext/Task/GitClone.phpmók Vmóyµ@¶pharext/Task/Make.phpªók Vªœç6 ¶pharext/Task/PaxFixup.php¬ók V¬y⯶pharext/Task/PeclFixup.phpœók Vœeùtš¶pharext/Task/PharBuild.phpâók Vâζ0ɶpharext/Task/PharCompress.phpcók Vc½³Ï¶pharext/Task/PharRename.phpäók VäŠ[Þ˶pharext/Task/PharSign.php¨ók V¨Ûº¦i¶pharext/Task/PharStub.phpæók VæY|­›¶pharext/Task/Phpize.phpók Vù 2Ѷpharext/Task/StreamFetch.phpók Vˆîs\¶pharext/Task.phpwók Vw ÄIǶpharext/Tempdir.phpµók Vµë–,¶pharext/Tempfile.phpók V®ô¶pharext/Tempname.phptók Vtžn<¶pharext/Updater.phpók VžÏv¶pharext_installer.phpÝók VÝŒÞq¶pharext_packager.phpbók VbîVÓ϶pharext_updater.phphók Vh Êúj¶.gitattributes2ók V2êXV«¶ +.gitignoreºók VºzNè%¶CREDITSók VCµ]²¶DoxyfileW,ók VW,Zΰ¶LICENSEAók VA¾¬Jþ¶ README.mdDók VD“”›¶TODOók Vy_÷E¶ config.m4$ók V$Åê@›¶ +config.w32Ðók VÐýÍŽ¶ package.xmlók VL(—)¶ php_raphf.cEók VE™P¶ php_raphf.hók Vb·Ò¶php_raphf_api.hˆ2ók Vˆ2J^V¶php_raphf_test.cÍók VÍ·f>x¶ raphf.png|pók V|ps䙳¶tests/http001.phptók V *®¶tests/http002.phptLók VL€ÔïS¶tests/http003.phpt^ók V^ˆp¶tests/http004.phpt[ók V[Y諶tests/test.phpt¾ +ók V¾ +$àíY¶ 16, + self::SIG_SHA1 => 20, + self::SIG_SHA256 => 32, + self::SIG_SHA512 => 64, + self::SIG_OPENSSL=> 0 + ]; + + private static $sigalg = [ + self::SIG_MD5 => "md5", + self::SIG_SHA1 => "sha1", + self::SIG_SHA256 => "sha256", + self::SIG_SHA512 => "sha512", + self::SIG_OPENSSL=> "openssl" + ]; + + private static $sigtyp = [ + self::SIG_MD5 => "MD5", + self::SIG_SHA1 => "SHA-1", + self::SIG_SHA256 => "SHA-256", + self::SIG_SHA512 => "SHA-512", + self::SIG_OPENSSL=> "OpenSSL", + ]; + + const PERM_FILE_MASK = 0x01ff; + const COMP_FILE_MASK = 0xf000; + const COMP_GZ_FILE = 0x1000; + const COMP_BZ2_FILE = 0x2000; + + const COMP_PHAR_MASK= 0xf000; + const COMP_PHAR_GZ = 0x1000; + const COMP_PHAR_BZ2 = 0x2000; + + private $file; + private $fd; + private $stub; + private $manifest; + private $signature; + private $extracted; + + function __construct($file = null) { + if (strlen($file)) { + $this->open($file); + } + } + + function open($file) { + if (!$this->fd = @fopen($file, "r")) { + throw new Exception; + } + $this->file = $file; + $this->stub = $this->readStub(); + $this->manifest = $this->readManifest(); + $this->signature = $this->readSignature(); + } + + function getIterator() { + return new RecursiveDirectoryIterator($this->extract()); + } + + function extract() { + return $this->extracted ?: $this->extractTo(new Tempdir("archive")); + } + + function extractTo($dir) { + if ((string) $this->extracted == (string) $dir) { + return $this->extracted; + } + foreach ($this->manifest["entries"] as $file => $entry) { + fseek($this->fd, $this->manifest["offset"]+$entry["offset"]); + $path = "$dir/$file"; + $copy = stream_copy_to_stream($this->fd, $this->outFd($path, $entry["flags"]), $entry["csize"]); + if ($entry["osize"] != $copy) { + throw new Exception("Copied '$copy' of '$file', expected '{$entry["osize"]}' from '{$entry["csize"]}"); + } + + $crc = hexdec(hash_file("crc32b", $path)); + if ($crc !== $entry["crc32"]) { + throw new Exception("CRC mismatch of '$file': '$crc' != '{$entry["crc32"]}"); + } + + chmod($path, $entry["flags"] & self::PERM_FILE_MASK); + touch($path, $entry["stamp"]); + } + return $this->extracted = $dir; + } + + function offsetExists($o) { + return isset($this->entries[$o]); + } + + function offsetGet($o) { + $this->extract(); + return new SplFileInfo($this->extracted."/$o"); + } + + function offsetSet($o, $v) { + throw new Exception("Archive is read-only"); + } + + function offsetUnset($o) { + throw new Exception("Archive is read-only"); + } + + function getSignature() { + /* compatible with Phar::getSignature() */ + return [ + "hash_type" => self::$sigtyp[$this->signature["flags"]], + "hash" => strtoupper(bin2hex($this->signature["hash"])), + ]; + } + + function getPath() { + /* compatible with Phar::getPath() */ + return new SplFileInfo($this->file); + } + + function getMetadata($key = null) { + if (isset($key)) { + return $this->manifest["meta"][$key]; + } + return $this->manifest["meta"]; + } + + private function outFd($path, $flags) { + $dirn = dirname($path); + if (!is_dir($dirn) && !@mkdir($dirn, 0777, true)) { + throw new Exception; + } + if (!$fd = @fopen($path, "w")) { + throw new Exception; + } + switch ($flags & self::COMP_FILE_MASK) { + case self::COMP_GZ_FILE: + if (!@stream_filter_append($fd, "zlib.inflate")) { + throw new Exception; + } + break; + case self::COMP_BZ2_FILE: + if (!@stream_filter_append($fd, "bz2.decompress")) { + throw new Exception; + } + break; + } + + } + private function readVerified($fd, $len) { + if ($len != strlen($data = fread($fd, $len))) { + throw new Exception("Unexpected EOF"); + } + return $data; + } + + private function readFormat($format, $fd, $len) { + if (false === ($data = @unpack($format, $this->readVerified($fd, $len)))) { + throw new Exception; + } + return $data; + } + + private function readSingleFormat($format, $fd, $len) { + return current($this->readFormat($format, $fd, $len)); + } + + private function readStringBinary($fd) { + if (($length = $this->readSingleFormat("V", $fd, 4))) { + return $this->readVerified($this->fd, $length); + } + return null; + } + + private function readSerializedBinary($fd) { + if (($length = $this->readSingleFormat("V", $fd, 4))) { + if (false === ($data = unserialize($this->readVerified($fd, $length)))) { + throw new Exception; + } + return $data; + } + return null; + } + + private function readStub() { + $stub = ""; + while (!feof($this->fd)) { + $line = fgets($this->fd); + $stub .= $line; + if (false !== stripos($line, self::HALT_COMPILER)) { + /* check for '?>' on a separate line */ + if ('?>' === $this->readVerified($this->fd, 2)) { + $stub .= '?>' . fgets($this->fd); + } else { + fseek($this->fd, -2, SEEK_CUR); + } + break; + } + } + return $stub; + } + + private function readManifest() { + $current = ftell($this->fd); + $header = $this->readFormat("Vlen/Vnum/napi/Vflags", $this->fd, 14); + $alias = $this->readStringBinary($this->fd); + $meta = $this->readSerializedBinary($this->fd); + $entries = []; + for ($i = 0; $i < $header["num"]; ++$i) { + $this->readEntry($entries); + } + $offset = ftell($this->fd); + if (($length = $offset - $current - 4) != $header["len"]) { + throw new Exception("Manifest length read was '$length', expected '{$header["len"]}'"); + } + return $header + compact("alias", "meta", "entries", "offset"); + } + + private function readEntry(array &$entries) { + if (!count($entries)) { + $offset = 0; + } else { + $last = end($entries); + $offset = $last["offset"] + $last["csize"]; + } + $file = $this->readStringBinary($this->fd); + if (!strlen($file)) { + throw new Exception("Empty file name encountered at offset '$offset'"); + } + $header = $this->readFormat("Vosize/Vstamp/Vcsize/Vcrc32/Vflags", $this->fd, 20); + $meta = $this->readSerializedBinary($this->fd); + $entries[$file] = $header + compact("meta", "offset"); + } + + private function readSignature() { + fseek($this->fd, -8, SEEK_END); + $sig = $this->readFormat("Vflags/Z4magic", $this->fd, 8); + $end = ftell($this->fd); + + if ($sig["magic"] !== "GBMB") { + throw new Exception("Invalid signature magic value '{$sig["magic"]}"); + } + + switch ($sig["flags"]) { + case self::SIG_OPENSSL: + fseek($this->fd, -12, SEEK_END); + if (($hash = $this->readSingleFormat("V", $this->fd, 4))) { + $offset = 4 + $hash; + fseek($this->fd, -$offset, SEEK_CUR); + $hash = $this->readVerified($this->fd, $hash); + fseek($this->fd, 0, SEEK_SET); + $valid = openssl_verify($this->readVerified($this->fd, $end - $offset - 8), + $hash, @file_get_contents($this->file.".pubkey")) === 1; + } + break; + + case self::SIG_MD5: + case self::SIG_SHA1: + case self::SIG_SHA256: + case self::SIG_SHA512: + $offset = 8 + self::$siglen[$sig["flags"]]; + fseek($this->fd, -$offset, SEEK_END); + $hash = $this->readVerified($this->fd, self::$siglen[$sig["flags"]]); + $algo = hash_init(self::$sigalg[$sig["flags"]]); + fseek($this->fd, 0, SEEK_SET); + hash_update_stream($algo, $this->fd, $end - $offset); + $valid = hash_final($algo, true) === $hash; + break; + + default: + throw new Exception("Invalid signature type '{$sig["flags"]}"); + } + + return $sig + compact("hash", "valid"); + } +} +prog = $prog; + $this->args = $args; + } + + function __toString() { + $usage = "Usage:\n\n \$ "; + $usage .= $this->prog; + + list($flags, $required, $optional, $positional) = $this->listSpec(); + if ($flags) { + $usage .= $this->dumpFlags($flags); + } + if ($required) { + $usage .= $this->dumpRequired($required); + } + if ($optional) { + $usage .= $this->dumpOptional($optional); + } + if ($positional) { + $usage .= $this->dumpPositional($positional); + } + + $help = $this->dumpHelp($positional); + + return $usage . "\n\n" . $help . "\n"; + } + + function listSpec() { + $flags = []; + $required = []; + $optional = []; + $positional = []; + foreach ($this->args->getSpec() as $spec) { + if (is_numeric($spec[0])) { + $positional[] = $spec; + } elseif ($spec[3] & Args::REQUIRED) { + $required[] = $spec; + } elseif ($spec[3] & (Args::OPTARG|Args::REQARG)) { + $optional[] = $spec; + } else { + $flags[] = $spec; + } + } + + return [$flags, $required, $optional, $positional] + + compact("flags", "required", "optional", "positional"); + } + + function dumpFlags(array $flags) { + return sprintf(" [-%s]", implode("", array_column($flags, 0))); + } + + function dumpRequired(array $required) { + $dump = ""; + foreach ($required as $req) { + $dump .= sprintf(" -%s <%s>", $req[0], $req[1]); + } + return $dump; + } + + function dumpOptional(array $optional) { + $req = array_filter($optional, function($a) { + return $a[3] & Args::REQARG; + }); + $opt = array_filter($optional, function($a) { + return $a[3] & Args::OPTARG; + }); + + $dump = ""; + if ($req) { + $dump .= sprintf(" [-%s ]", implode("|-", array_column($req, 0))); + } + if ($opt) { + $dump .= sprintf(" [-%s []]", implode("|-", array_column($opt, 0))); + } + return $dump; + } + + function dumpPositional(array $positional) { + $dump = " [--]"; + foreach ($positional as $pos) { + if ($pos[3] & Args::REQUIRED) { + $dump .= sprintf(" <%s>", $pos[1]); + } else { + $dump .= sprintf(" [<%s>]", $pos[1]); + } + if ($pos[3] & Args::MULTI) { + $dump .= sprintf(" [<%s>]...", $pos[1]); + } + } + return $dump; + } + + function calcMaxLen() { + $spc = $this->args->getSpec(); + $max = max(array_map("strlen", array_column($spc, 1))); + $max += $max % 8 + 2; + return $max; + } + + function dumpHelp() { + $max = $this->calcMaxLen(); + $dump = ""; + foreach ($this->args->getSpec() as $spec) { + $dump .= " "; + if (is_numeric($spec[0])) { + $dump .= sprintf("-- %s ", $spec[1]); + } elseif (isset($spec[0])) { + $dump .= sprintf("-%s|", $spec[0]); + } + if (!is_numeric($spec[0])) { + $dump .= sprintf("--%s ", $spec[1]); + } + if ($spec[3] & Args::REQARG) { + $dump .= " "; + } elseif ($spec[3] & Args::OPTARG) { + $dump .= "[]"; + } else { + $dump .= " "; + } + + $dump .= str_repeat(" ", $max-strlen($spec[1])+3*!isset($spec[0])); + $dump .= $spec[2]; + + if ($spec[3] & Args::REQUIRED) { + $dump .= " (REQUIRED)"; + } + if ($spec[3] & Args::MULTI) { + $dump .= " (MULTIPLE)"; + } + if (isset($spec[4])) { + $dump .= sprintf(" [%s]", $spec[4]); + } + $dump .= "\n"; + } + return $dump; + } +} +compile($spec); + } + + } + + /** + * Compile the original spec + * @param array|Traversable $spec + * @return pharext\Cli\Args self + */ + public function compile($spec) { + foreach ($spec as $arg) { + if (isset($arg[0]) && is_numeric($arg[0])) { + $arg[3] &= ~0xf00; + $this->spec["--".$arg[0]] = $arg; + } elseif (isset($arg[0])) { + $this->spec["-".$arg[0]] = $arg; + $this->spec["--".$arg[1]] = $arg; + } else { + $this->spec["--".$arg[1]] = $arg; + } + $this->orig[] = $arg; + } + return $this; + } + + /** + * Get original spec + * @return array + */ + public function getSpec() { + return $this->orig; + } + + /** + * Get compiled spec + * @return array + */ + public function getCompiledSpec() { + return $this->spec; + } + + /** + * Parse command line arguments according to the compiled spec. + * + * The Generator yields any parsing errors. + * Parsing will stop when all arguments are processed or the first option + * flagged Cli\Args::HALT was encountered. + * + * @param int $argc + * @param array $argv + * @return Generator + */ + public function parse($argc, array $argv) { + for ($f = false, $p = 0, $i = 0; $i < $argc; ++$i) { + $o = $argv[$i]; + + if ($o{0} === "-" && strlen($o) > 2 && $o{1} !== "-") { + // multiple short opts, e.g. -vps + $argc += strlen($o) - 2; + array_splice($argv, $i, 1, array_map(function($s) { + return "-$s"; + }, str_split(substr($o, 1)))); + $o = $argv[$i]; + } elseif ($o{0} === "-" && strlen($o) > 2 && $o{1} === "-" && 0 < ($eq = strpos($o, "="))) { + // long opt with argument, e.g. --foo=bar + $argc++; + array_splice($argv, $i, 1, [ + substr($o, 0, $eq++), + substr($o, $eq) + ]); + $o = $argv[$i]; + } elseif ($o === "--") { + // only positional args following + $f = true; + continue; + } + + if ($f || !isset($this->spec[$o])) { + if ($o{0} !== "-" && isset($this->spec["--$p"])) { + $this[$p] = $o; + if (!$this->optIsMulti($p)) { + ++$p; + } + } else { + yield sprintf("Unknown option %s", $o); + } + } elseif (!$this->optAcceptsArg($o)) { + $this[$o] = true; + } elseif ($i+1 < $argc && !isset($this->spec[$argv[$i+1]])) { + $this[$o] = $argv[++$i]; + } elseif ($this->optRequiresArg($o)) { + yield sprintf("Option --%s requires an argument", $this->optLongName($o)); + } else { + // OPTARG + $this[$o] = $this->optDefaultArg($o); + } + + if ($this->optHalts($o)) { + return; + } + } + } + + /** + * Validate that all required options were given. + * + * The Generator yields any validation errors. + * + * @return Generator + */ + public function validate() { + $required = array_filter($this->orig, function($spec) { + return $spec[3] & self::REQUIRED; + }); + foreach ($required as $req) { + if ($req[3] & self::MULTI) { + if (is_array($this[$req[0]])) { + continue; + } + } elseif (strlen($this[$req[0]])) { + continue; + } + if (is_numeric($req[0])) { + yield sprintf("Argument <%s> is required", $req[1]); + } else { + yield sprintf("Option --%s is required", $req[1]); + } + } + } + + + public function toArray() { + $args = []; + foreach ($this->spec as $spec) { + $opt = $this->opt($spec[1]); + $args[$opt] = $this[$opt]; + } + return $args; + } + + /** + * Retreive the default argument of an option + * @param string $o + * @return mixed + */ + private function optDefaultArg($o) { + $o = $this->opt($o); + if (isset($this->spec[$o][4])) { + return $this->spec[$o][4]; + } + return null; + } + + /** + * Retrieve the help message of an option + * @param string $o + * @return string + */ + private function optHelp($o) { + $o = $this->opt($o); + if (isset($this->spec[$o][2])) { + return $this->spec[$o][2]; + } + return ""; + } + + /** + * Retrieve option's flags + * @param string $o + * @return int + */ + private function optFlags($o) { + $o = $this->opt($o); + if (isset($this->spec[$o])) { + return $this->spec[$o][3]; + } + return null; + } + + /** + * Check whether an option is flagged for halting argument processing + * @param string $o + * @return boolean + */ + private function optHalts($o) { + return $this->optFlags($o) & self::HALT; + } + + /** + * Check whether an option needs an argument + * @param string $o + * @return boolean + */ + private function optRequiresArg($o) { + return $this->optFlags($o) & self::REQARG; + } + + /** + * Check wether an option accepts any argument + * @param string $o + * @return boolean + */ + private function optAcceptsArg($o) { + return $this->optFlags($o) & 0xf00; + } + + /** + * Check whether an option can be used more than once + * @param string $o + * @return boolean + */ + private function optIsMulti($o) { + return $this->optFlags($o) & self::MULTI; + } + + /** + * Retreive the long name of an option + * @param string $o + * @return string + */ + private function optLongName($o) { + $o = $this->opt($o); + return is_numeric($this->spec[$o][0]) ? $this->spec[$o][0] : $this->spec[$o][1]; + } + + /** + * Retreive the short name of an option + * @param string $o + * @return string + */ + private function optShortName($o) { + $o = $this->opt($o); + return is_numeric($this->spec[$o][0]) ? null : $this->spec[$o][0]; + } + + /** + * Retreive the canonical name (--long-name) of an option + * @param string $o + * @return string + */ + private function opt($o) { + if (is_numeric($o)) { + return "--$o"; + } + if ($o{0} !== '-') { + if (strlen($o) > 1) { + $o = "-$o"; + } + $o = "-$o"; + } + return $o; + } + + /**@+ + * Implements ArrayAccess and virtual properties + */ + function offsetExists($o) { + $o = $this->opt($o); + return isset($this->args[$o]); + } + function __isset($o) { + return $this->offsetExists($o); + } + function offsetGet($o) { + $o = $this->opt($o); + if (isset($this->args[$o])) { + return $this->args[$o]; + } + return $this->optDefaultArg($o); + } + function __get($o) { + return $this->offsetGet($o); + } + function offsetSet($o, $v) { + $osn = $this->optShortName($o); + $oln = $this->optLongName($o); + if ($this->optIsMulti($o)) { + if (isset($osn)) { + $this->args["-$osn"][] = $v; + } + $this->args["--$oln"][] = $v; + } else { + if (isset($osn)) { + $this->args["-$osn"] = $v; + } + $this->args["--$oln"] = $v; + } + } + function __set($o, $v) { + $this->offsetSet($o, $v); + } + function offsetUnset($o) { + unset($this->args["-".$this->optShortName($o)]); + unset($this->args["--".$this->optLongName($o)]); + } + function __unset($o) { + $this->offsetUnset($o); + } + /**@-*/ +} +args; + } + + /** + * Retrieve metadata of the currently running phar + * @param string $key + * @return mixed + */ + public function metadata($key = null) { + if (extension_loaded("Phar")) { + $running = new Phar(Phar::running(false)); + } else { + $running = new Archive(PHAREXT_PHAR); + } + + if ($key === "signature") { + $sig = $running->getSignature(); + return sprintf("%s signature of %s\n%s", + $sig["hash_type"], + $this->metadata("name"), + chunk_split($sig["hash"], 64, "\n")); + } + + $metadata = $running->getMetadata(); + if (isset($key)) { + return $metadata[$key]; + } + return $metadata; + } + + /** + * Output pharext vX.Y.Z header + */ + public function header() { + if (!headers_sent()) { + /* only display header, if we didn't generate any output yet */ + printf("%s\n\n", $this->metadata("header")); + } + } + + /** + * @inheritdoc + * @see \pharext\Command::debug() + */ + public function debug($fmt) { + if ($this->args->verbose) { + vprintf($fmt, array_slice(func_get_args(), 1)); + } + } + + /** + * @inheritdoc + * @see \pharext\Command::info() + */ + public function info($fmt) { + if (!$this->args->quiet) { + vprintf($fmt, array_slice(func_get_args(), 1)); + } + } + + /** + * @inheritdoc + * @see \pharext\Command::warn() + */ + public function warn($fmt) { + if (!$this->args->quiet) { + if (!isset($fmt)) { + $fmt = "%s\n"; + $arg = error_get_last()["message"]; + } else { + $arg = array_slice(func_get_args(), 1); + } + vfprintf(STDERR, "Warning: $fmt", $arg); + } + } + + /** + * @inheritdoc + * @see \pharext\Command::error() + */ + public function error($fmt) { + if (!isset($fmt)) { + $fmt = "%s\n"; + $arg = error_get_last()["message"]; + } else { + $arg = array_slice(func_get_args(), 1); + } + vfprintf(STDERR, "ERROR: $fmt", $arg); + } + + /** + * Output command line help message + * @param string $prog + */ + public function help($prog) { + print new Args\Help($prog, $this->args); + } + + /** + * Verbosity + * @return boolean + */ + public function verbosity() { + if ($this->args->verbose) { + return true; + } elseif ($this->args->quiet) { + return false; + } else { + return null; + } + } +} +command = $command; + $this->verbose = $verbose; + } + + /** + * (Re-)set sudo command + * @param string $sudo + */ + public function setSu($sudo = false) { + $this->sudo = $sudo; + } + + /** + * Execute a program with escalated privileges handling interactive password prompt + * @param string $command + * @param bool $verbose + * @return int exit status + */ + private function suExec($command, $verbose = null) { + if (!($proc = proc_open($command, [STDIN,["pipe","w"],["pipe","w"]], $pipes))) { + $this->status = -1; + throw new Exception("Failed to run {$command}"); + } + + $stdout = $pipes[1]; + $passwd = 0; + $checks = 10; + + while (!feof($stdout)) { + $R = [$stdout]; $W = []; $E = []; + if (!stream_select($R, $W, $E, null)) { + continue; + } + $data = fread($stdout, 0x1000); + /* only check a few times */ + if ($passwd < $checks) { + $passwd++; + if (stristr($data, "password")) { + $passwd = $checks + 1; + printf("\n%s", $data); + continue; + } + } elseif ($passwd > $checks) { + /* new line after pw entry */ + printf("\n"); + $passwd = $checks; + } + + if ($verbose === null) { + print $this->progress($data, 0); + } else { + if ($verbose) { + printf("%s", $data); + } + $this->output .= $data; + } + } + if ($verbose === null) { + $this->progress("", PHP_OUTPUT_HANDLER_FINAL); + } + return $this->status = proc_close($proc); + } + + /** + * Output handler that displays some progress while soaking output + * @param string $string + * @param int $flags + * @return string + */ + private function progress($string, $flags) { + static $counter = 0; + static $symbols = ["\\","|","/","-"]; + + $this->output .= $string; + + if (false !== strpos($string, "\n")) { + ++$counter; + } + + return $flags & PHP_OUTPUT_HANDLER_FINAL + ? " \r" + : sprintf(" %s\r", $symbols[$counter % 4]); + } + + /** + * Run the command + * @param array $args + * @return \pharext\ExecCmd self + * @throws \pharext\Exception + */ + public function run(array $args = null) { + $exec = escapeshellcmd($this->command); + if ($args) { + $exec .= " ". implode(" ", array_map("escapeshellarg", (array) $args)); + } + + if ($this->sudo) { + $this->suExec(sprintf($this->sudo." 2>&1", $exec), $this->verbose); + } elseif ($this->verbose) { + ob_start(function($s) { + $this->output .= $s; + return $s; + }, 1); + passthru($exec, $this->status); + ob_end_flush(); + } elseif ($this->verbose !== false /* !quiet */) { + ob_start([$this, "progress"], 1); + passthru($exec . " 2>&1", $this->status); + ob_end_flush(); + } else { + exec($exec ." 2>&1", $output, $this->status); + $this->output = implode("\n", $output); + } + + if ($this->status) { + throw new Exception("Command {$exec} failed ({$this->status})"); + } + + return $this; + } + + /** + * Retrieve exit code of cmd run + * @return int + */ + public function getStatus() { + return $this->status; + } + + /** + * Retrieve output of cmd run + * @return string + */ + public function getOutput() { + return $this->output; + } +} +args = new Cli\Args([ + ["h", "help", "Display help", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + ["v", "verbose", "More output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["q", "quiet", "Less output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["p", "prefix", "PHP installation prefix if phpize is not in \$PATH, e.g. /opt/php7", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG], + ["n", "common-name", "PHP common program name, e.g. php5 or zts-php", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG, + "php"], + ["c", "configure", "Additional extension configure flags, e.g. -c --with-flag", + Cli\Args::OPTIONAL|Cli\Args::MULTI|Cli\Args::REQARG], + ["s", "sudo", "Installation might need increased privileges", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::OPTARG, + "sudo -S %s"], + ["i", "ini", "Activate in this php.ini instead of loaded default php.ini", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG], + [null, "signature", "Show package signature", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "license", "Show package license", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "name", "Show package name", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "date", "Show package release date", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "release", "Show package release version", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "version", "Show pharext version", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + ]); + } + + /** + * Perform cleaniup + */ + function __destruct() { + foreach ($this->cleanup as $cleanup) { + $cleanup->run(); + } + } + + private function extract($phar) { + $temp = (new Task\Extract($phar))->run($this->verbosity()); + $this->cleanup[] = new Task\Cleanup($temp); + return $temp; + } + + private function hooks(SplObjectStorage $phars) { + $hook = []; + foreach ($phars as $phar) { + if (isset($phar["pharext_package.php"])) { + $sdir = include $phar["pharext_package.php"]; + if ($sdir instanceof SourceDir) { + $this->args->compile($sdir->getArgs()); + $hook[] = $sdir; + } + } + } + return $hook; + } + + private function load() { + $list = new SplObjectStorage(); + $phar = extension_loaded("Phar") + ? new Phar(Phar::running(false)) + : new Archive(PHAREXT_PHAR); + $temp = $this->extract($phar); + + foreach ($phar as $entry) { + $dep_file = $entry->getBaseName(); + if (fnmatch("*.ext.phar*", $dep_file)) { + $dep_phar = extension_loaded("Phar") + ? new Phar("$temp/$dep_file") + : new Archive("$temp/$dep_file"); + $list[$dep_phar] = $this->extract($dep_phar); + } + } + + /* the actual ext.phar at last */ + $list[$phar] = $temp; + return $list; + } + + /** + * @inheritdoc + * @see \pharext\Command::run() + */ + public function run($argc, array $argv) { + try { + /* load the phar(s) */ + $list = $this->load(); + /* installer hooks */ + $hook = $this->hooks($list); + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EEXTRACT); + } + + /* standard arg stuff */ + $errs = []; + $prog = array_shift($argv); + foreach ($this->args->parse(--$argc, $argv) as $error) { + $errs[] = $error; + } + + if ($this->args["help"]) { + $this->header(); + $this->help($prog); + exit; + } + try { + foreach (["signature", "name", "date", "license", "release", "version"] as $opt) { + if ($this->args[$opt]) { + printf("%s\n", $this->metadata($opt)); + exit; + } + } + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EARGS); + } + + foreach ($this->args->validate() as $error) { + $errs[] = $error; + } + + if ($errs) { + if (!$this->args["quiet"]) { + $this->header(); + } + foreach ($errs as $err) { + $this->error("%s\n", $err); + } + if (!$this->args["quiet"]) { + $this->help($prog); + } + exit(self::EARGS); + } + + try { + /* post process hooks */ + foreach ($hook as $sdir) { + $sdir->setArgs($this->args); + } + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EARGS); + } + + /* install packages */ + try { + foreach ($list as $phar) { + $this->info("Installing %s ...\n", basename($phar->getPath())); + $this->install($list[$phar]); + $this->activate($list[$phar]); + $this->info("Successfully installed %s!\n", basename($phar->getPath())); + } + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EINSTALL); + } + } + + /** + * Phpize + trinity + */ + private function install($temp) { + // phpize + $phpize = new Task\Phpize($temp, $this->args->prefix, $this->args->{"common-name"}); + $phpize->run($this->verbosity()); + + // configure + $configure = new Task\Configure($temp, $this->args->configure, $this->args->prefix, $this->args->{"common-name"}); + $configure->run($this->verbosity()); + + // make + $make = new Task\Make($temp); + $make->run($this->verbosity()); + + // install + $sudo = isset($this->args->sudo) ? $this->args->sudo : null; + $install = new Task\Make($temp, ["install"], $sudo); + $install->run($this->verbosity()); + } + + private function activate($temp) { + if ($this->args->ini) { + $files = [$this->args->ini]; + } else { + $files = array_filter(array_map("trim", explode(",", php_ini_scanned_files()))); + $files[] = php_ini_loaded_file(); + } + + $sudo = isset($this->args->sudo) ? $this->args->sudo : null; + $type = $this->metadata("type") ?: "extension"; + + $activate = new Task\Activate($temp, $files, $type, $this->args->prefix, $this->args{"common-name"}, $sudo); + if (!$activate->run($this->verbosity())) { + $this->info("Extension already activated ...\n"); + } + } +} +mergeLicensePattern($name, strtolower($name)); + } + $exts = []; + foreach (["t{,e}xt", "rst", "asc{,i,ii}", "m{,ark}d{,own}", "htm{,l}"] as $ext) { + $exts[] = $this->mergeLicensePattern(strtoupper($ext), $ext); + } + + $pattern = "{". implode(",", $names) ."}{,.{". implode(",", $exts) ."}}"; + + if (($glob = glob("$dir/$pattern", GLOB_BRACE))) { + return current($glob); + } + } + + private function mergeLicensePattern($upper, $lower) { + $pattern = ""; + $length = strlen($upper); + for ($i = 0; $i < $length; ++$i) { + if ($lower{$i} === $upper{$i}) { + $pattern .= $upper{$i}; + } else { + $pattern .= "[" . $upper{$i} . $lower{$i} . "]"; + } + } + return $pattern; + } + + public function readLicense($file) { + $text = file_get_contents($file); + switch (strtolower(pathinfo($file, PATHINFO_EXTENSION))) { + case "htm": + case "html": + $text = strip_tags($text); + break; + } + return $text; + } +} +", self::version()); + } + + static function date() { + return gmdate("Y-m-d"); + } + + static function all() { + return [ + "version" => self::version(), + "header" => self::header(), + "date" => self::date(), + ]; + } +} +key); + $this->pub = openssl_pkey_get_details($key)["key"]; + } + + /** + * Sign the PHAR + * @param \Phar $package + */ + function sign(\Phar $package) { + $package->setSignatureAlgorithm(\Phar::OPENSSL, $this->key); + } + + /** + * Export the public key to a file + * @param string $file + * @throws \pharext\Exception + */ + function exportPublicKey($file) { + if (!file_put_contents("$file.tmp", $this->pub) || !rename("$file.tmp", $file)) { + throw new Exception; + } + } +} +args = new Cli\Args([ + ["h", "help", "Display this help", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + ["v", "verbose", "More output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["q", "quiet", "Less output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["n", "name", "Extension name", + Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG], + ["r", "release", "Extension release version", + Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG], + ["s", "source", "Extension source directory", + Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG], + ["g", "git", "Use `git ls-tree` to determine file list", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["b", "branch", "Checkout this tag/branch", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG], + ["p", "pecl", "Use PECL package.xml to determine file list, name and release", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["d", "dest", "Destination directory", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG, + "."], + ["z", "gzip", "Create additional PHAR compressed with gzip", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["Z", "bzip", "Create additional PHAR compressed with bzip", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["S", "sign", "Sign the PHAR with a private key", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG], + ["E", "zend", "Mark as Zend Extension", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + [null, "signature", "Show pharext signature", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "license", "Show pharext license", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "version", "Show pharext version", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + ]); + } + + /** + * Perform cleaniup + */ + function __destruct() { + foreach ($this->cleanup as $cleanup) { + $cleanup->run(); + } + } + + /** + * @inheritdoc + * @see \pharext\Command::run() + */ + public function run($argc, array $argv) { + $errs = []; + $prog = array_shift($argv); + foreach ($this->args->parse(--$argc, $argv) as $error) { + $errs[] = $error; + } + + if ($this->args["help"]) { + $this->header(); + $this->help($prog); + exit; + } + try { + foreach (["signature", "license", "version"] as $opt) { + if ($this->args[$opt]) { + printf("%s\n", $this->metadata($opt)); + exit; + } + } + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EARGS); + } + + try { + /* source needs to be evaluated before Cli\Args validation, + * so e.g. name and version can be overriden and Cli\Args + * does not complain about missing arguments + */ + $this->loadSource(); + } catch (\Exception $e) { + $errs[] = $e->getMessage(); + } + + foreach ($this->args->validate() as $error) { + $errs[] = $error; + } + + if ($errs) { + if (!$this->args["quiet"]) { + $this->header(); + } + foreach ($errs as $err) { + $this->error("%s\n", $err); + } + printf("\n"); + if (!$this->args["quiet"]) { + $this->help($prog); + } + exit(self::EARGS); + } + + $this->createPackage(); + } + + /** + * Download remote source + * @param string $source + * @return string local source + */ + private function download($source) { + if ($this->args->git) { + $task = new Task\GitClone($source, $this->args->branch); + } else { + /* print newline only once */ + $done = false; + $task = new Task\StreamFetch($source, function($bytes_pct) use(&$done) { + if (!$done) { + $this->info(" %3d%% [%s>%s] \r", + floor($bytes_pct*100), + str_repeat("=", round(50*$bytes_pct)), + str_repeat(" ", round(50*(1-$bytes_pct))) + ); + if ($bytes_pct == 1) { + $done = true; + $this->info("\n"); + } + } + }); + } + $local = $task->run($this->verbosity()); + + $this->cleanup[] = new Task\Cleanup($local); + return $local; + } + + /** + * Extract local archive + * @param stirng $source + * @return string extracted directory + */ + private function extract($source) { + try { + $task = new Task\Extract($source); + $dest = $task->run($this->verbosity()); + } catch (\Exception $e) { + if (false === strpos($e->getMessage(), "checksum mismatch")) { + throw $e; + } + $dest = (new Task\PaxFixup($source))->run($this->verbosity()); + } + + $this->cleanup[] = new Task\Cleanup($dest); + return $dest; + } + + /** + * Localize a possibly remote source + * @param string $source + * @return string local source directory + */ + private function localize($source) { + if (!stream_is_local($source) || ($this->args->git && isset($this->args->branch))) { + $source = $this->download($source); + $this->cleanup[] = new Task\Cleanup($source); + } + $source = realpath($source); + if (!is_dir($source)) { + $source = $this->extract($source); + $this->cleanup[] = new Task\Cleanup($source); + + if (!$this->args->git) { + $source = (new Task\PeclFixup($source))->run($this->verbosity()); + } + } + return $source; + } + + /** + * Load the source dir + * @throws \pharext\Exception + */ + private function loadSource(){ + if ($this->args["source"]) { + $source = $this->localize($this->args["source"]); + + if ($this->args["pecl"]) { + $this->source = new SourceDir\Pecl($source); + } elseif ($this->args["git"]) { + $this->source = new SourceDir\Git($source); + } elseif (is_file("$source/pharext_package.php")) { + $this->source = include "$source/pharext_package.php"; + } else { + $this->source = new SourceDir\Basic($source); + } + + if (!$this->source instanceof SourceDir) { + throw new Exception("Unknown source dir $source"); + } + + foreach ($this->source->getPackageInfo() as $key => $val) { + $this->args->$key = $val; + } + } + } + + /** + * Creates the extension phar + */ + private function createPackage() { + try { + $meta = array_merge(Metadata::all(), [ + "name" => $this->args->name, + "release" => $this->args->release, + "license" => $this->source->getLicense(), + "type" => $this->args->zend ? "zend_extension" : "extension", + ]); + $file = (new Task\PharBuild($this->source, __DIR__."/../pharext_installer.php", $meta))->run($this->verbosity()); + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EBUILD); + } + + try { + if ($this->args->sign) { + $this->info("Using private key to sign phar ...\n"); + $pass = (new Task\Askpass)->run($this->verbosity()); + $sign = new Task\PharSign($file, $this->args->sign, $pass); + $pkey = $sign->run($this->verbosity()); + } + + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::ESIGN); + } + + if ($this->args->gzip) { + try { + $gzip = (new Task\PharCompress($file, Phar::GZ))->run(); + $move = new Task\PharRename($gzip, $this->args->dest, $this->args->name ."-". $this->args->release); + $name = $move->run($this->verbosity()); + + $this->info("Created gzipped phar %s\n", $name); + + if ($this->args->sign) { + $sign = new Task\PharSign($name, $this->args->sign, $pass); + $sign->run($this->verbosity())->exportPublicKey($name.".pubkey"); + } + + } catch (\Exception $e) { + $this->warn("%s\n", $e->getMessage()); + } + } + + if ($this->args->bzip) { + try { + $bzip = (new Task\PharCompress($file, Phar::BZ2))->run(); + $move = new Task\PharRename($bzip, $this->args->dest, $this->args->name ."-". $this->args->release); + $name = $move->run($this->verbosity()); + + $this->info("Created bzipped phar %s\n", $name); + + if ($this->args->sign) { + $sign = new Task\PharSign($name, $this->args->sign, $pass); + $sign->run($this->verbosity())->exportPublicKey($name.".pubkey"); + } + + } catch (\Exception $e) { + $this->warn("%s\n", $e->getMessage()); + } + } + + try { + $move = new Task\PharRename($file, $this->args->dest, $this->args->name ."-". $this->args->release); + $name = $move->run($this->verbosity()); + + $this->info("Created executable phar %s\n", $name); + + if (isset($pkey)) { + $pkey->exportPublicKey($name.".pubkey"); + } + + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EBUILD); + } + } +} +path = $path; + } + + public function getBaseDir() { + return $this->path; + } + + public function getPackageInfo() { + return []; + } + + public function getLicense() { + if (($file = $this->findLicense($this->getBaseDir()))) { + return $this->readLicense($file); + } + return "UNKNOWN"; + } + + public function getArgs() { + return []; + } + + public function setArgs(Args $args) { + } + + public function filter($current, $key, $iterator) { + $sub = $current->getSubPath(); + if ($sub === ".git" || $sub === ".hg" || $sub === ".svn") { + return false; + } + return true; + } + + public function getIterator() { + $rdi = new RecursiveDirectoryIterator($this->path, + FilesystemIterator::CURRENT_AS_SELF | // needed for 5.5 + FilesystemIterator::KEY_AS_PATHNAME | + FilesystemIterator::SKIP_DOTS); + $rci = new RecursiveCallbackFilterIterator($rdi, [$this, "filter"]); + $rii = new RecursiveIteratorIterator($rci); + foreach ($rii as $path => $child) { + if (!$child->isDir()) { + yield realpath($path); + } + } + } +} +path = $path; + } + + /** + * @inheritdoc + * @see \pharext\SourceDir::getBaseDir() + */ + public function getBaseDir() { + return $this->path; + } + + /** + * @inheritdoc + * @return array + */ + public function getPackageInfo() { + return []; + } + + /** + * @inheritdoc + * @return string + */ + public function getLicense() { + if (($file = $this->findLicense($this->getBaseDir()))) { + return $this->readLicense($file); + } + return "UNKNOWN"; + } + + /** + * @inheritdoc + * @return array + */ + public function getArgs() { + return []; + } + + /** + * @inheritdoc + */ + public function setArgs(Args $args) { + } + + /** + * Generate a list of files by `git ls-files` + * @return Generator + */ + private function generateFiles() { + $pwd = getcwd(); + chdir($this->path); + if (($pipe = popen("git ls-tree -r --name-only HEAD", "r"))) { + $path = realpath($this->path); + while (!feof($pipe)) { + if (strlen($file = trim(fgets($pipe)))) { + /* there may be symlinks, so no realpath here */ + yield "$path/$file"; + } + } + pclose($pipe); + } + chdir($pwd); + } + + /** + * Implements IteratorAggregate + * @see IteratorAggregate::getIterator() + */ + public function getIterator() { + return $this->generateFiles(); + } +} +file = "$path/package2.xml"); + } elseif (is_file("$path/package.xml")) { + $sxe = simplexml_load_file($this->file = "$path/package.xml"); + } else { + throw new Exception("Missing package.xml in $path"); + } + + $sxe->registerXPathNamespace("pecl", $sxe->getDocNamespaces()[""]); + + $this->sxe = $sxe; + $this->path = realpath($path); + } + + /** + * @inheritdoc + * @see \pharext\SourceDir::getBaseDir() + */ + public function getBaseDir() { + return $this->path; + } + + /** + * Retrieve gathered package info + * @return Generator + */ + public function getPackageInfo() { + if (($name = $this->sxe->xpath("/pecl:package/pecl:name"))) { + yield "name" => (string) $name[0]; + } + if (($release = $this->sxe->xpath("/pecl:package/pecl:version/pecl:release"))) { + yield "release" => (string) $release[0]; + } + if ($this->sxe->xpath("/pecl:package/pecl:zendextsrcrelease")) { + yield "zend" => true; + } + } + + /** + * @inheritdoc + * @return string + */ + public function getLicense() { + if (($license = $this->sxe->xpath("/pecl:package/pecl:license"))) { + if (($file = $this->findLicense($this->getBaseDir(), $license[0]["filesource"]))) { + return $this->readLicense($file); + } + } + if (($file = $this->findLicense($this->getBaseDir()))) { + return $this->readLicense($file); + } + if ($license) { + return $license[0] ." ". $license[0]["uri"]; + } + return "UNKNOWN"; + } + + /** + * @inheritdoc + * @see \pharext\SourceDir::getArgs() + */ + public function getArgs() { + $configure = $this->sxe->xpath("/pecl:package/pecl:extsrcrelease/pecl:configureoption"); + foreach ($configure as $cfg) { + yield [null, $cfg["name"], ucfirst($cfg["prompt"]), Args::OPTARG, + strlen($cfg["default"]) ? $cfg["default"] : null]; + } + $configure = $this->sxe->xpath("/pecl:package/pecl:zendextsrcrelease/pecl:configureoption"); + foreach ($configure as $cfg) { + yield [null, $cfg["name"], ucfirst($cfg["prompt"]), Args::OPTARG, + strlen($cfg["default"]) ? $cfg["default"] : null]; + } + } + + /** + * @inheritdoc + * @see \pharext\SourceDir::setArgs() + */ + public function setArgs(Args $args) { + $configure = $this->sxe->xpath("/pecl:package/pecl:extsrcrelease/pecl:configureoption"); + foreach ($configure as $cfg) { + if (isset($args[$cfg["name"]])) { + $args->configure = "--{$cfg["name"]}={$args[$cfg["name"]]}"; + } + } + $configure = $this->sxe->xpath("/pecl:package/pecl:zendextsrcrelease/pecl:configureoption"); + foreach ($configure as $cfg) { + if (isset($args[$cfg["name"]])) { + $args->configure = "--{$cfg["name"]}={$args[$cfg["name"]]}"; + } + } + } + + /** + * Compute the path of a file by parent dir nodes + * @param \SimpleXMLElement $ele + * @return string + */ + private function dirOf($ele) { + $path = ""; + while (($ele = current($ele->xpath(".."))) && $ele->getName() == "dir") { + $path = trim($ele["name"], "/") ."/". $path ; + } + return trim($path, "/"); + } + + /** + * Generate a list of files from the package.xml + * @return Generator + */ + private function generateFiles() { + /* hook */ + $temp = tmpfile(); + fprintf($temp, " $temp; + + /* deps */ + $dependencies = $this->sxe->xpath("/pecl:package/pecl:dependencies/pecl:required/pecl:package"); + foreach ($dependencies as $key => $dep) { + if (($glob = glob("{$this->path}/{$dep->name}-*.ext.phar*"))) { + usort($glob, function($a, $b) { + return version_compare( + substr($a, strpos(".ext.phar", $a)), + substr($b, strpos(".ext.phar", $b)) + ); + }); + yield end($glob); + } + } + + /* files */ + yield realpath($this->file); + foreach ($this->sxe->xpath("//pecl:file") as $file) { + yield realpath($this->path ."/". $this->dirOf($file) ."/". $file["name"]); + } + } + + /** + * Implements IteratorAggregate + * @see IteratorAggregate::getIterator() + */ + public function getIterator() { + return $this->generateFiles(); + } +} +cwd = $cwd; + $this->type = $type; + $this->sudo = $sudo; + if (!$this->inis = $inis) { + throw new Exception("No PHP INIs given"); + } + $cmd = $common_name . "-config"; + if (isset($prefix)) { + $cmd = $prefix . "/bin/" . $cmd; + } + $this->php_config = $cmd; + } + + /** + * @param bool $verbose + * @return boolean false, if extension was already activated + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Running INI activation ...\n"); + } + $extension = basename(current(glob("{$this->cwd}/modules/*.so"))); + + if ($this->type === "zend_extension") { + $pattern = preg_quote((new ExecCmd($this->php_config))->run(["--extension-dir"])->getOutput() . "/$extension", "/"); + } else { + $pattern = preg_quote($extension, "/"); + } + + foreach ($this->inis as $file) { + if ($verbose) { + printf("Checking %s ...\n", $file); + } + if (!file_exists($file)) { + throw new Exception(sprintf("INI file '%s' does not exist", $file)); + } + $temp = new Tempfile("phpini"); + foreach (file($file) as $line) { + if (preg_match("/^\s*{$this->type}\s*=\s*[\"']?{$pattern}[\"']?\s*(;.*)?\$/", $line)) { + return false; + } + fwrite($temp->getStream(), $line); + } + } + + /* not found; append to last processed file, which is the main by default */ + if ($verbose) { + printf("Activating in %s ...\n", $file); + } + fprintf($temp->getStream(), $this->type . "=%s\n", $extension); + $temp->closeStream(); + + $path = $temp->getPathname(); + $stat = stat($file); + + // owner transfer + $ugid = sprintf("%d:%d", $stat["uid"], $stat["gid"]); + $cmd = new ExecCmd("chown", $verbose); + if (isset($this->sudo)) { + $cmd->setSu($this->sudo); + } + $cmd->run([$ugid, $path]); + + // permission transfer + $perm = decoct($stat["mode"] & 0777); + $cmd = new ExecCmd("chmod", $verbose); + if (isset($this->sudo)) { + $cmd->setSu($this->sudo); + } + $cmd->run([$perm, $path]); + + // rename + $cmd = new ExecCmd("mv", $verbose); + if (isset($this->sudo)) { + $cmd->setSu($this->sudo); + } + $cmd->run([$path, $file]); + + if ($verbose) { + printf("Replaced %s ...\n", $file); + } + + return true; + } +} +prompt = $prompt; + } + + /** + * @param bool $verbose + * @return string + */ + public function run($verbose = false) { + system("stty -echo"); + printf("%s ", $this->prompt); + $pass = fgets(STDIN, 1024); + printf("\n"); + system("stty echo"); + if (substr($pass, -1) == "\n") { + $pass = substr($pass, 0, -1); + } + return $pass; + } +} +rewind(); $rii->valid(); $rii->next()) { + if (!$rii->isDot()) { + yield $rii->getSubPathname() => $rii->key(); + } + } + } +} +rm = $rm; + } + + /** + * @param bool $verbose + */ + public function run($verbose = false) { + if ($verbose) { + printf("Cleaning up %s ...\n", $this->rm); + } + if ($this->rm instanceof Tempfile) { + unset($this->rm); + } elseif (is_dir($this->rm)) { + $rdi = new RecursiveDirectoryIterator($this->rm, + FilesystemIterator::CURRENT_AS_SELF | // needed for 5.5 + FilesystemIterator::KEY_AS_PATHNAME | + FilesystemIterator::SKIP_DOTS); + $rii = new RecursiveIteratorIterator($rdi, + RecursiveIteratorIterator::CHILD_FIRST); + foreach ($rii as $path => $child) { + if ($child->isDir()) { + @rmdir($path); + } else { + @unlink($path); + } + } + @rmdir($this->rm); + } elseif (file_exists($this->rm)) { + @unlink($this->rm); + } + } +} +cwd = $cwd; + $cmd = $common_name . "-config"; + if (isset($prefix)) { + $cmd = $prefix . "/bin/" . $cmd; + } + $this->args = ["--with-php-config=$cmd"]; + if ($args) { + $this->args = array_merge($this->args, $args); + } + } + + public function run($verbose = false) { + if ($verbose !== false) { + printf("Running ./configure ...\n"); + } + $pwd = getcwd(); + if (!chdir($this->cwd)) { + throw new Exception; + } + try { + $cmd = new ExecCmd("./configure", $verbose); + $cmd->run($this->args); + } finally { + chdir($pwd); + } + } +} +source = $source; + } else { + $this->source = new PharData($source); + } + } + + /** + * @param bool $verbose + * @return \pharext\Tempdir + */ + public function run($verbose = false) { + if ($verbose) { + printf("Extracting %s ...\n", basename($this->source->getPath())); + } + if ($this->source instanceof Archive) { + return $this->source->extract(); + } + $dest = new Tempdir("extract"); + $this->source->extractTo($dest); + return $dest; + } +} +source = $source; + $this->branch = $branch; + } + + /** + * @param bool $verbose + * @return \pharext\Tempdir + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Fetching %s ...\n", $this->source); + } + $local = new Tempdir("gitclone"); + $cmd = new ExecCmd("git", $verbose); + if (strlen($this->branch)) { + $cmd->run(["clone", "--depth", 1, "--branch", $this->branch, $this->source, $local]); + } else { + $cmd->run(["clone", $this->source, $local]); + } + return $local; + } +} +cwd = $cwd; + $this->sudo = $sudo; + $this->args = $args; + } + + /** + * + * @param bool $verbose + * @throws \pharext\Exception + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Running make"); + if ($this->args) { + foreach ($this->args as $arg) { + printf(" %s", $arg); + } + } + printf(" ...\n"); + } + $pwd = getcwd(); + if (!chdir($this->cwd)) { + throw new Exception; + } + try { + $cmd = new ExecCmd("make", $verbose); + if (isset($this->sudo)) { + $cmd->setSu($this->sudo); + } + $args = $this->args; + if (!$verbose) { + $args = array_merge((array) $args, ["-s"]); + } + $cmd->run($args); + } finally { + chdir($pwd); + } + } +} +source = $source; + } + + private function openArchive($source) { + $hdr = file_get_contents($source, false, null, 0, 3); + if ($hdr === "\x1f\x8b\x08") { + $fd = fopen("compress.zlib://$source", "r"); + } elseif ($hdr === "BZh") { + $fd = fopen("compress.bzip2://$source", "r"); + } else { + $fd = fopen($source, "r"); + } + if (!is_resource($fd)) { + throw new Exception; + } + return $fd; + } + + public function run($verbose = false) { + if ($verbose !== false) { + printf("Fixing up a tarball with global pax header ...\n"); + } + $temp = new Tempfile("paxfix"); + stream_copy_to_stream($this->openArchive($this->source), + $temp->getStream(), -1, 1024); + $temp->closeStream(); + return (new Extract((string) $temp))->run($verbose); + } +}source = $source; + } + + /** + * @param bool $verbose + * @return string sanitized source location + * @throws \pahrext\Exception + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Sanitizing PECL dir ...\n"); + } + $dirs = glob("{$this->source}/*", GLOB_ONLYDIR); + $files = array_diff(glob("{$this->source}/*"), $dirs); + $check = array_reduce($files, function($r, $v) { + return $v && fnmatch("package*.xml", basename($v)); + }, true); + + if (count($dirs) !== 1 || !$check) { + throw new Exception("Does not look like an extracted PECL dir: {$this->source}"); + } + + $dest = current($dirs); + + foreach ($files as $file) { + if ($verbose) { + printf("Moving %s into %s ...\n", basename($file), basename($dest)); + } + if (!rename($file, "$dest/" . basename($file))) { + throw new Exception; + } + } + + return $dest; + } +} +source = $source; + $this->stub = $stub; + $this->meta = $meta; + $this->readonly = $readonly; + } + + /** + * @param bool $verbose + * @return \pharext\Tempname + * @throws \pharext\Exception + */ + public function run($verbose = false) { + /* Phar::compress() and ::convert*() use strtok("."), ugh! + * so, be sure to not use any other dots in the filename + * except for .phar + */ + $temp = new Tempname("", "-pharext.phar"); + + $phar = new Phar($temp); + $phar->startBuffering(); + + if ($this->meta) { + $phar->setMetadata($this->meta); + } + if ($this->stub) { + (new PharStub($phar, $this->stub))->run($verbose); + } + + $phar->buildFromIterator((new Task\BundleGenerator)->run()); + + if ($this->source) { + if ($verbose) { + $bdir = $this->source->getBaseDir(); + $blen = strlen($bdir); + foreach ($this->source as $index => $file) { + if (is_resource($file)) { + printf("Packaging %s ...\n", $index); + $phar[$index] = $file; + } else { + printf("Packaging %s ...\n", $index = trim(substr($file, $blen), "/")); + $phar->addFile($file, $index); + } + } + } else { + $phar->buildFromIterator($this->source, $this->source->getBaseDir()); + } + } + + $phar->stopBuffering(); + + if (!chmod($temp, fileperms($temp) | 0111)) { + throw new Exception; + } + + return $temp; + } +}file = $file; + $this->package = new Phar($file); + $this->encoding = $encoding; + + switch ($encoding) { + case Phar::GZ: + $this->extension = ".gz"; + break; + case Phar::BZ2: + $this->extension = ".bz2"; + break; + } + } + + /** + * @param bool $verbose + * @return string + */ + public function run($verbose = false) { + if ($verbose) { + printf("Compressing %s ...\n", basename($this->package->getPath())); + } + /* stop shebang */ + $stub = $this->package->getStub(); + $phar = $this->package->compress($this->encoding); + $phar->setStub(substr($stub, strpos($stub, "\n")+1)); + return $this->file . $this->extension; + } +} +phar = $phar; + $this->dest = $dest; + $this->name = $name; + } + + /** + * @param bool $verbose + * @return string path to renamed phar + * @throws \pharext\Exception + */ + public function run($verbose = false) { + $extension = substr(strstr($this->phar, "-pharext.phar"), 8); + $name = sprintf("%s/%s.ext%s", $this->dest, $this->name, $extension); + + if ($verbose) { + printf("Renaming %s to %s ...\n", basename($this->phar), basename($name)); + } + + if (!rename($this->phar, $name)) { + throw new Exception; + } + + return $name; + } +} +phar = $phar; + } else { + $this->phar = new Phar($phar); + } + $this->pkey = new Openssl\PrivateKey($pkey, $pass); + } + + /** + * @param bool $verbose + * @return \pharext\Openssl\PrivateKey + */ + public function run($verbose = false) { + if ($verbose) { + printf("Signing %s ...\n", basename($this->phar->getPath())); + } + $this->pkey->sign($this->phar); + return $this->pkey; + } +} +phar = $phar; + if (!file_exists($this->stub = $stub)) { + throw new Exception("File '$stub' does not exist"); + } + } + + /** + * @param bool $verbose + */ + function run($verbose = false) { + if ($verbose) { + printf("Using stub '%s'...\n", basename($this->stub)); + } + $stub = preg_replace_callback('/^#include <([^>]+)>/m', function($includes) { + return file_get_contents($includes[1], true, null, 5); + }, file_get_contents($this->stub)); + if ($this->phar->isCompressed() && substr($stub, 0, 2) === "#!") { + $stub = substr($stub, strpos($stub, "\n")+1); + } + $this->phar->setStub($stub); + } +} +cwd = $cwd; + $cmd = $common_name . "ize"; + if (isset($prefix)) { + $cmd = $prefix . "/bin/" . $cmd; + } + $this->phpize = $cmd; + } + + /** + * @param bool $verbose + * @throws \pharext\Exception + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Running %s ...\n", $this->phpize); + } + $pwd = getcwd(); + if (!chdir($this->cwd)) { + throw new Exception; + } + try { + $cmd = new ExecCmd($this->phpize, $verbose); + $cmd->run(); + } finally { + chdir($pwd); + } + } +} +source = $source; + $this->progress = $progress; + } + + private function createStreamContext() { + $progress = $this->progress; + + /* avoid bytes_max bug of older PHP versions */ + $maxbytes = 0; + return stream_context_create([],["notification" => function($notification, $severity, $message, $code, $bytes_cur, $bytes_max) use($progress, &$maxbytes) { + if ($bytes_max > $maxbytes) { + $maxbytes = $bytes_max; + } + switch ($notification) { + case STREAM_NOTIFY_CONNECT: + $progress(0); + break; + case STREAM_NOTIFY_PROGRESS: + $progress($maxbytes > 0 ? $bytes_cur/$maxbytes : .5); + break; + case STREAM_NOTIFY_COMPLETED: + /* this is sometimes not generated, why? */ + $progress(1); + break; + } + }]); + } + + /** + * @param bool $verbose + * @return \pharext\Task\Tempfile + * @throws \pharext\Exception + */ + public function run($verbose = false) { + if ($verbose !== false) { + printf("Fetching %s ...\n", $this->source); + } + $context = $this->createStreamContext(); + + if (!$remote = fopen($this->source, "r", false, $context)) { + throw new Exception; + } + + $local = new Tempfile("remote"); + if (!stream_copy_to_stream($remote, $local->getStream())) { + throw new Exception; + } + $local->closeStream(); + + /* STREAM_NOTIFY_COMPLETED is not generated, see above */ + call_user_func($this->progress, 1); + + return $local; + } +} +handle = fopen($path, "x"); + } while (!is_resource($this->handle) && $tries++ < 10); + umask($omask); + + if (!is_resource($this->handle)) { + throw new Exception("Could not create temporary file"); + } + + parent::__construct($path); + } + + /** + * Unlink the file + */ + public function __destruct() { + if (is_file($this->getPathname())) { + @unlink($this->getPathname()); + } + } + + /** + * Close the stream + */ + public function closeStream() { + fclose($this->handle); + } + + /** + * Retrieve the stream resource + * @return resource + */ + public function getStream() { + return $this->handle; + } +} +getUser(); + if (!is_dir($temp) && !mkdir($temp, 0700, true)) { + throw new Exception; + } + $this->name = $temp ."/". uniqid($prefix) . $suffix; + } + + private function getUser() { + if (extension_loaded("posix") && function_exists("posix_getpwuid")) { + return posix_getpwuid(posix_getuid())["name"]; + } + return trim(`whoami 2>/dev/null`) + ?: trim(`id -nu 2>/dev/null`) + ?: getenv("USER") + ?: get_current_user(); + } + + /** + * @return string + */ + public function __toString() { + return (string) $this->name; + } +} +args = new Cli\Args([ + ["h", "help", "Display this help", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + ["v", "verbose", "More output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + ["q", "quiet", "Less output", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG], + [null, "signature", "Show pharext signature", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "license", "Show pharext license", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [null, "version", "Show pharext version", + Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT], + [0, "path", "Path to .ext.phar to update", + Cli\Args::REQUIRED|Cli\Args::MULTI], + ]); + } + + /** + * @inheritdoc + * @see \pharext\Command::run() + */ + public function run($argc, array $argv) { + $errs = []; + $prog = array_shift($argv); + foreach ($this->args->parse(--$argc, $argv) as $error) { + $errs[] = $error; + } + + if ($this->args["help"]) { + $this->header(); + $this->help($prog); + exit; + } + + try { + foreach (["signature", "license", "version"] as $opt) { + if ($this->args[$opt]) { + printf("%s\n", $this->metadata($opt)); + exit; + } + } + } catch (\Exception $e) { + $this->error("%s\n", $e->getMessage()); + exit(self::EARGS); + } + + + foreach ($this->args->validate() as $error) { + $errs[] = $error; + } + + if ($errs) { + if (!$this->args["quiet"]) { + $this->header(); + } + foreach ($errs as $err) { + $this->error("%s\n", $err); + } + printf("\n"); + if (!$this->args["quiet"]) { + $this->help($prog); + } + exit(self::EARGS); + } + + foreach ($this->args[0] as $file) { + $info = new SplFileInfo($file); + + while ($info->isLink()) { + $info = new SplFileInfo($info->getLinkTarget()); + } + + if ($info->isFile()) { + if (!$this->updatePackage($info)) { + $this->warn("Cannot upgrade pre-v3 packages\n"); + } + } else { + $this->error("File '%s' does not exist\n", $file); + exit(self::EARGS); + } + } + } + + /** + * Replace the pharext core in an .ext.phar package + * @param string $temp path to temp phar + * @return boolean FALSE if the package is too old (pre-v3) to upgrade + */ + private function replacePharext($temp) { + $phar = new Phar($temp, Phar::CURRENT_AS_SELF); + $phar->startBuffering(); + + if (!$meta = $phar->getMetadata()) { + // don't upgrade pre-v3 packages + return false; + } + + // replace current pharext files + $core = (new Task\BundleGenerator)->run($this->verbosity()); + $phar->buildFromIterator($core); + $stub = __DIR__."/../pharext_installer.php"; + (new Task\PharStub($phar, $stub))->run($this->verbosity()); + + // check dependencies + foreach ($phar as $info) { + if (fnmatch("*.ext.phar*", $info->getBasename())) { + $this->updatePackage($info, $phar); + } + } + + $phar->stopBuffering(); + + $phar->setMetadata([ + "version" => Metadata::version(), + "header" => Metadata::header(), + ] + $meta); + + $this->info("Updated pharext version from '%s' to '%s'\n", + isset($meta["version"]) ? $meta["version"] : "(unknown)", + $phar->getMetadata()["version"]); + + return true; + } + + /** + * Update an .ext.phar package to the current pharext version + * @param SplFileInfo $file + * @param Phar $phar the parent phar containing $file as dependency + * @return boolean FALSE if the package is too old (pre-v3) to upgrade + * @throws Exception + */ + private function updatePackage(SplFileInfo $file, Phar $phar = null) { + $this->info("Updating pharext core in '%s'...\n", basename($file)); + + $temp = new Tempname("update", substr(strstr($file, ".ext.phar"), 4)); + + if (!copy($file->getPathname(), $temp)) { + throw new Exception; + } + if (!chmod($temp, $file->getPerms())) { + throw new Exception; + } + + if (!$this->replacePharext($temp)) { + return false; + } + + if ($phar) { + $phar->addFile($temp, $file); + } elseif (!rename($temp, $file->getPathname())) { + throw new Exception; + } + + return true; + } +} +#!/usr/bin/env php + +#include +#include +#include +#include + +namespace pharext; + +if (extension_loaded("Phar")) { + \Phar::interceptFileFuncs(); + \Phar::mapPhar(); + $phardir = "phar://".__FILE__; +} else { + $archive = new Archive(__FILE__); + $phardir = $archive->extract(); +} + +set_include_path("$phardir:". get_include_path()); + +$installer = new Installer(); +$installer->run($argc, $argv); + +__HALT_COMPILER(); +#!/usr/bin/php -dphar.readonly=0 +run($argc, $argv); + +__HALT_COMPILER(); +#!/usr/bin/php -dphar.readonly=0 +run($argc, $argv); + +__HALT_COMPILER(); +package.xml merge=touch +php_raphf.h merge=touch + +# / +*~ +/*.tgz +/.deps +/*.lo +/*.la +/config.[^mw]* +/configure* +/lib* +/ac*.m4 +/ltmain.sh +/install-sh +/Make* +/mk* +/missing +/.libs +/build +/include +/modules +/autom4te* +/.dep.inc +run-tests.php +raphf +Michael Wallner +# Doxyfile 1.8.9.1 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = "Resource and persistent handle factory API" +PROJECT_NUMBER = +PROJECT_BRIEF = "A facility to manage possibly persistent resources with a comprehensible API. Provides simliar functionality like the zend_list API, but with more flexiblity and freedom." +PROJECT_LOGO = raphf.png +OUTPUT_DIRECTORY = +CREATE_SUBDIRS = NO +ALLOW_UNICODE_NAMES = NO +OUTPUT_LANGUAGE = English +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = YES +QT_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 4 +ALIASES = +TCL_SUBST = +OPTIMIZE_OUTPUT_FOR_C = YES +OPTIMIZE_OUTPUT_JAVA = NO +OPTIMIZE_FOR_FORTRAN = NO +OPTIMIZE_OUTPUT_VHDL = NO +EXTENSION_MAPPING = +MARKDOWN_SUPPORT = YES +AUTOLINK_SUPPORT = YES +BUILTIN_STL_SUPPORT = NO +CPP_CLI_SUPPORT = NO +SIP_SUPPORT = NO +IDL_PROPERTY_SUPPORT = YES +DISTRIBUTE_GROUP_DOC = NO +SUBGROUPING = YES +INLINE_GROUPED_CLASSES = NO +INLINE_SIMPLE_STRUCTS = YES +TYPEDEF_HIDES_STRUCT = NO +LOOKUP_CACHE_SIZE = 0 +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = YES +EXTRACT_PRIVATE = NO +EXTRACT_PACKAGE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = NO +EXTRACT_LOCAL_METHODS = NO +EXTRACT_ANON_NSPACES = NO +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +HIDE_COMPOUND_REFERENCE= NO +SHOW_INCLUDE_FILES = YES +SHOW_GROUPED_MEMB_INC = NO +FORCE_LOCAL_INCLUDES = NO +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_MEMBERS_CTORS_1ST = NO +SORT_GROUP_NAMES = NO +SORT_BY_SCOPE_NAME = NO +STRICT_PROTO_MATCHING = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +SHOW_FILES = YES +SHOW_NAMESPACES = YES +FILE_VERSION_FILTER = +LAYOUT_FILE = +CITE_BIB_FILES = +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = NO +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = php_raphf.h +INPUT_ENCODING = UTF-8 +FILE_PATTERNS = +RECURSIVE = NO +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXCLUDE_SYMBOLS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +FILTER_SOURCE_PATTERNS = +USE_MDFILE_AS_MAINPAGE = +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = NO +REFERENCES_LINK_SOURCE = YES +SOURCE_TOOLTIPS = YES +USE_HTAGS = NO +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = . +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_EXTRA_STYLESHEET = +HTML_EXTRA_FILES = +HTML_COLORSTYLE_HUE = 220 +HTML_COLORSTYLE_SAT = 100 +HTML_COLORSTYLE_GAMMA = 80 +HTML_TIMESTAMP = NO +HTML_DYNAMIC_SECTIONS = NO +HTML_INDEX_NUM_ENTRIES = 100 +GENERATE_DOCSET = NO +DOCSET_FEEDNAME = "Doxygen generated docs" +DOCSET_BUNDLE_ID = org.doxygen.Project +DOCSET_PUBLISHER_ID = org.doxygen.Publisher +DOCSET_PUBLISHER_NAME = Publisher +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +CHM_INDEX_ENCODING = +BINARY_TOC = NO +TOC_EXPAND = NO +GENERATE_QHP = NO +QCH_FILE = +QHP_NAMESPACE = org.doxygen.Project +QHP_VIRTUAL_FOLDER = doc +QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = +QHG_LOCATION = +GENERATE_ECLIPSEHELP = NO +ECLIPSE_DOC_ID = org.doxygen.Project +DISABLE_INDEX = NO +GENERATE_TREEVIEW = YES +ENUM_VALUES_PER_LINE = 4 +TREEVIEW_WIDTH = 250 +EXT_LINKS_IN_WINDOW = NO +FORMULA_FONTSIZE = 10 +FORMULA_TRANSPARENT = YES +USE_MATHJAX = NO +MATHJAX_FORMAT = HTML-CSS +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest +MATHJAX_EXTENSIONS = +MATHJAX_CODEFILE = +SEARCHENGINE = YES +SERVER_BASED_SEARCH = NO +EXTERNAL_SEARCH = NO +SEARCHENGINE_URL = +SEARCHDATA_FILE = searchdata.xml +EXTERNAL_SEARCH_ID = +EXTRA_SEARCH_MAPPINGS = +#--------------------------------------------------------------------------- +# Configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4 +EXTRA_PACKAGES = +LATEX_HEADER = +LATEX_FOOTER = +LATEX_EXTRA_STYLESHEET = +LATEX_EXTRA_FILES = +PDF_HYPERLINKS = YES +USE_PDFLATEX = YES +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +LATEX_SOURCE_CODE = NO +LATEX_BIB_STYLE = plain +#--------------------------------------------------------------------------- +# Configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +RTF_SOURCE_CODE = NO +#--------------------------------------------------------------------------- +# Configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_SUBDIR = +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# Configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# Configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- +GENERATE_DOCBOOK = NO +DOCBOOK_OUTPUT = docbook +DOCBOOK_PROGRAMLISTING = NO +#--------------------------------------------------------------------------- +# Configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# Configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = DOXYGEN \ + TSRMLS_C= \ + TSRMLS_D= \ + TSRMLS_CC= \ + TSRMLS_DC= \ + PHP_RAPHF_API= +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration options related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +EXTERNAL_PAGES = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +MSCGEN_PATH = +DIA_PATH = +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = YES +DOT_NUM_THREADS = 0 +DOT_FONTNAME = Helvetica +DOT_FONTSIZE = 10 +DOT_FONTPATH = +CLASS_GRAPH = NO +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +UML_LIMIT_NUM_FIELDS = 10 +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = YES +CALLER_GRAPH = YES +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DOT_IMAGE_FORMAT = png +INTERACTIVE_SVG = NO +DOT_PATH = +DOTFILE_DIRS = +MSCFILE_DIRS = +DIAFILE_DIRS = +PLANTUML_JAR_PATH = +PLANTUML_INCLUDE_PATH = +DOT_GRAPH_MAX_NODES = 50 +MAX_DOT_GRAPH_DEPTH = 0 +DOT_TRANSPARENT = NO +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +Copyright (c) 2013, Michael Wallner . +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# pecl/raphf + +## About: + +The "Resource and Persistent Handle Factory" extension provides facilities to manage those in a convenient manner. + +## Installation: + +This extension is hosted at [PECL](http://pecl.php.net) and can be installed with [PEAR](http://pear.php.net)'s pecl command: + + # pecl install raphf + +Also, watch out for self-installing [pharext](https://github.com/m6w6/pharext) packages attached to [releases](https://github.com/m6w6/ext-raphf/releases). + + +## INI Directives: + +* raphf.persistent_handle.limit = -1 + The per process/thread persistent handle limit. + +## Internals: + +> ***NOTE:*** + This extension mostly only provides infrastructure for other extensions. + See the [API docs here](http://m6w6.github.io/ext-raphf/). + +## Documentation: + +Userland documentation can be found at https://mdref.m6w6.name/raphf +* TTL +PHP_ARG_ENABLE(raphf, whether to enable raphf support, +[ --enable-raphf Enable resource and persistent handles factory support]) + +if test "$PHP_RAPHF" != "no"; then + PHP_INSTALL_HEADERS(ext/raphf, php_raphf.h php_raphf_api.h) + PHP_NEW_EXTENSION(raphf, php_raphf.c, $ext_shared) +fi + + +ARG_ENABLE("raphf", "for raphf support", "no"); + +if (PHP_RAPHF == "yes") { + EXTENSION("raphf", "php_raphf.c"); + + AC_DEFINE("HAVE_RAPHF", 1); + PHP_INSTALL_HEADERS("ext/raphf", "php_raphf.h"); +} + + + raphf + pecl.php.net + Resource and persistent handles factory + A reusable split-off of pecl_http's persistent handle and resource factory API. + + Michael Wallner + mike + mike@php.net + yes + + 2015-07-28 + + 2.0.0-dev + 2.0.0 + + + stable + stable + + BSD, revised + + + + + + + + + + + + + + + + + + + + + + + 7.0.0 + + + 1.4.0 + + + + raphf + + + +/* + +--------------------------------------------------------------------+ + | PECL :: raphf | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2013, Michael Wallner | + +--------------------------------------------------------------------+ +*/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "php.h" +#include "php_ini.h" +#include "ext/standard/info.h" +#include "php_raphf.h" + +#ifndef PHP_RAPHF_TEST +# define PHP_RAPHF_TEST 0 +#endif + +struct php_persistent_handle_globals { + ulong limit; + HashTable hash; +}; + +ZEND_BEGIN_MODULE_GLOBALS(raphf) + struct php_persistent_handle_globals persistent_handle; +ZEND_END_MODULE_GLOBALS(raphf) + +#ifdef ZTS +# define PHP_RAPHF_G ((zend_raphf_globals *) \ + (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(raphf_globals_id)]) +#else +# define PHP_RAPHF_G (&raphf_globals) +#endif + +ZEND_DECLARE_MODULE_GLOBALS(raphf) + +#ifndef PHP_RAPHF_DEBUG_PHANDLES +# define PHP_RAPHF_DEBUG_PHANDLES 0 +#endif +#if PHP_RAPHF_DEBUG_PHANDLES +# undef inline +# define inline +#endif + +php_resource_factory_t *php_resource_factory_init(php_resource_factory_t *f, + php_resource_factory_ops_t *fops, void *data, void (*dtor)(void *data)) +{ + if (!f) { + f = emalloc(sizeof(*f)); + } + memset(f, 0, sizeof(*f)); + + memcpy(&f->fops, fops, sizeof(*fops)); + + f->data = data; + f->dtor = dtor; + + f->refcount = 1; + + return f; +} + +unsigned php_resource_factory_addref(php_resource_factory_t *rf) +{ + return ++rf->refcount; +} + +void php_resource_factory_dtor(php_resource_factory_t *f) +{ + if (!--f->refcount) { + if (f->dtor) { + f->dtor(f->data); + } + } +} + +void php_resource_factory_free(php_resource_factory_t **f) +{ + if (*f) { + php_resource_factory_dtor(*f); + if (!(*f)->refcount) { + efree(*f); + *f = NULL; + } + } +} + +void *php_resource_factory_handle_ctor(php_resource_factory_t *f, void *init_arg) +{ + if (f->fops.ctor) { + return f->fops.ctor(f->data, init_arg); + } + return NULL; +} + +void *php_resource_factory_handle_copy(php_resource_factory_t *f, void *handle) +{ + if (f->fops.copy) { + return f->fops.copy(f->data, handle); + } + return NULL; +} + +void php_resource_factory_handle_dtor(php_resource_factory_t *f, void *handle) +{ + if (f->fops.dtor) { + f->fops.dtor(f->data, handle); + } +} + +php_resource_factory_t *php_persistent_handle_resource_factory_init( + php_resource_factory_t *a, php_persistent_handle_factory_t *pf) +{ + return php_resource_factory_init(a, + php_persistent_handle_get_resource_factory_ops(), pf, + (void(*)(void*)) php_persistent_handle_abandon); +} + +zend_bool php_resource_factory_is_persistent(php_resource_factory_t *a) +{ + return a->dtor == (void(*)(void *)) php_persistent_handle_abandon; +} + +static inline php_persistent_handle_list_t *php_persistent_handle_list_init( + php_persistent_handle_list_t *list) +{ + if (!list) { + list = pemalloc(sizeof(*list), 1); + } + list->used = 0; + zend_hash_init(&list->free, 0, NULL, NULL, 1); + + return list; +} + +static int php_persistent_handle_apply_stat(zval *p, int argc, va_list argv, + zend_hash_key *key) +{ + php_persistent_handle_list_t *list = Z_PTR_P(p); + zval zsubentry, *zentry = va_arg(argv, zval *); + + array_init(&zsubentry); + add_assoc_long_ex(&zsubentry, ZEND_STRL("used"), list->used); + add_assoc_long_ex(&zsubentry, ZEND_STRL("free"), + zend_hash_num_elements(&list->free)); + if (key->key) { + add_assoc_zval_ex(zentry, key->key->val, key->key->len, &zsubentry); + } else { + add_index_zval(zentry, key->h, &zsubentry); + } + return ZEND_HASH_APPLY_KEEP; +} + +static int php_persistent_handle_apply_statall(zval *p, int argc, va_list argv, + zend_hash_key *key) +{ + php_persistent_handle_provider_t *provider = Z_PTR_P(p); + HashTable *ht = va_arg(argv, HashTable *); + zval zentry; + + array_init(&zentry); + + zend_hash_apply_with_arguments(&provider->list.free, + php_persistent_handle_apply_stat, 1, &zentry); + + if (key->key) { + zend_hash_update(ht, key->key, &zentry); + } else { + zend_hash_index_update(ht, key->h, &zentry); + } + + return ZEND_HASH_APPLY_KEEP; +} + +static int php_persistent_handle_apply_cleanup_ex(zval *p, void *arg) +{ + php_resource_factory_t *rf = arg; + void *handle = Z_PTR_P(p); + +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "DESTROY: %p\n", handle); +#endif + php_resource_factory_handle_dtor(rf, handle); + return ZEND_HASH_APPLY_REMOVE; +} + +static int php_persistent_handle_apply_cleanup(zval *p, void *arg) +{ + php_resource_factory_t *rf = arg; + php_persistent_handle_list_t *list = Z_PTR_P(p); + + zend_hash_apply_with_argument(&list->free, + php_persistent_handle_apply_cleanup_ex, rf); + if (list->used) { + return ZEND_HASH_APPLY_KEEP; + } + zend_hash_destroy(&list->free); +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "LSTFREE: %p\n", list); +#endif + pefree(list, 1); + return ZEND_HASH_APPLY_REMOVE; +} + +static inline void php_persistent_handle_list_dtor( + php_persistent_handle_list_t *list, + php_persistent_handle_provider_t *provider) +{ +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "LSTDTOR: %p\n", list); +#endif + zend_hash_apply_with_argument(&list->free, + php_persistent_handle_apply_cleanup_ex, &provider->rf); + zend_hash_destroy(&list->free); +} + +static inline void php_persistent_handle_list_free( + php_persistent_handle_list_t **list, + php_persistent_handle_provider_t *provider) +{ + php_persistent_handle_list_dtor(*list, provider); +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "LSTFREE: %p\n", *list); +#endif + pefree(*list, 1); + *list = NULL; +} + +static int php_persistent_handle_list_apply_dtor(zval *p, void *provider) +{ + php_persistent_handle_list_t *list = Z_PTR_P(p); + + php_persistent_handle_list_free(&list, provider ); + ZVAL_PTR(p, NULL); + return ZEND_HASH_APPLY_REMOVE; +} + +static inline php_persistent_handle_list_t *php_persistent_handle_list_find( + php_persistent_handle_provider_t *provider, zend_string *ident) +{ + php_persistent_handle_list_t *list; + zval *zlist = zend_symtable_find(&provider->list.free, ident); + + if (zlist && (list = Z_PTR_P(zlist))) { +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "LSTFIND: %p\n", list); +#endif + return list; + } + + if ((list = php_persistent_handle_list_init(NULL))) { + zval p, *rv; + zend_string *id; + + ZVAL_PTR(&p, list); + id = zend_string_init(ident->val, ident->len, 1); + rv = zend_symtable_update(&provider->list.free, id, &p); + zend_string_release(id); + + if (rv) { +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "LSTFIND: %p (new)\n", list); +#endif + return list; + } + php_persistent_handle_list_free(&list, provider); + } + + return NULL; +} + +static int php_persistent_handle_apply_cleanup_all(zval *p, int argc, + va_list argv, zend_hash_key *key) +{ + php_persistent_handle_provider_t *provider = Z_PTR_P(p); + zend_string *ident = va_arg(argv, zend_string *); + php_persistent_handle_list_t *list; + + if (ident && ident->len) { + if ((list = php_persistent_handle_list_find(provider, ident))) { + zend_hash_apply_with_argument(&list->free, + php_persistent_handle_apply_cleanup_ex, + &provider->rf); + } + } else { + zend_hash_apply_with_argument(&provider->list.free, + php_persistent_handle_apply_cleanup, &provider->rf); + } + + return ZEND_HASH_APPLY_KEEP; +} + +static void php_persistent_handle_hash_dtor(zval *p) +{ + php_persistent_handle_provider_t *provider = Z_PTR_P(p); + + zend_hash_apply_with_argument(&provider->list.free, + php_persistent_handle_list_apply_dtor, provider); + zend_hash_destroy(&provider->list.free); + php_resource_factory_dtor(&provider->rf); + pefree(provider, 1); +} + +ZEND_RESULT_CODE php_persistent_handle_provide(zend_string *name, + php_resource_factory_ops_t *fops, void *data, void (*dtor)(void *)) +{ + php_persistent_handle_provider_t *provider = pemalloc(sizeof(*provider), 1); + + if (php_persistent_handle_list_init(&provider->list)) { + if (php_resource_factory_init(&provider->rf, fops, data, dtor)) { + zval p, *rv; + zend_string *ns; + +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "PROVIDE: %p %s\n", PHP_RAPHF_G, name_str); +#endif + + ZVAL_PTR(&p, provider); + ns = zend_string_init(name->val, name->len, 1); + rv = zend_symtable_update(&PHP_RAPHF_G->persistent_handle.hash, ns, &p); + zend_string_release(ns); + + if (rv) { + return SUCCESS; + } + php_resource_factory_dtor(&provider->rf); + } + } + + return FAILURE; +} + + +php_persistent_handle_factory_t *php_persistent_handle_concede( + php_persistent_handle_factory_t *a, + zend_string *name, zend_string *ident, + php_persistent_handle_wakeup_t wakeup, + php_persistent_handle_retire_t retire) +{ + zval *zprovider = zend_symtable_find(&PHP_RAPHF_G->persistent_handle.hash, name); + + if (zprovider) { + zend_bool free_a = 0; + + if ((free_a = !a)) { + a = emalloc(sizeof(*a)); + } + memset(a, 0, sizeof(*a)); + + a->provider = Z_PTR_P(zprovider); + a->ident = zend_string_copy(ident); + a->wakeup = wakeup; + a->retire = retire; + a->free_on_abandon = free_a; + } else { + a = NULL; + } + +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "CONCEDE: %p %p (%s) (%s)\n", PHP_RAPHF_G, + a ? a->provider : NULL, name->val, ident->val); +#endif + + return a; +} + +void php_persistent_handle_abandon(php_persistent_handle_factory_t *a) +{ + zend_bool f = a->free_on_abandon; + +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "ABANDON: %p\n", a->provider); +#endif + + zend_string_release(a->ident); + memset(a, 0, sizeof(*a)); + if (f) { + efree(a); + } +} + +void *php_persistent_handle_acquire(php_persistent_handle_factory_t *a, void *init_arg) +{ + int key; + zval *p; + zend_ulong index; + void *handle = NULL; + php_persistent_handle_list_t *list; + + list = php_persistent_handle_list_find(a->provider, a->ident); + if (list) { + zend_hash_internal_pointer_end(&list->free); + key = zend_hash_get_current_key(&list->free, NULL, &index); + p = zend_hash_get_current_data(&list->free); + if (p && HASH_KEY_NON_EXISTENT != key) { + handle = Z_PTR_P(p); + if (a->wakeup) { + a->wakeup(a, &handle); + } + zend_hash_index_del(&list->free, index); + } else { + handle = php_resource_factory_handle_ctor(&a->provider->rf, init_arg); + } +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "CREATED: %p\n", handle); +#endif + if (handle) { + ++a->provider->list.used; + ++list->used; + } + } + + return handle; +} + +void *php_persistent_handle_accrete(php_persistent_handle_factory_t *a, void *handle) +{ + void *new_handle = NULL; + php_persistent_handle_list_t *list; + + new_handle = php_resource_factory_handle_copy(&a->provider->rf, handle); + if (handle) { + list = php_persistent_handle_list_find(a->provider, a->ident); + if (list) { + ++list->used; + } + ++a->provider->list.used; + } + + return new_handle; +} + +void php_persistent_handle_release(php_persistent_handle_factory_t *a, void *handle) +{ + php_persistent_handle_list_t *list; + + list = php_persistent_handle_list_find(a->provider, a->ident); + if (list) { + if (a->provider->list.used >= PHP_RAPHF_G->persistent_handle.limit) { +#if PHP_RAPHF_DEBUG_PHANDLES + fprintf(stderr, "DESTROY: %p\n", handle); +#endif + php_resource_factory_handle_dtor(&a->provider->rf, handle); + } else { + if (a->retire) { + a->retire(a, &handle); + } + zend_hash_next_index_insert_ptr(&list->free, handle); + } + + --a->provider->list.used; + --list->used; + } +} + +void php_persistent_handle_cleanup(zend_string *name, zend_string *ident) +{ + php_persistent_handle_provider_t *provider; + php_persistent_handle_list_t *list; + + if (name) { + zval *zprovider = zend_symtable_find(&PHP_RAPHF_G->persistent_handle.hash, + name); + + if (zprovider && (provider = Z_PTR_P(zprovider))) { + if (ident) { + list = php_persistent_handle_list_find(provider, ident); + if (list) { + zend_hash_apply_with_argument(&list->free, + php_persistent_handle_apply_cleanup_ex, + &provider->rf); + } + } else { + zend_hash_apply_with_argument(&provider->list.free, + php_persistent_handle_apply_cleanup, + &provider->rf); + } + } + } else { + zend_hash_apply_with_arguments( + &PHP_RAPHF_G->persistent_handle.hash, + php_persistent_handle_apply_cleanup_all, 1, ident); + } +} + +HashTable *php_persistent_handle_statall(HashTable *ht) +{ + if (zend_hash_num_elements(&PHP_RAPHF_G->persistent_handle.hash)) { + if (!ht) { + ALLOC_HASHTABLE(ht); + zend_hash_init(ht, 0, NULL, ZVAL_PTR_DTOR, 0); + } + zend_hash_apply_with_arguments( + &PHP_RAPHF_G->persistent_handle.hash, + php_persistent_handle_apply_statall, 1, ht); + } else if (ht) { + ht = NULL; + } + + return ht; +} + +static php_resource_factory_ops_t php_persistent_handle_resource_factory_ops = { + (php_resource_factory_handle_ctor_t) php_persistent_handle_acquire, + (php_resource_factory_handle_copy_t) php_persistent_handle_accrete, + (php_resource_factory_handle_dtor_t) php_persistent_handle_release +}; + +php_resource_factory_ops_t *php_persistent_handle_get_resource_factory_ops(void) +{ + return &php_persistent_handle_resource_factory_ops; +} + +ZEND_BEGIN_ARG_INFO_EX(ai_raphf_stat_persistent_handles, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_FUNCTION(raphf_stat_persistent_handles) +{ + if (SUCCESS == zend_parse_parameters_none()) { + object_init(return_value); + if (php_persistent_handle_statall(HASH_OF(return_value))) { + return; + } + zval_dtor(return_value); + } + RETURN_FALSE; +} + +ZEND_BEGIN_ARG_INFO_EX(ai_raphf_clean_persistent_handles, 0, 0, 0) + ZEND_ARG_INFO(0, name) + ZEND_ARG_INFO(0, ident) +ZEND_END_ARG_INFO(); +static PHP_FUNCTION(raphf_clean_persistent_handles) +{ + zend_string *name = NULL, *ident = NULL; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|S!S!", &name, &ident)) { + php_persistent_handle_cleanup(name, ident); + } +} + +#if PHP_RAPHF_TEST +# include "php_raphf_test.c" +#endif + +static const zend_function_entry raphf_functions[] = { + ZEND_NS_FENTRY("raphf", stat_persistent_handles, + ZEND_FN(raphf_stat_persistent_handles), + ai_raphf_stat_persistent_handles, 0) + ZEND_NS_FENTRY("raphf", clean_persistent_handles, + ZEND_FN(raphf_clean_persistent_handles), + ai_raphf_clean_persistent_handles, 0) +#if PHP_RAPHF_TEST + ZEND_NS_FENTRY("raphf", provide, ZEND_FN(raphf_provide), NULL, 0) + ZEND_NS_FENTRY("raphf", conceal, ZEND_FN(raphf_conceal), NULL, 0) + ZEND_NS_FENTRY("raphf", concede, ZEND_FN(raphf_concede), NULL, 0) + ZEND_NS_FENTRY("raphf", dispute, ZEND_FN(raphf_dispute), NULL, 0) + ZEND_NS_FENTRY("raphf", handle_ctor, ZEND_FN(raphf_handle_ctor), NULL, 0) + ZEND_NS_FENTRY("raphf", handle_copy, ZEND_FN(raphf_handle_copy), NULL, 0) + ZEND_NS_FENTRY("raphf", handle_dtor, ZEND_FN(raphf_handle_dtor), NULL, 0) +#endif + {0} +}; + +PHP_INI_BEGIN() + STD_PHP_INI_ENTRY("raphf.persistent_handle.limit", "-1", PHP_INI_SYSTEM, + OnUpdateLong, persistent_handle.limit, zend_raphf_globals, + raphf_globals) +PHP_INI_END() + +static HashTable *php_persistent_handles_global_hash; + +static PHP_GINIT_FUNCTION(raphf) +{ + raphf_globals->persistent_handle.limit = -1; + + zend_hash_init(&raphf_globals->persistent_handle.hash, 0, NULL, + php_persistent_handle_hash_dtor, 1); + if (php_persistent_handles_global_hash) { + zend_hash_copy(&raphf_globals->persistent_handle.hash, + php_persistent_handles_global_hash, NULL); + } +} + +static PHP_GSHUTDOWN_FUNCTION(raphf) +{ + zend_hash_destroy(&raphf_globals->persistent_handle.hash); +} + +PHP_MINIT_FUNCTION(raphf) +{ + php_persistent_handles_global_hash = &PHP_RAPHF_G->persistent_handle.hash; + +#if PHP_RAPHF_TEST + PHP_MINIT(raphf_test)(INIT_FUNC_ARGS_PASSTHRU); +#endif + + REGISTER_INI_ENTRIES(); + return SUCCESS; +} + +PHP_MSHUTDOWN_FUNCTION(raphf) +{ +#if PHP_RAPHF_TEST + PHP_MSHUTDOWN(raphf_test)(SHUTDOWN_FUNC_ARGS_PASSTHRU); +#endif + + UNREGISTER_INI_ENTRIES(); + php_persistent_handles_global_hash = NULL; + return SUCCESS; +} + +static int php_persistent_handle_apply_info_ex(zval *p, int argc, + va_list argv, zend_hash_key *key) +{ + php_persistent_handle_list_t *list = Z_PTR_P(p); + zend_hash_key *super_key = va_arg(argv, zend_hash_key *); + char used[21], free[21]; + + slprintf(used, sizeof(used), "%u", list->used); + slprintf(free, sizeof(free), "%d", zend_hash_num_elements(&list->free)); + + php_info_print_table_row(4, super_key->key->val, key->key->val, used, free); + + return ZEND_HASH_APPLY_KEEP; +} + +static int php_persistent_handle_apply_info(zval *p, int argc, + va_list argv, zend_hash_key *key) +{ + php_persistent_handle_provider_t *provider = Z_PTR_P(p); + + zend_hash_apply_with_arguments(&provider->list.free, + php_persistent_handle_apply_info_ex, 1, key); + + return ZEND_HASH_APPLY_KEEP; +} + +PHP_MINFO_FUNCTION(raphf) +{ + php_info_print_table_start(); + php_info_print_table_header(2, + "Resource and persistent handle factory support", "enabled"); + php_info_print_table_row(2, "Extension version", PHP_RAPHF_VERSION); + php_info_print_table_end(); + + php_info_print_table_start(); + php_info_print_table_colspan_header(4, "Persistent handles in this " +#ifdef ZTS + "thread" +#else + "process" +#endif + ); + php_info_print_table_header(4, "Provider", "Ident", "Used", "Free"); + zend_hash_apply_with_arguments( + &PHP_RAPHF_G->persistent_handle.hash, + php_persistent_handle_apply_info, 0); + php_info_print_table_end(); + + DISPLAY_INI_ENTRIES(); +} + +zend_module_entry raphf_module_entry = { + STANDARD_MODULE_HEADER, + "raphf", + raphf_functions, + PHP_MINIT(raphf), + PHP_MSHUTDOWN(raphf), + NULL, + NULL, + PHP_MINFO(raphf), + PHP_RAPHF_VERSION, + ZEND_MODULE_GLOBALS(raphf), + PHP_GINIT(raphf), + PHP_GSHUTDOWN(raphf), + NULL, + STANDARD_MODULE_PROPERTIES_EX +}; +/* }}} */ + +#ifdef COMPILE_DL_RAPHF +ZEND_GET_MODULE(raphf) +#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 + */ +/* + +--------------------------------------------------------------------+ + | PECL :: raphf | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2013, Michael Wallner | + +--------------------------------------------------------------------+ +*/ + +#ifndef PHP_RAPHF_H +#define PHP_RAPHF_H + +extern zend_module_entry raphf_module_entry; +#define phpext_raphf_ptr &raphf_module_entry + +#define PHP_RAPHF_VERSION "2.0.0dev" + +#ifdef PHP_WIN32 +# define PHP_RAPHF_API __declspec(dllexport) +#elif defined(__GNUC__) && __GNUC__ >= 4 +# define PHP_RAPHF_API extern __attribute__ ((visibility("default"))) +#else +# define PHP_RAPHF_API extern +#endif + +#ifdef ZTS +# include "TSRM.h" +#endif + +#include "php_raphf_api.h" + +#endif /* PHP_RAPHF_H */ + + +/* + * 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 + */ +/* + +--------------------------------------------------------------------+ + | PECL :: raphf | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2013, Michael Wallner | + +--------------------------------------------------------------------+ +*/ + +#ifndef PHP_RAPHF_API_H +#define PHP_RAPHF_API_H + +#include "php_raphf.h" + +/** + * A resource constructor. + * + * @param opaque is the \a data from php_persistent_handle_provide() + * @param init_arg is the \a init_arg from php_resource_factory_init() + * @return the created (persistent) handle + */ +typedef void *(*php_resource_factory_handle_ctor_t)(void *opaque, void *init_arg); + +/** + * The copy constructor of a resource. + * + * @param opaque the factory's data + * @param handle the (persistent) handle to copy + */ +typedef void *(*php_resource_factory_handle_copy_t)(void *opaque, void *handle); + +/** + * The destructor of a resource. + * + * @param opaque the factory's data + * @param handle the handle to destroy + */ +typedef void (*php_resource_factory_handle_dtor_t)(void *opaque, void *handle); + +/** + * The resource ops consisting of a ctor, a copy ctor and a dtor. + * + * Define this ops and register them with php_persistent_handle_provide() + * in MINIT. + */ +typedef struct php_resource_factory_ops { + /** The resource constructor */ + php_resource_factory_handle_ctor_t ctor; + /** The resource's copy constructor */ + php_resource_factory_handle_copy_t copy; + /** The resource's destructor */ + php_resource_factory_handle_dtor_t dtor; +} php_resource_factory_ops_t; + +/** + * The resource factory. + */ +typedef struct php_resource_factory { + /** The resource ops */ + php_resource_factory_ops_t fops; + /** Opaque user data */ + void *data; + /** User data destructor */ + void (*dtor)(void *data); + /** How often this factory is referenced */ + unsigned refcount; +} php_resource_factory_t; + +/** + * Initialize a resource factory. + * + * If you register a \a dtor for a resource factory used with a persistent + * handle provider, be sure to call php_persistent_handle_cleanup() for your + * registered provider in MSHUTDOWN, else the dtor will point to no longer + * available memory if the extension has already been unloaded. + * + * @param f the factory to initialize; if NULL allocated on the heap + * @param fops the resource ops to assign to the factory + * @param data opaque user data; may be NULL + * @param dtor a destructor for the data; may be NULL + * @return \a f or an allocated resource factory + */ +PHP_RAPHF_API php_resource_factory_t *php_resource_factory_init( + php_resource_factory_t *f, php_resource_factory_ops_t *fops, void *data, + void (*dtor)(void *data)); + +/** + * Increase the refcount of the resource factory. + * + * @param rf the resource factory + * @return the new refcount + */ +PHP_RAPHF_API unsigned php_resource_factory_addref(php_resource_factory_t *rf); + +/** + * Destroy the resource factory. + * + * If the factory's refcount reaches 0, the \a dtor for \a data is called. + * + * @param f the resource factory + */ +PHP_RAPHF_API void php_resource_factory_dtor(php_resource_factory_t *f); + +/** + * Destroy and free the resource factory. + * + * Calls php_resource_factory_dtor() and frees \a f if the factory's refcount + * reached 0. + * + * @param f the resource factory + */ +PHP_RAPHF_API void php_resource_factory_free(php_resource_factory_t **f); + +/** + * Construct a resource by the resource factory \a f + * + * @param f the resource factory + * @param init_arg for the resource constructor + * @return the new resource + */ +PHP_RAPHF_API void *php_resource_factory_handle_ctor(php_resource_factory_t *f, + void *init_arg); + +/** + * Create a copy of the resource \a handle + * + * @param f the resource factory + * @param handle the resource to copy + * @return the copy + */ +PHP_RAPHF_API void *php_resource_factory_handle_copy(php_resource_factory_t *f, + void *handle); + +/** + * Destroy (and free) the resource + * + * @param f the resource factory + * @param handle the resource to destroy + */ +PHP_RAPHF_API void php_resource_factory_handle_dtor(php_resource_factory_t *f, + void *handle); + +/** + * Persistent handles storage + */ +typedef struct php_persistent_handle_list { + /** Storage of free resources */ + HashTable free; + /** Count of acquired resources */ + ulong used; +} php_persistent_handle_list_t; + +/** + * Definition of a persistent handle provider. + * Holds a resource factory an a persistent handle list. + */ +typedef struct php_persistent_handle_provider { + /** + * The list of free handles. + * Hash of "ident" => array(handles) entries. Persistent handles are + * acquired out of this list. + */ + php_persistent_handle_list_t list; + + /** + * The resource factory. + * New handles are created by this factory. + */ + php_resource_factory_t rf; +} php_persistent_handle_provider_t; + +typedef struct php_persistent_handle_factory php_persistent_handle_factory_t; + +/** + * Wakeup the persistent handle on re-acquisition. + */ +typedef void (*php_persistent_handle_wakeup_t)( + php_persistent_handle_factory_t *f, void **handle); +/** + * Retire the persistent handle on release. + */ +typedef void (*php_persistent_handle_retire_t)( + php_persistent_handle_factory_t *f, void **handle); + +/** + * Definition of a persistent handle factory. + * + * php_persistent_handle_concede() will return a pointer to a + * php_persistent_handle_factory if a provider for the \a name has + * been registered with php_persistent_handle_provide(). + */ +struct php_persistent_handle_factory { + /** The persistent handle provider */ + php_persistent_handle_provider_t *provider; + /** The persistent handle wakeup routine; may be NULL */ + php_persistent_handle_wakeup_t wakeup; + /** The persistent handle retire routine; may be NULL */ + php_persistent_handle_retire_t retire; + + /** The ident for which this factory manages resources */ + zend_string *ident; + + /** Whether it has to be free'd on php_persistent_handle_abandon() */ + unsigned free_on_abandon:1; +}; + +/** + * Register a persistent handle provider in MINIT. + * + * Registers a factory provider for \a name_str with \a fops resource factory + * ops. Call this in your MINIT. + * + * A php_resource_factory will be created with \a fops, \a data and \a dtor + * and will be stored together with a php_persistent_handle_list in the global + * raphf hash. + * + * A php_persistent_handle_factory can then be retrieved by + * php_persistent_handle_concede() at runtime. + * + * @param name the provider name, e.g. "http\Client\Curl" + * @param fops the resource factory ops + * @param data opaque user data + * @param dtor \a data destructor + * @return SUCCESS/FAILURE + */ +PHP_RAPHF_API ZEND_RESULT_CODE php_persistent_handle_provide( + zend_string *name, php_resource_factory_ops_t *fops, + void *data, void (*dtor)(void *)); + +/** + * Retrieve a persistent handle factory at runtime. + * + * If a persistent handle provider has been registered for \a name, a new + * php_persistent_handle_factory creating resources in the \a ident + * namespace will be constructed. + * + * The wakeup routine \a wakeup and the retire routine \a retire will be + * assigned to the new php_persistent_handle_factory. + * + * @param a pointer to a factory; allocated on the heap if NULL + * @param name the provider name, e.g. "http\Client\Curl" + * @param ident the subsidiary namespace, e.g. "php.net:80" + * @param wakeup any persistent handle wakeup routine + * @param retire any persistent handle retire routine + * @return \a a or an allocated persistent handle factory + */ +PHP_RAPHF_API php_persistent_handle_factory_t *php_persistent_handle_concede( + php_persistent_handle_factory_t *a, + zend_string *name, zend_string *ident, + php_persistent_handle_wakeup_t wakeup, + php_persistent_handle_retire_t retire); + +/** + * Abandon the persistent handle factory. + * + * Destroy a php_persistent_handle_factory created by + * php_persistent_handle_concede(). If the memory for the factory was allocated, + * it will automatically be free'd. + * + * @param a the persistent handle factory to destroy + */ +PHP_RAPHF_API void php_persistent_handle_abandon( + php_persistent_handle_factory_t *a); + +/** + * Acquire a persistent handle. + * + * That is, either re-use a resource from the free list or create a new handle. + * + * If a handle is acquired from the free list, the + * php_persistent_handle_factory::wakeup callback will be executed for that + * handle. + * + * @param a the persistent handle factory + * @param init_arg the \a init_arg for php_resource_factory_handle_ctor() + * @return the acquired resource + */ +PHP_RAPHF_API void *php_persistent_handle_acquire( + php_persistent_handle_factory_t *a, void *init_arg); + +/** + * Release a persistent handle. + * + * That is, either put it back into the free list for later re-use or clean it + * up with php_resource_factory_handle_dtor(). + * + * If a handle is put back into the free list, the + * php_persistent_handle_factory::retire callback will be executed for that + * handle. + * + * @param a the persistent handle factory + * @param handle the handle to release + */ +PHP_RAPHF_API void php_persistent_handle_release( + php_persistent_handle_factory_t *a, void *handle); + +/** + * Copy a persistent handle. + * + * Let the underlying resource factory copy the \a handle. + * + * @param a the persistent handle factory + * @param handle the resource to accrete + */ +PHP_RAPHF_API void *php_persistent_handle_accrete( + php_persistent_handle_factory_t *a, void *handle); + +/** + * Retrieve persistent handle resource factory ops. + * + * These ops can be used to mask a persistent handle factory as + * resource factory itself, so you can transparently use the + * resource factory API, both for persistent and non-persistent + * ressources. + * + * Example: + * ~~~~~~~~~~~~~~~{.c} + * php_resource_factory_t *create_my_rf(zend_string *persistent_id) + * { + * php_resource_factory_t *rf; + * + * if (persistent_id) { + * php_persistent_handle_factory_t *pf; + * php_resource_factory_ops_t *ops; + * zend_string *ns = zend_string_init("my", 2, 1); + * + * ops = php_persistent_handle_get_resource_factory_ops(); + * pf = php_persistent_handle_concede(NULL, ns, persistent_id, NULL, NULL); + * rf = php_persistent_handle_resource_factory_init(NULL, pf); + * zend_string_release(ns); + * } else { + * rf = php_resource_factory_init(NULL, &myops, NULL, NULL); + * } + * return rf; + * } + * ~~~~~~~~~~~~~~~ + */ +PHP_RAPHF_API php_resource_factory_ops_t * +php_persistent_handle_get_resource_factory_ops(void); + +/** + * Create a resource factory for persistent handles. + * + * This will create a resource factory with persistent handle ops, which wraps + * the provided reource factory \a pf. + * + * @param a the persistent handle resource factory to initialize + * @param pf the resource factory to wrap + */ +PHP_RAPHF_API php_resource_factory_t * +php_persistent_handle_resource_factory_init(php_resource_factory_t *a, + php_persistent_handle_factory_t *pf); + +/** + * Check whether a resource factory is a persistent handle resource factory. + * + * @param a the resource factory to check + */ +PHP_RAPHF_API zend_bool php_resource_factory_is_persistent( + php_resource_factory_t *a); + +/** + * Clean persistent handles up. + * + * Destroy persistent handles of provider \a name and in subsidiary + * namespace \a ident. + * + * If \a name is NULL, all persistent handles of all providers with a + * matching \a ident will be cleaned up. + * + * If \a identr is NULL all persistent handles of the provider will be + * cleaned up. + * + * Ergo, if both, \a name and \a ident are NULL, then all + * persistent handles will be cleaned up. + * + * You must call this in MSHUTDOWN, if your resource factory ops hold a + * registered php_resource_factory::dtor, else the dtor will point to + * memory not any more available if the extension has already been unloaded. + * + * @param name the provider name; may be NULL + * @param ident the subsidiary namespace name; may be NULL + */ +PHP_RAPHF_API void php_persistent_handle_cleanup(zend_string *name, + zend_string *ident); + +/** + * Retrieve statistics about the current process/thread's persistent handles. + * + * @return a HashTable like: + * ~~~~~~~~~~~~~~~ + * [ + * "name" => [ + * "ident" => [ + * "used" => 1, + * "free" => 0, + * ] + * ] + * ] + * ~~~~~~~~~~~~~~~ + */ +PHP_RAPHF_API HashTable *php_persistent_handle_statall(HashTable *ht); + +#endif /* PHP_RAPHF_API_H */ + + +/* + * 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 + */ +/* + +--------------------------------------------------------------------+ + | PECL :: raphf | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2014, Michael Wallner | + +--------------------------------------------------------------------+ +*/ + +#include + +struct user_cb { + zend_fcall_info fci; + zend_fcall_info_cache fcc; +}; + +struct raphf_user { + struct user_cb ctor; + struct user_cb copy; + struct user_cb dtor; + struct { + struct user_cb dtor; + zval data; + } data; +}; + +static inline void user_cb_addref(struct user_cb *cb) +{ + Z_ADDREF(cb->fci.function_name); + if (cb->fci.object) { + Z_ADDREF_P((zval *) cb->fci.object); + } +} + +static inline void user_cb_delref(struct user_cb *cb) +{ + if (cb->fci.object) { + Z_DELREF_P((zval *) cb->fci.object); + } +} + +static void raphf_user_dtor(void *opaque) +{ + struct raphf_user *ru = opaque; + + zend_fcall_info_argn(&ru->data.dtor.fci, 1, &ru->data.data); + zend_fcall_info_call(&ru->data.dtor.fci, &ru->data.dtor.fcc, NULL, NULL); + zend_fcall_info_args_clear(&ru->data.dtor.fci, 1); + user_cb_delref(&ru->data.dtor); + zend_fcall_info_args_clear(&ru->ctor.fci, 1); + user_cb_delref(&ru->ctor); + zend_fcall_info_args_clear(&ru->copy.fci, 1); + user_cb_delref(&ru->copy); + zend_fcall_info_args_clear(&ru->dtor.fci, 1); + user_cb_delref(&ru->dtor); + memset(ru, 0, sizeof(*ru)); + efree(ru); +} + +static void *user_ctor(void *opaque, void *init_arg TSRMLS_DC) +{ + struct raphf_user *ru = opaque; + zval *zinit_arg = init_arg, *retval = ecalloc(1, sizeof(*retval)); + + zend_fcall_info_argn(&ru->ctor.fci, 2, &ru->data.data, zinit_arg); + zend_fcall_info_call(&ru->ctor.fci, &ru->ctor.fcc, retval, NULL); + zend_fcall_info_args_clear(&ru->ctor.fci, 0); + + return retval; +} + +static void *user_copy(void *opaque, void *handle TSRMLS_DC) +{ + struct raphf_user *ru = opaque; + zval *zhandle = handle, *retval = ecalloc(1, sizeof(*retval)); + + zend_fcall_info_argn(&ru->copy.fci, 2, &ru->data.data, zhandle); + zend_fcall_info_call(&ru->copy.fci, &ru->copy.fcc, retval, NULL); + zend_fcall_info_args_clear(&ru->copy.fci, 0); + + return retval; +} + +static void user_dtor(void *opaque, void *handle TSRMLS_DC) +{ + struct raphf_user *ru = opaque; + zval *zhandle = handle, retval; + + ZVAL_UNDEF(&retval); + zend_fcall_info_argn(&ru->dtor.fci, 2, &ru->data.data, zhandle); + zend_fcall_info_call(&ru->dtor.fci, &ru->dtor.fcc, &retval, NULL); + zend_fcall_info_args_clear(&ru->dtor.fci, 0); + if (!Z_ISUNDEF(retval)) { + zval_ptr_dtor(&retval); + } +} + +static php_resource_factory_ops_t user_ops = { + user_ctor, + user_copy, + user_dtor +}; + +static int raphf_user_le; + +static void raphf_user_res_dtor(zend_resource *res TSRMLS_DC) +{ + php_resource_factory_free((void *) &res->ptr); +} + +static PHP_FUNCTION(raphf_provide) +{ + struct raphf_user *ru; + char *name_str; + size_t name_len; + zval *zdata; + + ru = ecalloc(1, sizeof(*ru)); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sfffzf", + &name_str, &name_len, + &ru->ctor.fci, &ru->ctor.fcc, + &ru->copy.fci, &ru->copy.fcc, + &ru->dtor.fci, &ru->dtor.fcc, + &zdata, + &ru->data.dtor.fci, &ru->data.dtor.fcc)) { + efree(ru); + return; + } + + user_cb_addref(&ru->ctor); + user_cb_addref(&ru->copy); + user_cb_addref(&ru->dtor); + user_cb_addref(&ru->data.dtor); + + ZVAL_COPY(&ru->data.data, zdata); + + if (SUCCESS != php_persistent_handle_provide(name_str, name_len, + &user_ops, ru, raphf_user_dtor)) { + RETURN_FALSE; + } + RETURN_TRUE; +} + +static PHP_FUNCTION(raphf_conceal) +{ + zend_string *name; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &name)) { + return; + } + + RETURN_BOOL(FAILURE != zend_hash_del(&PHP_RAPHF_G->persistent_handle.hash, name)); +} + +static PHP_FUNCTION(raphf_concede) +{ + char *name_str, *id_str; + size_t name_len, id_len; + php_persistent_handle_factory_t *pf; + php_resource_factory_t *rf; + php_resource_factory_ops_t *ops; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", + &name_str, &name_len, &id_str, &id_len)) { + return; + } + + ops = php_persistent_handle_get_resource_factory_ops(); + pf = php_persistent_handle_concede(NULL, name_str, name_len, id_str, id_len, + NULL, NULL TSRMLS_CC); + if (!pf) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Could not locate persistent handle factory '%s'", name_str); + RETURN_FALSE; + } + rf = php_resource_factory_init(NULL, ops, pf, + (void(*)(void*)) php_persistent_handle_abandon); + if (!rf) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Could not create resource factory " + "for persistent handle factory '%s'", name_str); + RETURN_FALSE; + } + + zend_register_resource(return_value, rf, raphf_user_le); +} + +static PHP_FUNCTION(raphf_dispute) +{ + zval *zrf; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zrf)) { + return; + } + + RETURN_BOOL(SUCCESS == zend_list_close(Z_RES_P(zrf))); +} + +static PHP_FUNCTION(raphf_handle_ctor) +{ + zval *zrf, *zrv, *zinit_arg; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", + &zrf, &zinit_arg)) { + return; + } + + zrv = php_resource_factory_handle_ctor(Z_RES_VAL_P(zrf), zinit_arg); + RETVAL_ZVAL(zrv, 0, 0); + efree(zrv); +} + +static PHP_FUNCTION(raphf_handle_copy) +{ + zval *zrf, *zrv, *zhandle; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", + &zrf, &zhandle)) { + return; + } + + zrv = php_resource_factory_handle_copy(Z_RES_VAL_P(zrf), zhandle); + RETVAL_ZVAL(zrv, 0, 0); + efree(zrv); +} + +static PHP_FUNCTION(raphf_handle_dtor) +{ + zval *zrf, *zhandle; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", + &zrf, &zhandle)) { + return; + } + + php_resource_factory_handle_dtor(Z_RES_VAL_P(zrf), zhandle); +} + +static PHP_MINIT_FUNCTION(raphf_test) +{ + zend_register_long_constant(ZEND_STRL("RAPHF_TEST"), PHP_RAPHF_TEST, CONST_CS|CONST_PERSISTENT, module_number); + raphf_user_le = zend_register_list_destructors_ex(raphf_user_res_dtor, NULL, + "raphf_user", module_number); + return SUCCESS; +} + +static PHP_MSHUTDOWN_FUNCTION(raphf_test) +{ + php_persistent_handle_cleanup(ZEND_STRL("test"), NULL, 0 TSRMLS_CC); + 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 + */ +‰PNG + + IHDRÙlç¹°gAMA± üabKGDùC» pHYs  šœtIMEÝ 'É=)… IDATxÚì½GÜùu5|*çœsWçfhr˜&hFÒ(YòH ËÛðÆ6¼´—¸ñð'0 m´²$À0Ù3$8$;‡ê®œsÎõ.Fç¢z,ùµ¤ç}k£Ñ YááÞsÏ9Wñÿð‹Éd¯×‹J¥½^N‡gϞÉ?‡CÌf3, ôû}¨Õj4 ¼öÚkP©TÈd2è÷ûX,°Ûí8<<Äîî.ªÕ*>÷¹ÏáääƒÁNV«+++°X,8;;C¹\†ÛíÆh4Ât:E§ÓÅbA¯×Ãöö64 ž={§Ó »ÝH§Óp:0›Íè÷û Ÿ ­V Ýn7nÜÀ|>‡Ëå‚F£A6›…Ãá€ÇãA©TÂùù9VVV0ŸÏ±²²‚|>x<ŽF£~¿ñxŒñxŒ›7oâää*• +'''hµZxóÍ71ŸÏ‡¡R©ÐjµÉdÐn·Ç11Náv»Q©Tðüùs ‡Cܺu N§Ϟ=ƒÉdB,Ã`0€R©ÄÖÖ +…^ÆãŊ‡ê7ÞxØét R©p||Œn·‹H$Fƒ`0ˆÑh„F£N‡ÑhÇðûý‡¸¸¸€F£ÅbÕjE¥RA(Âb±€ÃáÀ³gÏ°X, Õj¡Õj¡Óé`4Q­V¡Ñh P(Ðjµ0¡ÓéÐjµ`·Ûáóù T*Ñn·a0`2™ T*¡P(0P«Õ`2™‰D`6› Ñl61›Ípÿþ}ŒÇc”ËeD"( +L§S¬®®¢×ëa2™æó9ö÷÷Ñn·±³³ƒÙl†jµ +‹Å—Ë…x<Žóós ‡Clooc8¢\.c>ŸÜn7l6:t:, NNNÐh4àt:±X, R©>Ÿz½*• +NívÑhÓéÍfõz/ãñbÅCõÎ;ï<ôx<¸¸¸Àl6ƒÁ`Àb±€ÕjE£Ñ€Á`Àh4‚ÇãÃáÀp8„Éd‚ÅbA2™„ÍfƒÍfC³ÙD£ÑÀh4B$ÍfC»Ý†^¯G³ÙD:F$J¥Âh4B»ÝF¯×ƒB¡€Á`@¯×ƒZ­†ßïÇx<–€šL&x< ‚×땓´Z-ìv;Úí6jµz½Ìf3¦Ó)4 æó9L&†Ã!b±Òé´üÎ^¯‡t:˜Íf¼ÿþûP(¸~ý:†Ã!ªÕ*úý>ìv;¦Ó)‰‹nÞ¼ ¯× N‡L&ƒZ­›Í†••Yl*• +NF^¯ƒÁ³Ù v»V«Ýn­V ‘HãñÉdív6› /ãñbÅCõÕ¯~õa>Ÿ‡Ãá€Éd’Sp4áÃ?Ä`0À͛7Q«ÕP(°¹¹ Fƒn·‹N§FƒÅb‹Å‚ápÇƒÑh„ããc ‡Ch4øý~( +˜Íf, ŒÇcÀjµB£ÑÀl6Ãn·C­VL&@§Óa±X`8b4A¡P@­VC¯×C«ÕÂb±Àãñ ßïc:Ê"Ðëõ˜ÏçrÂL&èõzôû}8Àh4‚Á`@(’ÓÐjµ¢^¯Ãáp`±XÈ{6›MìììÀåra:ÊßU©TÐëõ˜N§˜L&ø裏àñxàñx`µZ‘J¥`³ÙÍf¡Ñh ×ëáp8ptt„\.£Ñˆ`0³ÙŒD"`0¥R‰—ñx±â¡ú¾ðp}}¥R ƒAv`«Õ‚ÇãÓé„R©Äb±€ÍfÃb±@µZ…B¡€ÏçC­VÃ|>‡^¯‡Éd‚V«E³ÙD¿ßG·Û…Á`€ÝnÇÎΚÍ&ƒªÕ*¬V+ü~?F£l6›œÍf*• +F£‹Å³Ù ÍfóùF£QN¦*ÓéG>3—ËÁ`0 V«Ál6C­VòCU*L&(•J(•Jx<¨Õj(•JÌçs8ܺu Z­jµZ­J¥jµý~:õz^¯óùN•J^¯ñxrºµÛm8NèõzŒF#ÌçslllƒºÝ.l6êõ:ŠÅ"Õj5¬V+”J%Òé4NNNðꫯB©TÂívK:’Ï祈n·ÛÐét˜Ïç¨×ë éŽÏçC£Ñ€Ýn‡Ñh”‡Ì‚<ŸÏc:B­Vc8Âív£V«Áëõb8b±X@­VˏÏçóÇp»ÝÐëõ¨×ë0™L°Ùl‡¨×ëðûýh6›èv»ˆÅbH$r"`p8‚zõû}ƒA¨T*är9B¡Z­†Ã!æó¹, ¢Ñ(†Ã! +.//a41NaµZQ(°X,àr¹­‰ÇãÐjµ8::B£ÑÁ`0@£ÑH +Ñív¡Óé T*%]á ÂÜ»V«ÉÉ`4Q¯×a4&|<ŸÏ¥ðÖh4‡èõzršÙl6h4YÓé&“ N‡FÒ&ötôz=šÍ¦¤>ƒÁ¥R óùƒóùÍfFŠz‡ÃŸÏ‡\.‡N§ƒÁ€[·n¡Ñh P(Àf³Áëõ"‹áìì …BANüƒƒ¼ŒÇ‹՟þéŸ>ÜÞކZ­†N§C³ÙÄt:E·Û•7è÷û è÷û(•JP(è÷ûP*•‡ÃP*•0°Ùl¸¼¼Äññ1ôz=|>ŸäÊ*• +J¥½^ý~óùN§S +O…BÁ`€Á`µZ-péÆƆ¼/¡`…B…B½^‹Å‚J¥"¹;¿«ÝnG2™Ä|>‡ÏçÃt:•E“W«Õb2™ ßï£ÕjA§Ó¡\.C§ÓIÏh4Éop¥À‡°X,èv»0›Íp8òJ¥jµÖ××áõz‘N§%àÁ`årÿöoÿ†ét +§Ó‰““hµZ¬®®âe<^¬x¨~ÿ÷ÿá`0þF³Ù„N§“^F§ÓA*•B¥R‘ëy8ÂårÁh4"¢ÕjI—›»7#“É  Âét +RÅ¢ÈéÂff4ˆçx<Æp8„R©Äd2DI§ÓIóq8¢T*ÉIY.—Ç…-`6›¥ð/‹Â(•J’2¹\.éó$ x½^Øív( +~€Ô ÌáY_°Q*•ðù|rKðÏp!=zôV«UXìóX­V¼ŒÇ‹Õ×¾öµ‡…Bççç˜Ïçr‚E" ‡CÔj5Ôj5, ˜ÍfA© +Ôj5Z­â ’sW*Ìf3ôû}ù{>ŸÐëõ0NFÑíva±Xàp8Ðjµ¤°œN§( +òÃY€v:D"Ìçsôû}øý~´Z-Äb1L&”Ëeܽ{årívãñkkkÈårÐëõÇP©TW~^¯G«Õ‚ÏçC·Û•ßçó ˆÀ÷q8Ðjµ¸¸¸~lôÚl¶+HÓ$öÆã1F£‘¤7/ãñbÅCõ;¿ó;m6Òé4Úí¶ô9:<b±¼^/&“‰49É׺¼¼D­V$‡á(—Ë(—ËX__—ÞÆd2‘¦¥ÓéD¯×“­Ùl"“É`:Âl6C¥R¡\.£ßïÃ`0Àf³Áï÷ E¦ÑhHJsyy)?P£Ñ P(`}}]`èr¹Œp8Œ­­-i’‡V*•N§¤Ø&S‚§¿^¯‡Ñh«ÝnÃápt~qq!ÏÂãñ ^¯#‘HÁß\«ÕP©T°ºº +«Õ*,‹—ñx±â¡úæ7¿ùhQ8F @¹\†R©DµZªL €ÅbZL£Ñ@·Û…J¥‚Ãá€ÅbL§Sá‡17w¹\d¦ÃᇍFC˜T«UéG°°e¨Õja:Ân·£Ûíb6›áüü‹‹“É‹ÅN§Sd±X`·ÛÑét„‡æt:¡ÑhÐëõ Õjqzz +³Ù ‹Å‚D"!E~¯×ƒÅbÁúú:òù<*• +:Ž@Ç$ΦÓi¨ÕjiŽ^^^¢Óé`6›ÉŸ{'ªû÷ï?œÍf0ÒÁ¯×ëršL&d³Yèõz„Ãa4›M ‡C€ÕjÅx<Æd2Á`0(´Ûí" +! ‚ï_­VÑëõ„±= àr¹„®²Œb t»]Aʍ†Ã!¼^¯ü¹v» ·Ûét*9??‡F£Úd2a>Ÿc0l6¦Ó)¦Ó)z½žð×Æã1ÔjµÐfx‹EL&!Ôò$eo&‰ Ýnc4!ÃápH1΂˜ý$6‚ÙÄt»Ý0™L‚¾µZ-¼ŒÇ‹՛o¾ù]óÉdµZ-Ô~…B¥R‰B¡N'4£Ñ(½›Í&ù1ósµZ “É$y6™ÕF£:n·[zäÅ- ÌçséY$ h4I[x“vc±Xý2™LH&“Èårøù|ŽápN­V‹B¡€x<³Ù …B!iÒb±€ßïG¹\Æh4’n¿V«…F£f¶J¥‚Õjä¨ÑhÀb±`ccC>Ïçóa±XàôôZ­>ŸOè@ϟ?G¿ßG­VC4…Z­†B¡Àp8ôN­V£Ûíâe<^¬x¨¾ýío?$lÉ¢¯V«Áétb8¢X," +A¡PH7ž'›N§Ãt:…Ëå’kx4a4É)zyy‰ápˆx<µZñx ƒÁ l‚L&#hV.—Ãx<–“‘‹…žÅb!'´Ùl–bX¡P Ýnc8¢Ñh²¦P(Ðét„JCé†Ãᐞ +åÃáÝnZ­V´C\h ˜b©T*‘It:ÉōF#òù÷¹‡l®±×P,Ñjµ ×ëa6›«««è÷ûÒq',\($÷e‘MÂËËKÉUÙ×étÒmµZÒ姬 ÕjÁår]y?’B‰åóyáÔ± °X,h4R”ûý~Io”J%f³t:ŠÅ"\.t:t:ºÝ.úý>L&f³aµZár¹îµX,P(H¥R0›Í²8Ʉp:˜ÏçÇ‡Ã‚Pñy2Îf3¸Ýnôz=är9L&¸Ýn¸ÝnÄãqÔëu¼ŒÇ‹ÕÛo¿ýÐï÷˕Üëõ0¥síp8àt:qyyy¥%9”'N«Õ‚V«¶v£Ñ@(’^›‰üaz½^Цv»X,&Wr³ÙD8–Þ ¹nÌߙ‚Ôëuh©ª­Õj˜L&ØÚÚÂb±@¯×‘`£Ñ aµZ¥‡@(C&“IÒ²"f³Ìf³œ® +…B×n·ù|`6›eqž‰þˆiåóù±X Ãá¹\‹ù| +…/ãñbÅCõå/ùa0„N§Ãéé)t:ÎÏÏá÷û¡×ë‘Íf¥eÎʞÀd2—BAµZ`0(?„ªS½^Á`€B¡£Ñ(ª]’P«Õ*\.Ôj5²Ù,:ìv;f³™À©£ÑHȬ̙ÉÈårÐh4…B˜Íf˜ÏçH&“P«Õ˜Ïç(—ËØÙÙZUÀ à2*g2™„²3%àBR}LÎû:äãY,èõzèõz¸\.ôû}á¼ÅãqA¢ìv;*• +l6^ÆãŊ‡ê«_ýêCþæœ<í´Z-ÎÏÏát: 1ŸÏá÷ûQ«Õ„Z‹EÄtÁ`PÐjlòù¼¤NGh3kkkh4èt:0øðÃáÑh4899‘‚÷îÝ»P©TøøãE»£V«¥ÉÈ^…ÕjÅh4’š$ +%‡Œvéو%¬Ûï÷%¿¦èp: +›Àl6Ã`0ˆ¬a<Kss>ŸÃjµ¢ÕjÉÉ;›Íàñx$=S*•"'!° P(°ººŠÑh„—ñx±â¡zýõ×úý~ôz=á|ñdªV«0™LX]]E«ÕBµZ…V«…Ûí†B¡âu0H…=¥R)_Šâ<´ô€¨V«˜ÏçR0gv»Ý¢!r¹\P(BFP*•’÷×j5øý~Ìf3„Ãa 8ù=ô£ Èn<K2ŸÏa6›Ñh4®4c™"‘r´X,‰D„\ËÞÉ«f³“É~¿étZH·z½^ +~¨T*p¹\¨Õjèt:ƒp8H¥R°X,è÷ûèt:x+ªx<þÐl6c{{‡*•J®nƒh4èõzÂIëõzh4ÒùW(ò÷˜†å "ÎcŸ¤Ýn m‡M@æø.— Éd•JjµZÐ,•ŒF#èõzÌf3T*lmmÉ©ùôéS‘@¬¯¯c8~Òqÿ9¥F¯×K_*•Ðëõ`4Eë¤Óé ×ëÑëõ®, +­V ƒÁÇ#é‚,¢©Áâ‚S«ÕÈårR‘%Þï÷a41 DêO1âññ1*• +^ÆãŊ‡êÿðMâÕKo‡ÕÕUi¼QÁÊ^‹V«E.—“æ‰CɃÕj…ÅbA§ÓÏçC¡P)û7v»]±ìߍF¹þ{½Z­Ìf3”J¥ð֔J%²Ù¬¤1N‰D:ëëë0 ¨T*(•JÒ±ŸL&"ê;>>–f$õO@@ <›$Æò{) +Ôj5)¬—û5ü-Íf&“IôY.—KD‘H:N™L±X Íf“ÉÑh/ãñ‚ÅãÞ½{—¯}—Ë…““Aa +…ìv»Øk©T*´Ûm)î‰úý>¬V«@ºZ­+++ØÛۃÛíÆd2A£ÑÀd2A»Ý†B¡8˜’­V “É$Ww±X„R©”^Êd2A(†ËåB¯×ւÛí†ÙlÆÚÚ²Ù,ž>}ŠÝÝ]ôû}9¹‰ö¸Ýn û4Ká©W©T R©`±Xí¢c›“v»]ôU#º\.Éùçó9r¹\.— i‹EŒnjµ4ô±2™Œ¤u/ãñâÄCI©4O¿‹‹ øý~QÕRÇ"”]{î|RGÎÎΤÎ×úú:2™Œô/t:œN§¸±ï Ñh`µZ…Œêñx ×ë…5¾œ¿›L&Qâa +…B…Bx÷ÝwÑï÷ñÆo`8ŠÌÜjµÂf³ Ê5›Í„¡NvÀh4B«Õ ÓÆÆ:F£, 2™ŒÀ0Eêt:¨V«¨×ë¢Çj·Ûh4¢ébQM½S¿ß¿@ °¹×ëÅËx¼xñP}ùË_~8 F1ŸÏ¹¡ÄVXÌÉm6†|A³ÙŒz½.×&)þ¥RIòvž—”Z¦^¯‡p8Œµµ54›M +1ôÇÐjµ(—ËXYYÁÖ֖]®¯¯‹‹,šŒF#F£‘ôMØíçŸaaìr¹¤ïC¿?—˳ٌ³³3hµZ¬­­‰ˆ’Ìô—ñx±â¡úË¿üˇJ¥årY<õìv;€äµ»»»èv»¨V«˜Íf¢”-‹‚ªÐNù•W^'ØH$«ÕŠÉd‚b±(ð¦ÏçC¹\–œ×jµ"™LÂï÷Ãçóa<#‘HH#”ýö]HµÛíÈf³§¾ùæ›"_ŸÍf‡ƒˆF£¨ÕjòïhGV­Vj4RÔËeFÄãqѱ?”Àd2ÁjµŠï^­V–g¦Ó)Âá° cN§^¯ù|ÑhëëëÒ,e:CC͗ñxqâ¡øÞ÷¾·˜L&èv»øàƒðÙÏ~V])»¦4a>Ÿ‹¥3;í½^O¸Z‘HD®g:Á²7떦ü¡PH¤Âñä#|œÍf1qÿþ}±å¢¯{*•‚Á`@«Õ’G£Qa)”Ëe4 lnn"ŸÏK~ìv»át:]#šf±XÄ*šÀÙ””³·²¹¹‰V«·Û-§ål66ŒÈXg_Š ð@ èµLÑhTNýñxŒ^¯‡>øo½õ–訣Ñ(ñ H‘ñà þ‹âA¸ýWÁLÿÿŒG¿ßób±(ñ Læÿëxý›ìÕ·¿ýí‡ì“¼ù曣Җ‹½ â½Ç“|²ž)ž£¬B£ÑA5H/D«ÕJ߆ü/."þýL&ÇÐh4H&“X]]…ËåÂÙÙvvv cÁËàP±k·Û‘ÉdÐívåïrÃ( +T*8N §‡°¯”ÍfÅՈÄXÊ?Hl¥ÄA£Ñˆ Òf³I³—Jòýl6jµš€ ~¿‡Íf¹\N +No¼ñ ²Ù,æó¹, n¢z½.µ†^¯íãqvv‹Å“É$ú«ét +¯×‹`0(ñÐét˜Ífp¹\âÞËŠñH¥Rðz½ËËK¬¬¬ÀétþÒxt:˜ÍfIm6Òé4ºÝ.âñ¸X¶¡,—Ëp8².šÍæ¨>—ËawwWå*•JPQ­V+·3)_Œ='™&šÍæ_9¿êþXŽ‡êßøÆÃ÷Þ{>ŸO‚AÒ#Œ¤–èõz(•JØl6éV¥'ÙӕJ +…âŠáÈh4ÓM…B!A¦¿:¡dÂÏf³¡PH8p888@8Æáá¡ÀÄÕjÁ`BÌ\[[C§ÓSÌF£!t"vÿN'¦Ó)ªÕª°h\IÔl<#Êûv»]Ù8¥RéŠò—RýeOv¥R)¶Ö˘Ýn°€l¦rï½÷œN§,öˆúý> +…ºÝ®¸ùr¡¨ÕjÔëu)¾'“‰¨˜—{m6›@ç<èH®V«"YžPÂþ’Á`@ Ó~}}GGG…B8>>–ú¦Z­Âï÷ãàà@œœ–Ð-¸^¯#›Í¢ÑhÈçsQRKF¤R©” ;ÐëõäÖµZ­0ÂŽ_ž8c4¡P(¤åá4NåÐ!€A=Z Ѓÿ'?ù ¼^¯0Iþßö‡Ýn‡F£‘g®øîw¿» `8Š?‚ÙlF­VC©T¶3U´¸‘÷Öï÷?!BþÜfŒèt:…^¯(™¾LqÈz惡ù%­¸<H +B¡ôvø°Ÿ={&vÉn·[z9Åb~¿Z­çççWXÛäóQÚÐëõ„Y@V™&“I\j3™Œøý•ËeaeeE‚±ºº +•J…'OžÀl6c6›! + £œ‚E +I\m4‡ÃÈårƒò]È)äæfäfÏçrÐðp Ÿ>dåðæ IDATF±XD"‘Àp8L§ÓÁn·#£R©ˆ ‘"EÖ0¤9œœœ  J*I_ˆÓÓS\\\ P(HCöoOê­X{Pf´œ–ÐÎÚn·Ë" +p¹\¢¦ç­jµ†Ã!=z$߃§;k–Åb!‡á}ƒÁ«Õ +ƒÁ€­­-ܾ}[€ŠñxŒÏ|æ3x÷Ýw…ÂÄÙ`\p´ ôŸk©R©ˆEÁ`€Ïça©ÏçC¥RÁéé©@êô5ämÍú”‡:™L+™fsSÑ^f³™4t¬¢öíõ×_Çb±LÍì_¶?˜½q¨†J¥‚úæ͛Èår888üýøøXN”ÕÕUÔëuôz=x<™^H²æ£GÏç%íãb!x±üâ‰Á^þw´cŠÄÑ5£Ñ‰DB†Èííí¡Ýncmm J¥ÿñÿ!Ž­Ùl7oޔSŠSêŒL&“XD³Þ##áøøP­V±··'´ ét +ƒÁ€·Þz n·ûûûP*•ƒâ—ÁÏbJC•0g{±Fk6›8;;ÃÓ§Oq~~.llÆþ¢ŸÏ§Ÿÿy6›ÉÍe0ÄÄ4•JáÞ½{²¸9—#}ø;©€æëŎŸÇz<‰Èj2™°¹¹ …BÿøDz÷÷÷‘J¥p~~.©Ú/{o¾?­àƒß¸qCêçt:d2)ö/ZgLÙçóZþsüoü>T\/ iÇc¬¯¯ãúõë¨ÕjØÛÛû_íl6‹n·+Ö©T +ꋋ ”J%‘˜s‚ÅÆÆêõ:ŽŽŽàt:‹ÅM¢¨×ëÉIÌT€@¶Ÿ~x„S ˜°žXN‹(`!Ûn·±¹¹‰\.‡J¥«ÕŠõõuhµZ¤Ói¹®9Ń> Bà ƒè÷ûH$( +p8˜ÏçX__Ç|>—|}:¢R©HzI³¦§¹\NØv»] +îÁ` µǛò´^NõÚíö=k†ét*J¸x»saŒàmÃFñd2‚5Ó­Ùl†7nÀl6ÃårÁétJêƦ-oåŹü=>½Áx{˜L&<þápׯ_Ù›ÉlX^ø\ÐË/ÖM•Ôï÷Q,ñÎ;ïˆt„ô)ڇú}ب&Iš¿‰ŸÉõIô‘ ×ðò‹1Îçó¨×ëâñÈÃñÚd™ †OHÂÛÛÛùÅÈóûý2?¸Ó鈅Ñö(è< +…°²²ƒÁ¿ß/hV«•tÌf³auu‡¡P.—K–ÏçÃÖ֖,\Šô†Ã¡Ð`h +…àóùP¯×Õq¹\Rƒ) +¹U)¡gï†ßm±XÀ`0 a:òä Æ•ßKð†ô!¯×+4{=Ì@B2»ÉÕ«V«8;;y·Ûk×® Ôn0ĨÅh4ÂápÀjµbss7oޔ´Q¥Raeen·^¯›››rCqÜk%„9˙P>'£p1‹ çÏy‚d*p“Ó$Õn·ãÁƒØÜ܄R©ÄŸÿùŸcwwñx\@ Zº¹Ýn‘Õ,è£T†^‰tãu82Έ’“?û³?ƒÙl–‚‘˹̬}¨(°Z­Ò÷óûý²Îâñ¸LµÛíXYY‘45„Ïær8†Ïç»â @¿ÿÓþ˜L&0™L(‹Ÿ”F+++¨T*RË05a‡œÁ¢ ët:•<Øív# +¡V«‰çGÔP¤·ŒL½þúë¸}û¶:‰Qð·¿¿/6˜æÑï÷Ñl6¥ÓϚÅ`0 _ñô£¢Õl6£ÝnË÷äìß7nH*Õh4Yâ¨ÕZ­†r¹,§û1¼-hriµZÅq—(ɤï;=y V«UlooË9zgg———Fò¼9.ÕëõâßøÂá0Þ}÷]S(Q¡=öææ&~úӟb±Xœ+ÎSÞØؐzË`0ˆ¯Å½{÷P.—¡ÕjåæN¥RÂlw»Ýâ)Oòî›o¾‰@ ˋ‹ ‡C¬­­]ËÃá°è´Íçs|üñÇ2³™Y †{÷îÁëõ +÷ñôôF<@¡P@¡P€V«•ÚŽ0;3›Í†o~ó›²ykµ¬V« á¼í“É$¼^¯8qU*$ að +|ç;߁×ës!ڃÿOûƒé3Ùÿ@à“>™Åb‘“ V«É(š‚ØívádÑÅU£ÑH1ÈùLdp€œB¡ÀÖ֖ twîÜÆ3eޑHDd’ÍބÑh`a>Ÿ‹Á?ƒ§ÓéÄv«T*ÁívKŠÐh4dáðtÕh48::B·ÛÅÚښܰårYƟòvæÉÄ[nssSÜfkµ´Z­Èèù`kµš,¨f³)·2{DÜ<ô0 h4(‹(•J’ŽÆb1„Ãa¬¬¬  Âh4bssS€`0(–ÕL·].—ÜRn·[Ð4öé0‹Åäû²¦"û­šÊX­VAhý~?~÷w_ûÚ×àñx°¶¶†ÍÍM$“IhµZ±Œ#c¤\.# +ÉÁÄvE“”ÖÐçîÝ»ø“?ù¬¯¯£Ýn#‰ +yãÆ ifÓъ>ûÝnWD¤lZß»wOØ[[[2mfÙ΀Ïßn·£Z­¢Z­"ŸÏËaʲ€ë—ëvyÔÓ/ÚÌ4¨ ”™LFNjr˜JqÊ;=û6›MI‡¡Òû½2”…sFQQ>‡Ãb±(‹Âår! ‘”ÓWWWáóùp~~.-nN6Yg°ÐfŸƒ½+‚´†&§P(°¶¶†½½=q„eNÎ x<Ñb1 œMÅiív>ŸgggÈd2¢Âå¼*šÎМ¥ßïãàà@`a¶h<£Õj%ä ®®® +0ÀC…z*Ë#Ãô.‰ Ñh V«áòò?ýéOÅR› ‰ÍfÃîî.B¡òù<²Ù¬pü‚Á +…ªÕªÔ‰ñxz½‡‡‡h·ÛhµZˆF£X,°ÛíâQ*•„¢¤R©„´Ì¾$×]Š···át:ñ…/|ï¿ÿ>Úí¶l`ŸˆD"2X}OöCÃá°¤Ú½^·nÝB6›EµZ…×ë†Ñh„ÙlF,“zh53:W©T +½^ï½?è Â6J¥‚Òçó¡Õj¡ÙlJ·»X,J±~çΡ™¤Ói‘4 +I™¾â¤Þˆ‚¿gϞá‡?ü!t:|>"‘ÎÎÎpyy §Ó)SÉ"áµl6›%E`Z7N1›Í Ñh°¹¹)´ö%\.—°¸):œÏçÂøv»Ýxã7 P(ž®V«â‹Á¥ ‡‡‡˜ÏçÈf³"AçxÔ\.'è!OM¡PHü6šÍ¦Œý)•JB"e}I‰øÚÚNOO1Éd°½½-N·§§§W†ì1McZH„‹ðu,ƒN§Ãþþ>Þ}÷]èõzƒAiK”ËeY¼¬'‰ÄòPËårxÿý÷ñïÿþïøøãÅ¥‰›o6›I=N»*‘Ûí¶l:²(\.>ÿùϋ6K­V#•JáîÝ»rYCïúÁ` ŒhF£J¥Rê%ZàÑÀ”`Y@ét———2W› +kª§Õ[4•rãWÙ\Ó&“ Êjµz…:ÃüÈÈÑё )ƒ}-")²Z­"N ¬LNÓ­;wî`4áÑ£GˆD"2ö”¬ ·Ûd2‰n·‹ëׯË&èv»RT/í¡x!›ÍŠÅ™F£Ëåðƒð*A +‹Å"º&ª}Ë岤wz½Gxƒô¤5óp8Äd2Ýn¾Ú|>'Y»Ý.3É|1ò[蛱µµ%-¢±t;28<<Äl6õkפqúüùsäóyär91eo†VÛ4æ<>>†ÃáÀ½{÷D)­×ë±X,pëÖ-Ìf3<þ¡PGÆÖÈév»(‹¸ÿ¾€ +z½ûûû8==E"‘ÀÖ֖¨†‰Øy½^d³YA$U*•|7ŽM"#Ÿ)^­V“ÅÌt‹ ^‹Å">ˆ´XF°É¹dÉBÒðññ±x–”J%ŒF#1we[€ÙѲ·äb±À׿þu1Q%ô«îÅbñ‰† ´ƒƒI/ªÕª,Šeêϵk×dt ùxD$Yè25"Æԇsª666°··‡z½ŽT*“É$H­½ØØäUn6›±±±! jž’¬Êå²q4!Êț££#looË ãt:廯T*ù+ +„B!¼óÎ;èõzxòä‰Ü²ì›1ãTG»Ý.¬tö &“ r¹"‘ˆL£$=Š ‚u +af¢•Óéûûûðz½p:²ˆ …‚4ó;vvv$ƒ³Ù GGGr"sü,[-LÍidêñx$ŏÇ( +˜L&ò]x#år9ôû}cwwWZ(³ÙLšÚìv:¡¤ ‡C¡¥•J%¡¦q!2I&“²†ø¾GGGŠÅb&žžÊš\~f„ã{½vwwe +&AFƒl6{%´Î#-¯ÛíJ“Üëõ¢ßïËgìïïÃf³!ÿÊûCI›b¯× ¯×‹b±(ˆ:»Ý.›ÍJ^}qq­V+}1¦Š´ +Ëd2(•JÐëõØØظâdËÁ ¤1 ™dB ¦˜ôF§±èh4’÷åɹ̶`‰ †^¯a Ãᐱ>‹EžM§ÓÁöö¶‘Ëå²ô¹ ûý>Âá°*• +ÉdÃáÛÛÛØßß¿’‰Ìçsi½îõz¥ôx<Ðjµxþü¹øÇollàþýû8::’[z4!•JI¯0QåÅb!ó–766$ÍnµZh·Û¸¸¸ÀÊʊÔBìi-?3Òôü~¿üVn¬z½ŽZ­†@ p%TH“?ËAíÄ)®_¿ŽŸüä'èt:‚püùUö‡’¨?¬X,¢^¯Ãn·KMÃ>;ê„My’ŽÇc4 øýþ+' S4•J%iûZ­f³Â$“€Œ æíä@6 œžžâéÓ§xë­·pûöm¨T*œžž"£V«‰"÷•W^A³ÙD­V“qÌf3œžžJ <…wÊ´³Ë–×ÇèªT*Ù°T…ü²x°>å\l¶¨Ú.‹Bçä›_g(¯]»&(T·ÛE*•’æE~œÈøìÙ3ä…ÃaL§S¤Y°.ÿx¢€¤¹F¼òÊ+¢"­V«R¼s$)›™$Åò¤âB'SºÙlÊúÕÕU™Ùí???‡ÇãÁÖÖ†Ã!ö÷÷a6›‘Ïç¥???G:–ÏaŽN§!"¤$¸ +1oá¦%û€ Ï`0`ss«««R P/ÅTh,g~-¿ôz½0ê[­‰ŽŽŽÏçÿÇxÏ´˜7!¬—ž©McVÁßS.—ñ³Ÿý «««rÈüºûCI\6³Ù,4ƒÁ ƒ§IybqHõg,Ã`0Àáá¡öø"4:›ÍP.—¥‘Ûjµp||ŒP($Œr +ŽŽŽäÇòE6…ÏçÿøEÌf3qFp»Ýøҗ¾—Ë…ÓÓSlmmassS +T¿ßgϞ¡Ñhˆ}—Ñh”[ŒµM¿ßG4•T€c_ ÙÅbR©¥R‰ëׯ õ‡{ggG¨8ü~ÍfSŒE­V«ôÏ8_xù`"A­ 79âè—Ń½F +yú§R)ܸqëëëò½©Xfm™H$¤¶[îv»]ìííÉâÞÛۓæ/¥T\d³YŸ–ãqvv†x<.¼}†¬£`0ˆÝÝ]Aü(-—ËÒ 8Â6ÑrºH2Ô:88€Ïçû¥ñ`M­R©¤óx<˜N§(—Ëxíµ×¤ÕÍfíý¡ænãàîP($^rppp€7n ‘Hˆ% ø~¿/jÖ¯ýëxþüù•“ÊZ±p´ŒÉdÈxY—N§ås©>]&t’›ÈAãgggðx<(•J"ìõzÂçÛÛۓæ$óir"§Ó©Pv–OÃ/}éKWb¹P§Ó© ûÙÏ~†»wïâòò³Ù +++Ò'#•‰í“É$Ú(ŠS3™ŒP3™Ì•MFíÁ–û÷ï£R©È ó_¯»Ý.’Éä•l‚,ŒýèGðx<ø‹¿ø éÕí#·ðӄ[Ž6â¼d¿ß/ršB¡ 4;ZÉ]^^"‹Ó¾µµ5!•óf ˆSb8àB¡Pàþýûxüø±¬Çét*¶Ô=òFdí8™LN§¡Õjñ­o}K¼BR©Ô•x°Í6@:ò@4E±X„Ãá€Ïç•D.—ûö‡²Ñh N‹›Q"‘€Ùl†Ãá~Z*•’ü•BÊB¡ ©Ä`0@³ÙÄÚÚڕšŒ©âÞÞšÍ&´Z-l6îܹ#ðs¹œðçó9R©”ËiË`0¦§&^¿~]]3™ ¶··±³³#f/Ÿ—›gù”§D4g§½½=iÎZ­V\»vM”Á”øj·ÛrÐÄb1ܸq?úяL&‘ÉdÍfà¢ü…sü^/Ö××±¹¹yÅ.€ƒ:TAd³Y¬­­a±X`ggG¦g’^W¯×‘ÏçŇ9]d©P($Åfl–E»dïS!°··‡½½=”Ëe<þ\ìܚÍ&NOOQ¯×ãý¡ÜÜÜŸÃá@¡PÀl6ÊÊîî.Âá0¢Ñ(|>Ÿì~Ne¤áH0¼rR-lŠÅ"~ðƒ +…ÖÖÖ°±±[·na8âñãÇBy:99¹lææwîܑ<š ßJ¥‚íímapVç÷j4q)›R©„½½=¡ÉÐ׏òw¦[„çé£Á‘«ì©ñ&[„MoƒÁ |Èv» §Ó‰ÕÕU™ˆrëÖ-Pn·Û%•á3³ÙlÐëõ°X,²ˆS©šÍ&nݺu%½^©T +*• +'''âu²|[î¿wïúý>¶¶¶J¥ðOÿôOÒzˆÅb⸼x™>F"Ôëu|÷»ßߔ@ €V«%ÈaµZE*•ºYùOŸ>[®ZÐÆâèèü±ÔÕl•ôz=É.ØD_Feys/$œNãóù`0P*•¤ ‚?Æññ1Êå²XÂ9N„B!ißüßØj·Û×_{{{úàE"™ÙDp•J%ƒ Øí¾ÿ¾8ú,çôlÔíììÈ¿?==•Ñ£„QYèÿä'?Áññ1.//¯œÄìU)•JüÝßýòù<ÎÏÏ‹ÅP©Tpyy)€›Éd;w°²²"Sz`áÁ˜\´ßû½ßC$A Àóçϱ½½-`9…$ƒîíí!àââ6›Mê¾Yõ4éaÀ—O`Jb–{‹FÈ­*• +_ýêW…º½½-ua4 òßÿ}œŸŸ_I³ }þóŸÇ‡~ˆ¯|å+¸ÿ>šÍ&ÎÏÏqqq!VjD&—ãǙeôÅ BúéÓ§"¥aëv»1ðäɹ¡™MðöàáI ˆ[8±ÎÎ΄¾¦ÑhP,±µµ%ƒû–y¦Ô+N§Sá·~ë·¤n&!¹×ëÁl6‹•µoäd’ƒ‰DDÇ¹Ï¿éþPw»]iĺÝnÒ‡¦4©TJè>jµét»»»P*•ø×ýWÄb11ç_²V«ÅÏ~ö3˜Íf|éK__‡G ª¨ÑhÄ3ƒ|<Âf³‰ì# +R‹ÅËåpvv&ý*ÇƒD"!'e¡P> y”œ#Ì[ŒßÓjµ"`0àüü\¬"‘r¹œÔ”‰D¯½öšÈ83™t*ÒÌh°É†&‰Æ­VKÒ +³ÙŒL&s%Å&ÐB/‘z½‹Å›Í†Á` NOÉdRdô“Éûûû{óE6y¿ßÇéé)þê¯þ +Íf?þñÑívñöÛo ³ÿôôÍfó +jÇø)\__Çåå%NOO¥õÀZ•‡èòMÅ ÄZo™AÁf0oŽ|>Ç›Í†>úf³Yüé¹c±˜¸Z-?3ʳ¸ñ˜:Ïf3µD‹À[:F*•’¿ ±³³#ޒìÙrâo²?Ô¼n)<Fb–ÂJ¹\¾b&ât:áñxÐl6Q*•àñxÄpeùE§ZjÁÈí+ +H$RR¯³|:qÁ²/‰`G~P·ÛÅÊʊèšhj³Œn>yòN§7oÞÄþþ>åÁÑ:Œ‹+ "NÃëõ +Á€òć0 Âh¿~ýºlb2U8µÓ\ZËQ.Do“å]¤X –Ëe‘Y(•J +X­Vq­âB …(šÚX­VT«U$“I|å+_AµZÅÿù?ÿGäz’y¿Ìø àb±Xpxx((){ˆtcìI[¶àÿ2]d å÷û¯ØK0ýe”ýÍjµ*©éåå¥Ô¬Ë/Nz¹¼¼Äõë×ÅA*•J¡ÓéÈ÷#ВÏçeÓ³¥aµZáp8„0@äù7Ýj$›ÍJqIò-eޔ·sÇSR>±²²‚••$‰+ÖøbξººŠv»ÓÓS‘•ÐzëÓþjµ@@ÆýÜ¿ßùÎwP.—åôyüø1>ûÙÏ +»áÚµk8??½k'ª¶Éãã ÄáñxwïޕïÁô‹°ð²)ŠÕjåu½^Çúúº¤|TýR:Ab)Õœöa·Û%0¿ÈۃñX[[ …†§¼9éV­VñôéS\y—Ë…`0ˆ@ »ÝŽoûÛèõz(‹899Íf³΄ŽÇãW6g#¯¬¬È­;NñÆo X,Šø•Eÿl6C0D§ÓÁx<– Búo%n`ZPºÂM¿³³ƒçϟ w’¾õl{,›:-³dˆ ŽF#ñ!mkÙ_d9=çaÎÍÍõÛï÷áóùpyyùï5{1šÍü´R©\ܱxä蝋‹ i–ËeL—<ٍ™LF¨E<¥>ý°X§Äb1!y¾óÎ;¸}û6NOOát:ñ¹Ï}ßûÞ÷D¨HnQ3*«kµÅZŽ~¹\–¡ÝL©t:¶··Å²ž„î9a„¹ør:DfÁêêªØYºg;ƒü¾ÍÍMQ~ói? ópÔì`0€R©ÄÉɉ¸óv»]ôû}I{i…À öh4 +Fƒ?ú£?ú„C§Vãý÷ßG©T” [ö.)ñà­T(àt:qíÚ5ìîî +dÿýï¸}û6Þ{ï=ñwd£ž“Åb}ëoúxF#¡N§›Í&Ýjµ*h%‘ÜN§#³Ÿ—7OF™Z³œš.±Ù®àå÷žL&xe³Y„B!üßØjœÐv$A­VÃêê*†Ã¡xA«vtt$b>½^/1AŒåS‚Å?5I\MÂ0sýe^£ÑˆP(„·ß~÷îݓ¹¾¾ŽT*…üàB²e h7@û3ׯ½öæó9úý¾<øåF&9pkkkÂE¬T*’JFܽ{™LÅbñŠ-¹ÍfC<Ý×ññ±˜ö0˜Ïç(‹ÂvÉçóðù|¢îV«Õøàƒ®Ô*¬ÉȓT«Õxòä‰h 8M’òšå°X,†x<“É„/~ñ‹Â`/‹Ò¬w»Ý°Ùl¸¸¸Ù¾×ëýoé"Ä +…þöoÿNGê§B¡€Ñh„?þã?Æp8”´Z¯×KíI¿G:Ÿ!—ËáââápXâV«…·Þz ƒÁ[[[Øßߗøòwa“<þüJª¨P(„äëõzqrr‚h4ŠN§s%í£ºšœUÖ~ñx\tuõz]ÔÝÝnWÔ¿îþP–äµ9 Ç¥'A×Ør¹ •J%j\.NûX6ž\þñÅb¯¾ú*Âá0n߯–& IDAT¾étŠGÉàÿøÇ¢\žL&XYYÁüÁ  + ªöꫯJšDuíêêªþ·Z-!»ŽF#lmm! +a6›!™L"ŸÏÃjµ"•J]éq@^,“áuÝJÙ>{läÑQ¤JR±XÄÙٙ Ácó™T 6j9c+•JI¾NÁà§)Bd}8Q“yÀCŒMf…B! +nzgºÝn¼ýöÛðx<‡Ãè÷û¢1£â—Œ‹Å‚D"¯×+ úåC’é¢×ëÆÌo¼@ |M4ívétZ4bOÞ¸q{{{x÷Ýw‘L&…3Øï÷EþÔét`2™DûÅþ']†Ãa, ©å?Í]díùúë¯ãÁƒ’5ðÙQû×ívQ.—Q«Õppp ZC¶ŠàääDÌ}˜ùüÚûƒ­„à™¿rî/;õ$„r’ ÙçdqP†¾|º¢5™LBÁùÆ7¾ ŸÏãââ·oßÆÑÑ +"‘¶¶¶ðÏÿüÏbÖòÚk¯áìì ÉdRš€‘HOŸ>ŠõW+++÷’Çæõz¥®zòäÉ£ +<)Ž,•J8??¿"6eÚțƒ·>ÿ™ô7ÞxCܱXøó&bnyJ ½E–©cË2ÊDŽežý<Ȥ™N§R¤ƒA1+b¯‹Òétâðð———0›Í¢Ã#âóùD·|H’SÈÚëöíÛøìg?‹b±ˆóós‰G4•1K¸>þp:’BôÑGâ§È>×l6ÃG}‹Å‚ñx,uk\Þ<€çϟËùet‘1& u43(–&óù\²ápˆÍÍM”ËeܺuKRQ¦³üÿ¿éþP“Ä»ì=žH$®8Q&Ïi‚$¶Ò#‘éÚòD滄¾™k3ƒ¢Cóx<ÂõbÁúà‡?ü¡äõù|ÿò/ÿ"´£ƒƒ8ܽ{ÑhT +S‚cqNOO¯˜x²QKGZš‘rEq&óxJ)8„·¬Á`q=Ëu&å0³Ù n·[Ná½½=iz//’åúb™Áð7ó7ØßßÇ÷¿ÿ}looˈ£¯|å+âFT“uH0D2™„Á`@¡P2‰HàÉ°§X–àÍ2]‰Äh4;w ññÇ‹MœÉdÂÉÉ ?~,-Š>úN§ׯ_—  »V«I¯Œ5æT*u…©â÷û1ŸÏRO$â±ÉóòM6¥eÃì€1ãÉxUòøñcÇ8¤ƒSs‚Á ŽŽŽ’ÿMö‡šìú ƒh·Û˜L&²H:r¹œ°)R©”(K}>Ÿ°+–ƒ¤×ë…SF X,ŠE×l6“éö‰D+++ÂuËår²èÊûþûï ¨ÛíâöíÛ 0™Lâ7o±Xp~~.'R>ŸG"‘@6›½Ro®3 „ŠåóùP«ÕD`j·ÛÑn·áv»¥%@_½Z­§Ó)è%½þ írr +‘/§Ó)Dgҝ(åù4]©Tpýúué÷üõ_ÿµ ÊS(ˆF£bJD.•JI­Kç䋋 ¤Óilllu*“ÉHL ÖÐ\v¦ÔŸñ(•JR§ñ;>~üf³ÛÛÛèt:ØÝݕxð÷x<KÂ~&“ nܸ!Ên >ŸétZ@,ö5].ž>}z…ô@^+¹L º]^^Ân·‹·?g5°ßåt:dy°X,‡¥¶üMö‡: ›Í +»¡X,â3Ÿù ’ɤäç×®]çY^rpª_t“qÁìîîÂd2ɬ^zø-ç¯øMÊÔb±@:F(’ÓÔl6ceeEЦeÿs +!«Õª è÷ûˆÅb8??G2™£¦n@@,íŒF£¤UG<™rµZ­OF“þºÏç^ÐÎí·û·ú5™L’š’˜|~~•J¯×+sèÀ^®ù̕J%ñ­o}K¸xjµ¯¼ò +’ɤ¬é‡á÷û…ÅÂÙ\´WcÚÅѬ¼)³Ù¬X#}Ú®›Ï–õ7u‡œ³LíÓjº(—J%!7Óä‡ ™¤^~'Xä4Òº`_ HF£<ßgϞý7ôÖÖæó¹hÜÖ××Eâ¤×ëq~~~ås鵇¥ÇÈç•J¥„:F£_w¨¹k94W -½®]»&·MµZÅÚÚ¢Ñ(2™ŒðÀ8³‰Þ{|Ñä…óÏø y’ü?íYSÛé™öobЊ$$@ƒñ†ín·S§&NW¥jªf¦æd²U–“|¾A*‡ù"ÉA*©¤;®ôô¤Ûv³X€¬]BB BìzÞù]%œdÞtú=¢ðQ¯¶Ðóÿ?ÏýÜ÷uý.jbæ?´¬‡ÍÏÏ["‘°_ýêW¶¼¼lóóóHrÒ|hfvi=ü~¿Æð;Øx|>ŸÆ ‘HDšÑ££#٘ü®á¤zÓ´‰¨wyyYœM QlÅP݇B!EI=}úT´+”úT _õýpüøÇ?^Íçó—r¶À¯ŸŸ×fãv»56ù[ëö ·ÒÙÜÜ´f³iËË˚±ñÒÐlà3ãà&ƒ¬÷N®y4àÝ ü¢Ú€Â¨àððPò1bj¿êûџN§eÁ =…¥!‡mnnN"–mNZÊLÝ{ÂÞ›¦Ói5.€bÞ¾}ÛÂá°:@xŒFFFlmmÍJ¥’ýö·¿ÕΊŒ¡",F”„HàSë»\.k·Û–H$. ¢{[¶˜ý¸Çäóy+•Jvrrb›››2B &L{ ‰DdˆÅÊ–ú¿·TäÄ!–•õ@ÝM) +…*­×ëb% ˆ¦Ä¬n||ÜÆÇÇ­Ñh¨s:22¢î"âçÅÅE•÷üB5??oñxÜ&''í£>²õõuÛØØ\hppÐjµšÖƒ\jփTP^ÜÞ¸Ñï~÷;EYMMM™×ë•A—áX¼Þ_N§Sw9þ=(žÃ`0hù|^ +փ,ìb±x Ýpvvfÿ?ޏvÞW¯^i—&Êív[,ÓîóùÔaCPÊüÀétÊÌØûƒ³±¸$h”J%í(N§S`Ô±±1iÔÎÎÎ,ÛÙٙ•J%ÕĔę҉k·ÛºÄ·Z-5$(_Ù­#‘ˆÍÎÎ +§Ì †ZÃívkþ·¿¿oápØÖ××ÍétÚ½{÷d΄`Ûn·•2I3ÀëõÚÔԔ(K +Šò"râ¿ùkssSJ·Ûmù|ÞÂá° ÿ¯õàI&“"CE"1JºÝ®0ÝtÏÞtÓlB­Aö6/{¡P°ééi½œ¨aÊå²Ý½{×Tbñàõ6Å°ñ‡B! ™Ýn·†Ê”á̹`N}Ó´‰^pppÐ^¾|)[ +ùxŸÏ€Œ§œL­VËb±˜† ëëëò°Q~Ñγ{÷îi¦Ó{z0T><<´Ç›Óé´z½.Ç.˜7×N"<6‚½½==Hx¹Ó°› +=½•Èéé©mllèŸ3À¦Œs8šsmmmÙáá¡P ñx\0ÑÞö=φËåX––;Š÷óósÉ´zטRïݟ± +˜AHb„òðÛÙÙ•Šþ³Z·Ûm+++šâOû*ïëÑ?;;k[[[æt:-‹i·Åb–L&ÕR/•JÂjÑí"ûɛ6Ôì´¾IsAè٠觃599i‘HDÌ<” Á`Pª"l+•ŠvlÇc[[[Öh44: áÁé477§ShrrR ¾ RVÚí¶Íü·”P(͙ót»] {ùË_ênùÙgŸY©T2§Ó©Ÿóüü\.m.Ͻs20i³³³’nÍÎÎÚææ¦Z__Ÿ•J%ÜÉnÇk‡ª‚4¸NG%Z$Ѭ¨P(\’+áóûýò3óÊår–L&5ô†çQ©T$4ðûý’U“ë½N0òƒj߇B!¡¿éNCñe{Sô@W‘n/–\Ð¥RIÅ/^È×Ƚ½ÛíJȀ§ŒÍý}?z×£Œ6í`EÍfÓnܸ!hã͛7Íív[6›µl6k>ŸOe.dù½¿PࣂïÇ ;;ÆÉ`0h>ŸÏ\.—°c”(wîÜ1§Ói}ô‘vóããc[XX°n·k¯^½RÐ@žÞÝÎívÛüǘËå²7nX©TÚ›M³Ù¼Ôbž7>>n¯_¿V{†󚽽=™)£Ñ¨²­¡d}öÙg2.,,Øøø¸ýñ@³·YD÷æ·Ûµl6k¡PH;ø‚<^(8z!±”2Ìuô]Äz´Z-k·Ûz1z…·l€”êÒҒœœX:õybbBÐÙ­­-Å`õ"Ø،¹#“F‰ˆ’‚çn?X+½¿xø!G§R)K¥RRœüùÏ։åv»UØòò²MMMٟÿügUŒ6þÑ÷£w=`ÞÑmÁÔH4vì"½š°z½n.—˒ɤµZ-K$2U²H~¿_¥b/Ñ‚R__ŸE£QQ_Ab³ Œ©u\.—­ÛíÊbÂωÑëõZ2™´t:métúñ + ÕîËeµéÏÏÏ-JÝl6e’d8‹ öääD TÒAã€¾µµeÃÃòƒ`‘Á$é÷û-›ÍÚÎΎ +-Jï%ž».É0X*âñ¸fZ”J¼ d5ûý~Ù<<år9´7n\Šx¢B@Ñ+=덷­Õj–H$¬¿¿ß²Ù¬:y¢T¥R)óûýq€:Ïd2J²U÷š\o8âòupp qL.—»ôÑ½½yó¦¼w¬ ê½zU̔gggòmË8 ^¯k~÷eߏ7×c ‹ÙgŸ}f‡‡‡ +…ìáǖH$„Ñ¢”á®@Ë·ëþðͯzUÔô}}}Òye³Y8¢Éۚ˜˜PûøèèÈîÝ»g©TʊŢMOO[¹\V§,r>Ÿ7§Ó©Å£>N¥R—fO”–¥RIò™?üPô½{÷TwS.î€l«× +“H$¤yÓ6ƒÄgjjÊ666Ô ‡ÃÒ +f³Y{ñâÅ_@:qjg2±™™s»ÝöâÅ u7éàú|> ƒ¢bqÇèÈ]T@/½¦jú—/_Z©TºtcýèÇãqk4–ËåÔЈF£RÏ3·Tî6á|kkk²!õ~_$UÆb1Ù_¶·· "„Âápˆ¸½½-Fïïåt:­X,*•'›Í^zIãñ¸}ñÅ*Açææ”8va||\ž³¥¥%k·Ûö¼D{±Ž[·n­ Ù‚ŒŒX¥R±ÝÝ]Ío˜}y<ÛÜܔ>+•JY©T²µµ5ÛØظôÀÑ!óx<²iËÅÀ–/w †€Ì0Pàƒ¢ì!yü,Œt:ý‹‰D´Ðh4”Cˆ!wF~Næ]ü.—ËööölßþøÇ?Z2™¼T®€#ácxxXFIû ÏÏÏíùóçöêÕ«¿Øgx<¥—¼xñÂ^¼x¡q­ï™™+‹¢ë +²p8¬!.ÆS,ŒH­I¥RöñÇÿ5¥\ 0Çcù|^ó*Æ+4@òù¼Z„³Ù¬ýéOÒÙ+kC|Ôu$ºZ­Jqr0—ËÙÚÚÚ%W;ê :z|xÈèXE˟ 'êþª¯V«e;;;öeÞÔ=ù|^ë1@§fvvVü§OŸênïýøøØâñ¸°}}}¶¾¾.–n·k£££Z|èTGGGJ$ ‡ÃÖjµleeEI“ÐiA—J%›žž‘™æHßñxÜ^¼xa_ûÚפ ¨ÕjæñxtBòbÞºuëR¶u¹\ž€Y +»'‚h4*åÿþþ¾Œxœ¨4`’`ù¨V« mggG³¼MÌjh¢°À‡Ã¦¦¦Ìãñؓ'OdÏùÏÿüOûä“OÅåeeE6 Ô6©TÊB¡6‰b±x oÆÅû 9ÖR¿àS‹F£ìîîÚ[o½¥Nr¿-//[4MÌ^¹\VìÒÙٙMLLˆ‡áñxô¼„Ãaóz½699©—ŒT¡L&c·oߖ¢(•J]8ÓÈà4"ó€ö‡jäCC…® b‚l6+d›†ÌT*¥´Ò/ó~°™òYR©”9~úӟ®NLLØÇl‡CmmŽÞ`0(é’'¾¨jµª{§–ÇãQª&;<÷­““Eðt»]«V«¶°° ™öjèÑÑQiÿ0-F"‘K0ö/..ì­·Þ²b±(‰N,³±±1]èévñ°‚ï^\\T›øõë×xCf£9@®ðÔԔPe$¢„B!)_¿~­&w„Ÿüä'Ößßo‰DBJ³×ëµÁÁA•t{{{:Aéüö–ß$µ’˜‰î±V«™×ëµÅÅEѾFGGíóÏ?·\.g vxx(|Ò¾³³3¶••{ùò¥}™÷ƒÆ§ùÅŅ9nß¾½Úét4`ˆFc‚Á%ìz˜$\°3¼õÖ[v÷î]»¸¸°¥¥%»sçŽår9ã8]ŽŽŽlkkË<<:årYÁ {{{ÇÕ¤”›™™Ñ‘WŒÏ…ä†Ùð>; Õ‹‹ ‹Åbr.OOOÛÑё”åøˆ°%ì­ÓéØþþ¾ƒA‘ª@•ÑU}çwìââÂö÷÷u!¥“ÙÐää¤ÿ½ÙØKKKò5‘á i ¿„-îR4~þÚzT*»yó¦5›M JyáäÞ»œô˜Ri&0 s8š}"Øm·Ûö駟ڻﾫ{Ûÿ¶˜1‘â@/•Jò÷Ä| Á8 ™m=¸~0°>>>¶Ç [7==mÝn÷¯®Ç?ò~ô®‡ãɓ'«üM¹\¶ÃÃCåf¡ºFÝqtt¤K"`âRÛí¶ìú¹\Îîß¿¯Ë*ô&äÿP‘Úí¶0Ù^¯W¤')e1ÀÕëuI”B¡B顨xöì™ [6›•âbppP‹†M¦7ëøø¸% Qˆé^ÑiŠF£¶»»kív[§®Ï瓉!, I0Ø<’ɤÅãqóù|öêÕ+»uë–.ô€e(ÅQƒ€³kµZÇ…F@Q©T„sèS`LÌçóöàÁƒK˜pdeÃÃò֠å㞊•a:P$²˜Q¹ ¤§‰‚5ɳgÏlddäïZéàÜn·Ö·2°ßïWb£‰¿µccc6::*$ÖëׯõŒommÙòòò% ª/û~ô®‡ã?øÁêÚښáæççՙ +…B²œ÷֘øjðQkÎ:==µX,¦öf«Õҋ‚ÎÃâ^·0¡z¢¸tú|>Í>°VÐ%üàƒÔ­CkÈðüZ¥R•ùRµZU{˜[NeþÝÄĄJ +.Û|”a4isʏY4Uøß͛7mmmͦ§§m}}Ý|>ŸTù‘HÄÖÖÖTÎý­õh4Ò>b¶d=賌-€ïÐðøßփv>.3Ì^êoïz  ¥ùÓív¿òz€` „SçW]z‹‹‹¶¾¾®õðûýj¸°_öýè]Çw¿ûÝU ‰maaAG4júJ¥b‡‡‡ + †cŽˆÙ5/AÖ¨“3™ŒMMM©•ÇÍårÙÚښëÈ200 »\¿$Wù|Þ"‘ˆ2±ˆ2=99‘à“ ¯¤%üD½ßՁ8ÀށøââB-|JšL&cwîܱóós5-@°£Á„÷x<¶¼¼lµZMߕËå²Ï?ÿ\vy†Ù×ëquÖÃ199¹ŠQìàà ÂÀ}>ŸôrÝn×~ýë_K~Ã.¨™ÆÕIDATÐÍëõŠîK‡…úždLZ»dôâqBõžN§U6ré$B”ŤnO¥R:žéƒAk6› +xcøMH]<؂½¡ñØ€s2sAÉ.ˆyx×jµªpAÔÌ©PŒ ¦ ښ…R©d»»»æp8ìÙ³g¶¶¶¦Ü³ëõ¸:ëáøÆ7¾±zpp`7oÞà‘#–äp^­VKR§ÅÅEé™± Qr¹\R«ß¸qü^¯Ž\”äyÑ=±‰‰ ‰‚Ùˆ‚©NšQ¿ÝºuK^ µµ5 A³Ù¬þߙ™]¦=æ^½æ>\ÙápXêï³³3•’K{ñ¸[Âqìt:–ËålqqÑnÞ¼i}ô‘Ô/[[[º˜'“I«T*6;;k>ŸÏ>ùäá®×ãj­‡ã»ßýîj/”|0´ééiù­Ø ;ŽÍÏÏ[__ŸKõ^™ >Lò´¦¢¦ÀƁÿ‰‹ÿá᡾,À$0ïP6›M)E- +’f%“I«Õj‰Dìøøø’¶òòñ›¹ÃÔøÐ`ý~¿2€{Cé€_â$@–lggGƒÐjµjñxÜ&&&ì¿þë¿ìèèÈâñ¸4tç°Á\¯ÇÕYÇw¾óUZäänÁt§LÀJ¢ÑhX©T’‚–‘¢ Èår +Å]«ÕäÇ¡³„ݝݶCZˆºLóù¼ÍÍÍÙÌ̌J$[•JŶ··íƍâ‚`íGغ³³£ðt´et¥ÊY8V}Ïð¼ÓéHU͔ŸîW4µv»­NXî±±1ÛÞÞÖ]¤¿¿ßÆÇÇíððPˆ¸¡¡!\àgU‡-åz=®Îz8ž>}ºê÷ûUcÖëuiܘO9NÛØØ°ƒƒ!Ԙ“¸Ýn)’00 {@¯8õôôT¿7_2–J5Ç£Yäb†»ããã +’»^«³Žÿ÷_­×ë’Ó RÙË4$g7‹©Ì˜žž¶Ï>ûÌFFF,HlI}Mö1ÆG šÔøÁ`PÙYÌ'P5c〥xrr"z®Û햤ˆ.£¨¨÷öö,‹É͊ÀJ1Ÿ› j‡b±hÙlÖÊå²ÍÍÍɲ¿ ýd±X‚®¤,Z×£££æt:¥&èÍQÛÃr¼^«³Žý×]å>??×Àb¤ÓiÙB…P·Ã«p»Ý644d…BÁFGGíààÀb±˜h=gggŠ6eC; 4^¢HŠÎð™ +…‚Õëu›™™‘L†¬âF£aÇÇǍFE=Bƒ·´´¤äÏD"!fæóyµ—Q>…O‹¼/Ï̬P(X$уË}¨Ûí*õ£ÕjY«Õ’Ï ˜ ì‹ëõ¸:ëáxÿý÷W1!âP˜˜!µ<‹‹ÅÌáp(/ ܾœíím”cl£s}‰<+v D¥ØÒq`÷š8É8æR wèSZÐcccr`%á³ãØ4ƒ£ÜZ>Ÿ7·Ûm"á|mµZ +…„7s»ÝÖét,N+ vúýû÷¥(²½½=K¥RŠiÂAÌŠ-ãëõ¸Zëáx÷ÝwWÙÝ:Ž¥R)±+ø ìf_¿~m‘HDA১§V«Õ¡v¦Cû-e :;f )'&&d7sÅy·Û•G«^¯[<·r¹,a1¨m>7ž) ¨ÌgÍÎΊx +"¦FhkµZUÍ jÎ<ùññ±,<b‘$ q(|>Ÿ~Žëõ¸ZëáøḚÉdlwwWrb±(`ðþýûV¯×ÅJàH„C»jnŽZ”Ø|q`¾¼^¯lX.\.—.½ü>ÃÃò͓Õ íÜßßWZýÑё˜ Þ°«“ƒª» BU,Ü 0!òsPhHK›Ðsî(иÎÎÎìÝl6-*Ša)ÿ}:¶H$b×ëqµÖÃñäɓÕ\.'U@2™´`0(¼×Ö֖þšé;"Êóós햄RÓ¶ÅóÃ̑Nˆ9󗓓µmÐPÎà?#èûLPp;;;Ë øN§ÓÖh4t™6›Í*Œ$özœ¼õzÝæçç•f‚º«G8S±^¯Ëå÷û­R©X$ƒ‡ùüü\UýP›hg³Y»^«µŽï|ç;«·nÝcáöíÛr·f2›˜˜° î0£¥Ói+ +Š "œv&íM¢ˆ(èÈD£Qk4ò…Ãa[XXPÈD¯€‹ËåÓæü ½J¤œ ÀFxJîï½{÷l}}]vvKêê±±1Ëd2ÔÀÂh4 +êBJè:,óóós;;;“Ö5H4ÈL\ÔI]á3ÀŠՒò# Z,³ßÿþ÷ffV*•”ê922¢ÈXÑ×ëqµÖÃñ½ï}o•YC>Ÿ—}š8"Ó蟷‘‘u¤èXa$A%üß<ßÿz<[YYQÇhppP*¬ôÀ¡U* ƒÇ-™LjwëÅi#²ñ •Ü,hÀï¼óŽ×ëqµÖÃñoÿöo«;;;‚uîííÙúúº¹Ýn¥g0ÔD&S©T´s`ý&*>")333ff–H$´H'''ò7Qÿf2ï‘w¼»»kvãÆ á¢¡ø²«–J%ÙÒ].—>/‰,\äA(cV¤íœL&ÍápÈUKH*pf6ÙlÖNNN¤0@žÔn·-‘HØÒҒˆÅ@V¹ƒµž˜˜°íím¶¯ýërâ’4Ã\æz=®Özôýüç?ïÂ-8??חð\¢Ä5›M»}û¶‹Ek4aW€©W¯×-“ÉØ«W¯ìɓ'Ößßo~¿_åž'j~ÂêHí¤Ü™ššRkÚåréKæB^(¤#cÒOØs\³p'ì [­V“ØùN(RÖñìì¬íììhG¤Á@ô-ô‘HćÐkƒƒƒ6==mûûûb­ó]ƒ¤¦Ä¶f³i×ëqµÖÃñÞ{ï­ö’„°O×j5ËçóB “ŠQ©T¤Ì†¼…¤ çŠÅ¢•Ëe›˜˜°ùùy)ÄÝn·hF쀔ކ††¤gCKÇ•º¯¯O‰†Ð„HžžžZ4Y í._¯×+Í"¨jZߝNGVy8¸l ;@ +ôüùsóz½ +°óz½655%5w&“[ãôôTv¹¹9ùµ &_¯ÇÕZÿdDÿÚ³{VIEND®B`‚--TEST-- +pecl/http-v2 - general and stat +--SKIPIF-- + +--FILE-- +enqueue(new http\Client\Request("GET", "http://php.net")); +} while (count($c) < 3); + +$h = (array) raphf\stat_persistent_handles(); +var_dump(array_intersect_key($h, array_flip(preg_grep("/^http/", array_keys($h))))); + +unset($c); + +$h = (array) raphf\stat_persistent_handles(); +var_dump(array_intersect_key($h, array_flip(preg_grep("/^http/", array_keys($h))))); + +?> +Done +--EXPECTF-- +Test +array(2) { + ["http\Client\Curl"]=> + array(0) { + } + ["http\Client\Curl\Request"]=> + array(0) { + } +} +array(2) { + ["http\Client\Curl"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(1) + ["free"]=> + int(0) + } + } + ["http\Client\Curl\Request"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(3) + ["free"]=> + int(0) + } + } +} +array(2) { + ["http\Client\Curl"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(0) + ["free"]=> + int(1) + } + } + ["http\Client\Curl\Request"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(0) + ["free"]=> + int(3) + } + } +} +Done +--TEST-- +pecl/http-v2 - clean with name and id +--SKIPIF-- + +--FILE-- +enqueue(new http\Client\Request("GET", "http://php.net")); +} while (count($c) < 3); + +unset($c); + +$h = (array) raphf\stat_persistent_handles(); +var_dump(array_intersect_key($h, array_flip(preg_grep("/^http/", array_keys($h))))); + + +raphf\clean_persistent_handles("http\\Client\\Curl"); +raphf\clean_persistent_handles("http\\Client\\Curl\\Request", "php.net:80"); + +$h = (array) raphf\stat_persistent_handles(); +var_dump(array_intersect_key($h, array_flip(preg_grep("/^http/", array_keys($h))))); + +?> +Done +--EXPECTF-- +Test +array(2) { + ["http\Client\Curl"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(0) + ["free"]=> + int(1) + } + } + ["http\Client\Curl\Request"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(0) + ["free"]=> + int(3) + } + } +} +array(2) { + ["http\Client\Curl"]=> + array(0) { + } + ["http\Client\Curl\Request"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(0) + ["free"]=> + int(0) + } + } +} +Done +--TEST-- +pecl/http-v2 - clean with id only +--SKIPIF-- + +--FILE-- +enqueue(new http\Client\Request("GET", "http://php.net")); +} while (count($c) < 3); + +unset($c); + +$h = (array) raphf\stat_persistent_handles(); +var_dump(array_intersect_key($h, array_flip(preg_grep("/^http/", array_keys($h))))); + +raphf\clean_persistent_handles(null, "php.net:80"); + +$h = (array) raphf\stat_persistent_handles(); +var_dump(array_intersect_key($h, array_flip(preg_grep("/^http/", array_keys($h))))); + +?> +Done +--EXPECTF-- +Test +array(2) { + ["http\Client\Curl"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(0) + ["free"]=> + int(1) + } + } + ["http\Client\Curl\Request"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(0) + ["free"]=> + int(3) + } + } +} +array(2) { + ["http\Client\Curl"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(0) + ["free"]=> + int(0) + } + } + ["http\Client\Curl\Request"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(0) + ["free"]=> + int(0) + } + } +} +Done +--TEST-- +pecl/http-v2 - partial clean +--SKIPIF-- + +--FILE-- +enqueue(new http\Client\Request("GET", "http://php.net")); + $c2->enqueue(new http\Client\Request("GET", "http://php.net")); +} while (count($c) < 3); + +$h = (array) raphf\stat_persistent_handles(); +var_dump(array_intersect_key($h, array_flip(preg_grep("/^http/", array_keys($h))))); + +unset($c); + +$h = (array) raphf\stat_persistent_handles(); +var_dump(array_intersect_key($h, array_flip(preg_grep("/^http/", array_keys($h))))); + +raphf\clean_persistent_handles(); + +$h = (array) raphf\stat_persistent_handles(); +var_dump(array_intersect_key($h, array_flip(preg_grep("/^http/", array_keys($h))))); + +?> +Done +--EXPECTF-- +Test +array(2) { + ["http\Client\Curl"]=> + array(0) { + } + ["http\Client\Curl\Request"]=> + array(0) { + } +} +array(2) { + ["http\Client\Curl"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(2) + ["free"]=> + int(0) + } + } + ["http\Client\Curl\Request"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(6) + ["free"]=> + int(0) + } + } +} +array(2) { + ["http\Client\Curl"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(1) + ["free"]=> + int(1) + } + } + ["http\Client\Curl\Request"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(3) + ["free"]=> + int(3) + } + } +} +array(2) { + ["http\Client\Curl"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(1) + ["free"]=> + int(0) + } + } + ["http\Client\Curl\Request"]=> + array(1) { + ["php.net:80"]=> + array(2) { + ["used"]=> + int(3) + ["free"]=> + int(0) + } + } +} +Done +--TEST-- +raphf test +--SKIPIF-- + +--INI-- +raphf.persistent_handle.limit=0 +--FILE-- + +--EXPECTF-- +## call provide: +bool(true) +## call concede: +resource(4) of type (raphf_user) +## call handle_ctor: +### back 'ctor': +#### arg 0: string(10) "data value" +#### arg 1: int(1) +array(2) { + [0]=> + string(10) "data value" + [1]=> + int(1) +} +## call handle_copy: +### back 'copy': +#### arg 0: string(10) "data value" +#### arg 1: array(2) { + [0]=> + string(10) "data value" + [1]=> + int(1) +} +array(2) { + [0]=> + string(10) "data value" + [1]=> + array(2) { + [0]=> + string(10) "data value" + [1]=> + int(1) + } +} +object(stdClass)#%d (1) { + ["test"]=> + array(1) { + [1]=> + array(2) { + ["used"]=> + int(2) + ["free"]=> + int(0) + } + } +} +## call handle_dtor: +### back 'dtor': +#### arg 0: string(10) "data value" +#### arg 1: array(2) { + [0]=> + string(10) "data value" + [1]=> + int(1) +} +NULL +object(stdClass)#%d (1) { + ["test"]=> + array(1) { + [1]=> + array(2) { + ["used"]=> + int(1) + ["free"]=> + int(0) + } + } +} +## call handle_dtor: +### back 'dtor': +#### arg 0: string(10) "data value" +#### arg 1: array(2) { + [0]=> + string(10) "data value" + [1]=> + array(2) { + [0]=> + string(10) "data value" + [1]=> + int(1) + } +} +NULL +object(stdClass)#%d (1) { + ["test"]=> + array(1) { + [1]=> + array(2) { + ["used"]=> + int(0) + ["free"]=> + int(0) + } + } +} +## cleanup: +bool(true) +resource(4) of type (Unknown) +### back 'data_dtor': +#### arg 0: string(10) "data value" +bool(true) +bool(false) +Ÿ ™e)6e!?JŒÌ—w±t,øcGBMB \ No newline at end of file