projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- fix property access
[m6w6/ext-http]
/
http_response_object.c
diff --git
a/http_response_object.c
b/http_response_object.c
index f2c5e5730d13a262b5967385f5dc937b259640c1..ba1ae4073ef9991f805aacd681735f8d12fadbbc 100644
(file)
--- a/
http_response_object.c
+++ b/
http_response_object.c
@@
-237,10
+237,11
@@
static inline void _http_response_object_declare_default_properties(TSRMLS_D)
DCL_STATIC_PROP(PROTECTED, long, bufferSize, HTTP_SENDBUF_SIZE);
DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0);
DCL_STATIC_PROP(PROTECTED, long, bufferSize, HTTP_SENDBUF_SIZE);
DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0);
+#ifndef WONKY
DCL_CONST(long, "ETAG_MD5", HTTP_ETAG_MD5);
DCL_CONST(long, "ETAG_SHA1", HTTP_ETAG_SHA1);
DCL_CONST(long, "ETAG_MD5", HTTP_ETAG_MD5);
DCL_CONST(long, "ETAG_SHA1", HTTP_ETAG_SHA1);
-#ifdef HTTP_HAVE_MHASH
+#
ifdef HTTP_HAVE_MHASH
{
int l, i, c = mhash_count();
{
int l, i, c = mhash_count();
@@
-254,7
+255,8
@@
static inline void _http_response_object_declare_default_properties(TSRMLS_D)
}
}
}
}
}
}
-#endif
+# endif /* HTTP_HAVE_MHASH */
+#endif /* WONKY */
}
static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC)
}
static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC)
@@
-880,7
+882,7
@@
PHP_METHOD(HttpResponse, getFile)
*/
PHP_METHOD(HttpResponse, send)
{
*/
PHP_METHOD(HttpResponse, send)
{
- zval *sent
, *headers
;
+ zval *sent;
zend_bool clean_ob = 1;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) {
zend_bool clean_ob = 1;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) {
@@
-1020,14
+1022,9
@@
PHP_METHOD(HttpResponse, send)
*/
PHP_METHOD(HttpResponse, capture)
{
*/
PHP_METHOD(HttpResponse, capture)
{
- zval do_catch;
-
NO_ARGS;
NO_ARGS;
- INIT_PZVAL(&do_catch);
- ZVAL_LONG(&do_catch, 1);
-
- SET_STATIC_PROP(catch, &do_catch);
+ UPD_STATIC_PROP(long, catch, 1);
php_end_ob_buffers(0 TSRMLS_CC);
php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);
php_end_ob_buffers(0 TSRMLS_CC);
php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);