*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;
}
/* ignore preceeding CRLFs (too loose?) */
while (off < PHPSTR_LEN(buffer) && (
- PHPSTR_VAL(buffer)[off] == 0xa ||
- PHPSTR_VAL(buffer)[off] == 0xd)) {
+ PHPSTR_VAL(buffer)[off] == '\n' ||
+ PHPSTR_VAL(buffer)[off] == '\r')) {
++off;
}
if (off) {
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)) {
+ if (SUCCESS != zend_hash_find(HASH_OF(params), "flags", sizeof("flags"), (void *) &tmp)) {
break;
}
default: