projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
branch off v1 as R_1_7
[m6w6/ext-http]
/
http_api.c
diff --git
a/http_api.c
b/http_api.c
index dbd8ab8452fc888ae1b1b9e3874f323884136f5f..6b01a3bce7d43dda465fd49e8f98de828e76c2c1 100644
(file)
--- a/
http_api.c
+++ b/
http_api.c
@@
-252,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 (!php_ob_handler_used("zlib output compression" TSRMLS_CC) && !php_ob_handler_used("ob_gzhandler" TSRMLS_CC) && !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));
}
@@
-278,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;
@@
-402,6
+410,7
@@
PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
int len;
while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
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;
php_stream_write(s, buf, len);
if (len < 4096) {
break;