*buf_ptr = emalloc(*buf_len + 1);
} else {
size_t new_len = *buf_len << 2;
- char *new_ptr = erealloc(*buf_ptr, new_len + 1);
+ char *new_ptr = erealloc_recoverable(*buf_ptr, new_len + 1);
if (new_ptr) {
*buf_ptr = new_ptr;
*buf_len = new_len;
} else {
- *iteration = INT_MAX;
+ *iteration = INT_MAX-1; /* avoid integer overflow on increment op */
}
}
}
}
} else {
#ifndef HTTP_HAVE_ZLIB
+ HTTP_G(send).gzip_encoding = 0;
php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC);
#else
HashTable *selected;
add_next_index_stringl(&zsupported, "gzip", lenof("gzip"), 1);
add_next_index_stringl(&zsupported, "deflate", lenof("deflate"), 1);
+ HTTP_G(send).gzip_encoding = 0;
+
if (selected = http_negotiate_encoding(&zsupported)) {
STATUS hs = FAILURE;
char *encoding = NULL;
}
if (SUCCESS == hs) {
http_send_header_string("Vary: Accept-Encoding");
- } else {
- HTTP_G(send).gzip_encoding = 0;
}
}
}
zval_dtor(&zsupported);
- return 1;
+ return HTTP_G(send).gzip_encoding;
#endif
}
}