| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
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;
}
return FAILURE;
}
- if (!OG(ob_lock)) {
+ if (!php_ob_handler_used("zlib output compression") && !php_ob_handler_used("ob_gzhandler") && !OG(ob_lock)) {
php_end_ob_buffers(0 TSRMLS_CC);
}
if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
}
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;
- 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';
+ if (len < 4096) {
+ break;
+ }
}
+ efree(buf);
/* check for error */
if (len < 0) {
HTTP_G->read_post_data = 1;
if ((s = php_stream_temp_new())) {
- char buf[4096];
+ char *buf = emalloc(4096);
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))) {
php_stream_write(s, buf, len);
+ if (len < 4096) {
+ break;
+ }
}
+ efree(buf);
if (len < 0) {
php_stream_close(s);