return NULL;
}
- msg = http_message_init(msg);
+ msg = http_message_init_rel(msg, 0);
if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void **) &msg)) {
if (free_msg) {
}
if (!strcasecmp(Z_STRVAL_P(c), "gzip") || !strcasecmp(Z_STRVAL_P(c), "x-gzip")) {
-# ifdef HTTP_HAVE_ZLIB
- http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
-# else
+# ifndef HTTP_HAVE_ZLIB
DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18);
-# endif /* HTTP_HAVE_ZLIB */
- } else if (!strcasecmp(Z_STRVAL_P(c), "deflate")) {
-# ifdef HTTP_HAVE_ZLIB
- http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
# else
- DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
-# endif /* HTTP_HAVE_ZLIB */
- } else if (!strcasecmp(Z_STRVAL_P(c), "compress") || !strcasecmp(Z_STRVAL_P(c), "x-compress")) {
-# ifdef HTTP_HAVE_ZLIB
- http_encoding_uncompress(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
-# else
- DECODE_WITH_EXT_ZLIB("gzuncompress", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
+ http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+ } else if (!strcasecmp(Z_STRVAL_P(c), "deflate") || !strcasecmp(Z_STRVAL_P(c), "compress") || !strcasecmp(Z_STRVAL_P(c), "x-compress")) {
+ http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
# endif /* HTTP_HAVE_ZLIB */
}
#endif /* HTTP_HAVE_ZLIB || HAVE_ZLIB */
/* check for following messages */
- if (continue_at) {
+ if (continue_at && (continue_at < (message + message_length))) {
while (isspace(*continue_at)) ++continue_at;
if (continue_at < (message + message_length)) {
http_message *next = NULL, *most = NULL;
/* set current message to parent of most parent following messages and return deepest */
- if ((most = next = http_message_parse(continue_at, message + message_length - continue_at))) {
+ if ((most = next = http_message_parse_rel(NULL, continue_at, message + message_length - continue_at))) {
while (most->parent) most = most->parent;
most->parent = msg;
msg = next;