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 chicken&egg problem with ZTS + persistent handles + global request datashare
[m6w6/ext-http]
/
http_filter_api.c
diff --git
a/http_filter_api.c
b/http_filter_api.c
index 8d138b9c748e214807cd15dd13abeeb5716cd641..a6c740fa7e4b23694b73021b74bd654562973970 100644
(file)
--- a/
http_filter_api.c
+++ b/
http_filter_api.c
@@
-105,7
+105,7
@@
static HTTP_FILTER_FUNCTION(chunked_decode)
*bytes_consumed += ptr->buflen;
}
*bytes_consumed += ptr->buflen;
}
- if (
(size_t) -1
== phpstr_append(PHPSTR(buffer), ptr->buf, ptr->buflen)) {
+ if (
PHPSTR_NOMEM
== phpstr_append(PHPSTR(buffer), ptr->buf, ptr->buflen)) {
return PSFS_ERR_FATAL;
}
return PSFS_ERR_FATAL;
}
@@
-477,7
+477,7
@@
static php_stream_filter *http_filter_create(const char *name, zval *params, int
} else
if (!strcasecmp(name, "http.inflate")) {
} else
if (!strcasecmp(name, "http.inflate")) {
- int flags =
HTTP_ENCODING_STREAM_FLUSH_SYNC | (p ? HTTP_ENCODING_STREAM_PERSISTENT : 0)
;
+ int flags =
p ? HTTP_ENCODING_STREAM_PERSISTENT : 0
;
HTTP_FILTER_BUFFER(inflate) *b = NULL;
if ((b = http_encoding_inflate_stream_init(NULL, flags))) {
HTTP_FILTER_BUFFER(inflate) *b = NULL;
if ((b = http_encoding_inflate_stream_init(NULL, flags))) {
@@
-488,12
+488,11
@@
static php_stream_filter *http_filter_create(const char *name, zval *params, int
} else
if (!strcasecmp(name, "http.deflate")) {
} else
if (!strcasecmp(name, "http.deflate")) {
- int flags =
HTTP_ENCODING_STREAM_FLUSH_SYNC | (p ? HTTP_ENCODING_STREAM_PERSISTENT : 0)
;
+ int flags =
p ? HTTP_ENCODING_STREAM_PERSISTENT : 0
;
HTTP_FILTER_BUFFER(deflate) *b = NULL;
if (params) {
HTTP_FILTER_BUFFER(deflate) *b = NULL;
if (params) {
- switch (Z_TYPE_P(params))
- {
+ switch (Z_TYPE_P(params)) {
case IS_ARRAY:
case IS_OBJECT:
if (SUCCESS != zend_hash_find(HASH_OF(params), "flags", sizeof("flags"), (void *) &tmp)) {
case IS_ARRAY:
case IS_OBJECT:
if (SUCCESS != zend_hash_find(HASH_OF(params), "flags", sizeof("flags"), (void *) &tmp)) {
@@
-504,7
+503,7
@@
static php_stream_filter *http_filter_create(const char *name, zval *params, int
zval *orig = *tmp;
convert_to_long_ex(tmp);
zval *orig = *tmp;
convert_to_long_ex(tmp);
- flags |= (Z_LVAL_PP(tmp) & 0x0
0
ffffff);
+ flags |= (Z_LVAL_PP(tmp) & 0x0
f
ffffff);
if (orig != *tmp) zval_ptr_dtor(tmp);
}
}
if (orig != *tmp) zval_ptr_dtor(tmp);
}
}