| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
*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;
}
if (ptr->buflen) {
http_encoding_deflate_stream_update(buffer, ptr->buf, ptr->buflen, &encoded, &encoded_len);
if (encoded) {
- out_avail = 1;
- NEW_BUCKET(encoded, encoded_len);
+ if (encoded_len) {
+ out_avail = 1;
+ NEW_BUCKET(encoded, encoded_len);
+ }
efree(encoded);
}
}
http_encoding_deflate_stream_flush(buffer, &encoded, &encoded_len);
if (encoded) {
- out_avail = 1;
- NEW_BUCKET(encoded, encoded_len);
+ if (encoded_len) {
+ out_avail = 1;
+ NEW_BUCKET(encoded, encoded_len);
+ }
efree(encoded);
}
}
http_encoding_deflate_stream_finish(buffer, &encoded, &encoded_len);
if (encoded) {
- out_avail = 1;
- NEW_BUCKET(encoded, encoded_len);
+ if (encoded_len) {
+ out_avail = 1;
+ NEW_BUCKET(encoded, encoded_len);
+ }
efree(encoded);
}
}
if (ptr->buflen) {
http_encoding_inflate_stream_update(buffer, ptr->buf, ptr->buflen, &decoded, &decoded_len);
if (decoded) {
- out_avail = 1;
- NEW_BUCKET(decoded, decoded_len);
+ if (decoded_len) {
+ out_avail = 1;
+ NEW_BUCKET(decoded, decoded_len);
+ }
efree(decoded);
}
}
http_encoding_inflate_stream_flush(buffer, &decoded, &decoded_len);
if (decoded) {
- out_avail = 1;
- NEW_BUCKET(decoded, decoded_len);
+ if (decoded_len) {
+ out_avail = 1;
+ NEW_BUCKET(decoded, decoded_len);
+ }
efree(decoded);
}
}
http_encoding_inflate_stream_finish(buffer, &decoded, &decoded_len);
if (decoded) {
- out_avail = 1;
- NEW_BUCKET(decoded, decoded_len);
+ if (decoded_len) {
+ out_avail = 1;
+ NEW_BUCKET(decoded, decoded_len);
+ }
efree(decoded);
}
}
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)) {
}
default:
{
- zval *orig = *tmp;
+ zval *num = http_zsep(IS_LONG, *tmp);
- convert_to_long_ex(tmp);
- flags |= (Z_LVAL_PP(tmp) & 0x0fffffff);
- if (orig != *tmp) zval_ptr_dtor(tmp);
+ flags |= (Z_LVAL_P(num) & 0x0fffffff);
+ zval_ptr_dtor(&num);
}
}
}