projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
hack PHP_5_4 compatibility into v1
[m6w6/ext-http]
/
http_api.c
diff --git
a/http_api.c
b/http_api.c
index aebd434209deb323f2c2ba3dac0b73649f276222..aa5b97b88c056fe94be0f11311b06d2a98d24e3e 100644
(file)
--- a/
http_api.c
+++ b/
http_api.c
@@
-252,16
+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_VERSION_ID < 50399
- 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);
}
-#else
- if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_LOCKED) {
- php_output_end_all(TSRMLS_C);
- }
#endif
#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));
}
@@
-284,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;
@@
-362,11
+364,12
@@
PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
HTTP_G->read_post_data = 1;
while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
HTTP_G->read_post_data = 1;
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 <
(int) sizeof(buf)
) {
+ if (len <
4096
) {
break;
}
}
break;
}
}
@@
-408,7
+411,7
@@
PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
php_stream_write(s, buf, len);
while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
php_stream_write(s, buf, len);
- if (len <
(int) sizeof(buf)
) {
+ if (len <
4096
) {
break;
}
}
break;
}
}