#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
-#include "php_http_std_defs.h"
-#include "php_http_api.h"
-#include "php_http_filter_api.h"
+#include "php_http.h"
-#include "phpstr/phpstr.h"
+#ifdef ZEND_ENGINE_2
#include "php_streams.h"
-
-/*
- * TODO: allow use with persistent streams
- */
+#include "php_http_api.h"
+#include "php_http_filter_api.h"
PHP_MINIT_FUNCTION(http_filter)
{
*bytes_consumed += ptr->buflen;
}
- phpstr_append(PHPSTR(buffer), ptr->buf, ptr->buflen);
+ if ((size_t) -1 == phpstr_append(PHPSTR(buffer), ptr->buf, ptr->buflen)) {
+ return PSFS_ERR_FATAL;
+ }
+
php_stream_bucket_unlink(ptr TSRMLS_CC);
php_stream_bucket_delref(ptr TSRMLS_CC);
-
}
}
- phpstr_fix(PHPSTR(buffer));
+ if (!phpstr_fix(PHPSTR(buffer))) {
+ return PSFS_ERR_FATAL;
+ }
/* we have data in our buffer */
while (PHPSTR_LEN(buffer)) {
/* we need eol, so we can be sure we have all hex digits */
phpstr_fix(PHPSTR(buffer));
- if (eolstr = http_locate_eol(PHPSTR_VAL(buffer), &eollen)) {
+ if ((eolstr = http_locate_eol(PHPSTR_VAL(buffer), &eollen))) {
char *stop = NULL;
/* read in chunk size */
phpstr_cut(PHPSTR(buffer), 0, eolstr + eollen - PHPSTR_VAL(buffer));
/* buffer->hexlen is 0 now or contains the size of the next chunk */
/* continue */
+ } else {
+ /* we have not enough data buffered to read in chunk size */
+ break;
}
}
/* break */
if (!strcasecmp(name, "http.chunked_decode")) {
http_filter_buffer *b = NULL;
- /* FIXXME: allow usage with persistent streams */
- if (p) {
- return NULL;
- }
-
- if (b = pecalloc(1, sizeof(http_filter_buffer), p)) {
- phpstr_init(PHPSTR(b));
+ if ((b = pecalloc(1, sizeof(http_filter_buffer), p))) {
+ phpstr_init_ex(PHPSTR(b), 4096, p ? PHPSTR_INIT_PERSISTENT : 0);
if (!(f = php_stream_filter_alloc(&HTTP_FILTER_OP(chunked_decode), b, p))) {
pefree(b, p);
}
http_filter_create
};
+#endif /* ZEND_ENGINE_2 */
+
/*
* Local variables:
* tab-width: 4