projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- move around
[m6w6/ext-http]
/
http_response_object.c
diff --git
a/http_response_object.c
b/http_response_object.c
index 4227a907efe087d76a3bb55284d89dc107b95e33..ea24fd897bacd04dad48222fe45b722a9b22f6e5 100644
(file)
--- a/
http_response_object.c
+++ b/
http_response_object.c
@@
-772,19
+772,19
@@
PHP_METHOD(HttpResponse, send)
/* capture mode */
if (Z_BVAL_P(GET_STATIC_PROP(catch))) {
/* capture mode */
if (Z_BVAL_P(GET_STATIC_PROP(catch))) {
- zval the_data;
+ zval
*
the_data;
-
INIT_PZVAL(&
the_data);
- php_ob_get_buffer(
&
the_data TSRMLS_CC);
- SET_STATIC_PROP(data,
&
the_data);
+
MAKE_STD_ZVAL(
the_data);
+ php_ob_get_buffer(the_data TSRMLS_CC);
+ SET_STATIC_PROP(data, the_data);
ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA);
if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA);
if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
- char *etag = http_etag(Z_STRVAL
(the_data), Z_STRLEN
(the_data), SEND_DATA);
+ char *etag = http_etag(Z_STRVAL
_P(the_data), Z_STRLEN_P
(the_data), SEND_DATA);
UPD_STATIC_PROP(string, eTag, etag);
efree(etag);
}
UPD_STATIC_PROP(string, eTag, etag);
efree(etag);
}
- zval_dtor(&the_data);
+ zval_
ptr_
dtor(&the_data);
clean_ob = 1;
}
clean_ob = 1;
}
@@
-909,10
+909,6
@@
PHP_METHOD(HttpResponse, send)
* HttpResponse::setCache(true);
* HttpResponse::capture();
* // script follows
* HttpResponse::setCache(true);
* HttpResponse::capture();
* // script follows
- * // note that you need to call
- * HttpResponse::send();
- * // at the end of the script unless
- * // you use PHP-5.1 or greater
* ?>
* </pre>
*/
* ?>
* </pre>
*/