projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tag 1.7.3 release
[m6w6/ext-http]
/
http_api.c
diff --git
a/http_api.c
b/http_api.c
index 4ab7d7edbd1862d4eb6b2ab41ef7eb0666907717..6b01a3bce7d43dda465fd49e8f98de828e76c2c1 100644
(file)
--- a/
http_api.c
+++ b/
http_api.c
@@
-6,7
+6,7
@@
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-20
07
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-20
10
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
@@
-109,7
+109,7
@@
void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
va_start(args, format);
#ifdef ZEND_ENGINE_2
va_start(args, format);
#ifdef ZEND_ENGINE_2
- if ((type == E_THROW) || (
PG(error_handling)
== EH_THROW)) {
+ if ((type == E_THROW) || (
GLOBAL_ERROR_HANDLING
== EH_THROW)) {
char *message;
zend_class_entry *ce = http_exception_get_for_code(code);
char *message;
zend_class_entry *ce = http_exception_get_for_code(code);
@@
-117,7
+117,7
@@
void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
vspprintf(&message, 0, format, args);
zend_throw_exception(ce, message, code TSRMLS_CC);
efree(message);
vspprintf(&message, 0, format, args);
zend_throw_exception(ce, message, code TSRMLS_CC);
efree(message);
- } http_catch(
PG(exception_class) ? PG(exception_class)
: HTTP_EX_DEF_CE);
+ } http_catch(
GLOBAL_EXCEPTION_CLASS ? GLOBAL_EXCEPTION_CLASS
: HTTP_EX_DEF_CE);
} else
#endif
php_verror(NULL, "", type, format, args TSRMLS_CC);
} else
#endif
php_verror(NULL, "", type, format, args TSRMLS_CC);
@@
-180,7
+180,10
@@
zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend_class_
copy_bt_args(old_exception, new_exception TSRMLS_CC);
copy_bt_args(old_exception, sub_exception TSRMLS_CC);
}
copy_bt_args(old_exception, new_exception TSRMLS_CC);
copy_bt_args(old_exception, sub_exception TSRMLS_CC);
}
-
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
+ Z_ADDREF_P(old_exception);
+ zend_exception_set_previous(new_exception, old_exception TSRMLS_CC);
+#endif
zval_ptr_dtor(&old_exception);
return new_exception;
}
zval_ptr_dtor(&old_exception);
return new_exception;
}
@@
-249,10
+252,14
@@
STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
STR_FREE(body);
return FAILURE;
}
STR_FREE(body);
return FAILURE;
}
-
- if (!OG(ob_lock)) {
+
+#ifndef PHP_OUTPUT_NEWAPI
+ if (!OG(ob_lock) &&
+ !php_ob_handler_used("zlib output compression" TSRMLS_CC) && !php_ob_handler_used("ob_gzhandler" TSRMLS_CC)) {
php_end_ob_buffers(0 TSRMLS_CC);
}
php_end_ob_buffers(0 TSRMLS_CC);
}
+#endif
+
if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
PHPWRITE(body, strlen(body));
}
if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
PHPWRITE(body, strlen(body));
}
@@
-275,7
+282,11
@@
STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
if (HTTP_G->force_exit) {
zend_bailout();
} else {
if (HTTP_G->force_exit) {
zend_bailout();
} else {
+#ifdef PHP_OUTPUT_NEWAPI
+ php_output_start_devnull(TSRMLS_C);
+#else
php_ob_set_internal_handler(http_ob_blackhole, 4096, "blackhole", 0 TSRMLS_CC);
php_ob_set_internal_handler(http_ob_blackhole, 4096, "blackhole", 0 TSRMLS_CC);
+#endif
}
return SUCCESS;
}
return SUCCESS;
@@
-347,17
+358,22
@@
PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
}
return SUCCESS;
} else if (sapi_module.read_post && !HTTP_G->read_post_data) {
}
return SUCCESS;
} else if (sapi_module.read_post && !HTTP_G->read_post_data) {
- char
buf[4096]
;
+ char
*buf = emalloc(4096)
;
int len;
HTTP_G->read_post_data = 1;
int len;
HTTP_G->read_post_data = 1;
- while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+ while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
+ SG(read_post_bytes) += len;
*body = erealloc(*body, *length + len + 1);
memcpy(*body + *length, buf, len);
*length += len;
(*body)[*length] = '\0';
*body = erealloc(*body, *length + len + 1);
memcpy(*body + *length, buf, len);
*length += len;
(*body)[*length] = '\0';
+ if (len < 4096) {
+ break;
+ }
}
}
+ efree(buf);
/* check for error */
if (len < 0) {
/* check for error */
if (len < 0) {
@@
-390,12
+406,17
@@
PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
HTTP_G->read_post_data = 1;
if ((s = php_stream_temp_new())) {
HTTP_G->read_post_data = 1;
if ((s = php_stream_temp_new())) {
- char
buf[4096]
;
+ char
*buf = emalloc(4096)
;
int len;
int len;
- while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+ while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
+ SG(read_post_bytes) += len;
php_stream_write(s, buf, len);
php_stream_write(s, buf, len);
+ if (len < 4096) {
+ break;
+ }
}
}
+ efree(buf);
if (len < 0) {
php_stream_close(s);
if (len < 0) {
php_stream_close(s);
@@
-549,15
+570,6
@@
PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int flags, http_par
goto failure;
break;
goto failure;
break;
- case '=':
- if (key) {
- keylen = c - key;
- st = ST_VALUE;
- } else {
- goto failure;
- }
- break;
-
case ' ':
if (key) {
keylen = c - key;
case ' ':
if (key) {
keylen = c - key;
@@
-574,7
+586,32
@@
PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int flags, http_par
}
break;
}
break;
+ case ':':
+ if (!(flags & HTTP_PARAMS_COLON_SEPARATOR)) {
+ goto not_separator;
+ }
+ if (key) {
+ keylen = c - key;
+ st = ST_VALUE;
+ } else {
+ goto failure;
+ }
+ break;
+
+ case '=':
+ if (flags & HTTP_PARAMS_COLON_SEPARATOR) {
+ goto not_separator;
+ }
+ if (key) {
+ keylen = c - key;
+ st = ST_VALUE;
+ } else {
+ goto failure;
+ }
+ break;
+
default:
default:
+ not_separator:
if (!key) {
key = c;
}
if (!key) {
key = c;
}
@@
-646,7
+683,7
@@
failure:
/* }}} */
/* {{{ array_join */
/* }}} */
/* {{{ array_join */
-int apply_array_append_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
+int apply_array_append_func(void *pDest
HTTP_ZAPI_HASH_TSRMLS_DC
, int num_args, va_list args, zend_hash_key *hash_key)
{
int flags;
char *key = NULL;
{
int flags;
char *key = NULL;
@@
-666,10
+703,7
@@
int apply_array_append_func(void *pDest, int num_args, va_list args, zend_hash_k
ZVAL_ADDREF(*value);
if (data) {
ZVAL_ADDREF(*value);
if (data) {
- if (Z_TYPE_PP(data) != IS_ARRAY) {
- convert_to_array(*data);
- }
- add_next_index_zval(*data, *value);
+ add_next_index_zval(http_zset(IS_ARRAY, *data), *value);
} else if (key) {
zend_hash_add(dst, key, hash_key->nKeyLength, value, sizeof(zval *), NULL);
} else {
} else if (key) {
zend_hash_add(dst, key, hash_key->nKeyLength, value, sizeof(zval *), NULL);
} else {
@@
-684,7
+718,7
@@
int apply_array_append_func(void *pDest, int num_args, va_list args, zend_hash_k
return ZEND_HASH_APPLY_KEEP;
}
return ZEND_HASH_APPLY_KEEP;
}
-int apply_array_merge_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
+int apply_array_merge_func(void *pDest
HTTP_ZAPI_HASH_TSRMLS_DC
, int num_args, va_list args, zend_hash_key *hash_key)
{
int flags;
char *key = NULL;
{
int flags;
char *key = NULL;