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 5599ef5db845224961abc685fa3ad2375d56a70d..aa5b97b88c056fe94be0f11311b06d2a98d24e3e 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 (!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;
@@
-350,20
+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 <
(int) sizeof(buf)
) {
+ if (len <
4096
) {
break;
}
}
break;
}
}
+ efree(buf);
/* check for error */
if (len < 0) {
/* check for error */
if (len < 0) {
@@
-396,15
+406,16
@@
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))) {
php_stream_write(s, buf, len);
php_stream_write(s, buf, len);
- if (len <
(int) sizeof(buf)
) {
+ if (len <
4096
) {
break;
}
}
break;
}
}
+ efree(buf);
if (len < 0) {
php_stream_close(s);
if (len < 0) {
php_stream_close(s);