#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"
+#define HTTP_WANT_ZLIB
+#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_encoding_api.h"
+#include "php_http_filter_api.h"
PHP_MINIT_FUNCTION(http_filter)
{
-
*/
-typedef struct {
- phpstr buffer;
- ulong hexlen;
-} http_filter_buffer;
-
#define HTTP_FILTER_PARAMS \
php_stream *stream, \
php_stream_filter *this, \
http_filter_ ##filter
#define HTTP_FILTER_FUNCTION(filter) \
php_stream_filter_status_t HTTP_FILTER_FUNC(filter)(HTTP_FILTER_PARAMS)
+#define HTTP_FILTER_BUFFER(filter) \
+ http_filter_ ##filter## _buffer
#define NEW_BUCKET(data, length) \
{ \
php_stream_bucket_append(buckets_out, __buck TSRMLS_CC); \
}
+typedef struct {
+ phpstr buffer;
+ ulong hexlen;
+} HTTP_FILTER_BUFFER(chunked_decode);
+
+#ifdef HTTP_HAVE_ZLIB
+typedef struct {
+ int init;
+ int flags;
+ http_encoding_stream stream;
+} HTTP_FILTER_BUFFER(gzip);
+#endif /* HTTP_HAVE_ZLIB */
+
+
static HTTP_FILTER_FUNCTION(chunked_decode)
{
int out_avail = 0;
php_stream_bucket *ptr, *nxt;
- http_filter_buffer *buffer = (http_filter_buffer *) (this->abstract);
+ HTTP_FILTER_BUFFER(chunked_decode) *buffer = (HTTP_FILTER_BUFFER(chunked_decode) *) (this->abstract);
if (bytes_consumed) {
*bytes_consumed = 0;
*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 */
static HTTP_FILTER_DESTRUCTOR(chunked_decode)
{
- http_filter_buffer *b = (http_filter_buffer *) (this->abstract);
+ HTTP_FILTER_BUFFER(chunked_decode) *b = (HTTP_FILTER_BUFFER(chunked_decode) *) (this->abstract);
phpstr_dtor(PHPSTR(b));
pefree(b, this->is_persistent);
"http.chunked_encode"
};
+#ifdef HTTP_HAVE_ZLIB
+static HTTP_FILTER_FUNCTION(gzip)
+{
+ int out_avail = 0;
+ php_stream_bucket *ptr, *nxt;
+ HTTP_FILTER_BUFFER(gzip) *buffer = (HTTP_FILTER_BUFFER(gzip) *) this->abstract;
+
+ if (bytes_consumed) {
+ *bytes_consumed = 0;
+ }
+
+ /* first round */
+ if (!buffer->init) {
+ char *encoded = NULL;
+ size_t encoded_len = 0;
+
+ buffer->init = 1;
+ http_encoding_stream_init(&buffer->stream, buffer->flags, -1, &encoded, &encoded_len);
+
+ if (encoded) {
+ out_avail = 1;
+ NEW_BUCKET(encoded, encoded_len);
+ pefree(encoded, this->is_persistent);
+ }
+ }
+
+ /* new data available? */
+ if (buckets_in->head) {
+
+ /* fetch available bucket data */
+ for (ptr = buckets_in->head; ptr; ptr = nxt) {
+ char *encoded = NULL;
+ size_t encoded_len = 0;
+
+ nxt = ptr->next;
+ if (bytes_consumed) {
+ *bytes_consumed += ptr->buflen;
+ }
+
+ /* this is actually flushing implicitly */
+ http_encoding_stream_update(&buffer->stream, ptr->buf, ptr->buflen, &encoded, &encoded_len);
+ if (encoded) {
+ out_avail = 1;
+ NEW_BUCKET(encoded, encoded_len);
+ pefree(encoded, this->is_persistent);
+ }
+
+ php_stream_bucket_unlink(ptr TSRMLS_CC);
+ php_stream_bucket_delref(ptr TSRMLS_CC);
+ }
+ }
+
+ /* flush & close */
+ if (flags == PSFS_FLAG_FLUSH_CLOSE) {
+ char *encoded = NULL;
+ size_t encoded_len = 0;
+
+ http_encoding_stream_finish(&buffer->stream, &encoded, &encoded_len);
+ if (encoded) {
+ out_avail = 1;
+ NEW_BUCKET(encoded, encoded_len);
+ }
+ }
+
+ return out_avail ? PSFS_PASS_ON : PSFS_FEED_ME;
+}
+
+static HTTP_FILTER_DESTRUCTOR(gzip)
+{
+ HTTP_FILTER_BUFFER(gzip) *buffer = (HTTP_FILTER_BUFFER(gzip) *) this->abstract;
+
+ pefree(buffer, this->is_persistent);
+}
+
+static HTTP_FILTER_OPS(gzencode) = {
+ HTTP_FILTER_FUNC(gzip),
+ HTTP_FILTER_DTOR(gzip),
+ "http.gzencode"
+};
+
+static HTTP_FILTER_OPS(deflate) = {
+ HTTP_FILTER_FUNC(gzip),
+ HTTP_FILTER_DTOR(gzip),
+ "http.deflate"
+};
+#endif /* HTTP_HAVE_ZLIB */
+
static php_stream_filter *http_filter_create(const char *name, zval *params, int p TSRMLS_DC)
{
+ zval **tmp = ¶ms;
php_stream_filter *f = NULL;
if (!strcasecmp(name, "http.chunked_decode")) {
- http_filter_buffer *b = NULL;
-
- /* FIXXME: allow usage with persistent streams */
- if (p) {
- return NULL;
- }
+ HTTP_FILTER_BUFFER(chunked_decode) *b = NULL;
- if (b = pecalloc(1, sizeof(http_filter_buffer), p)) {
- phpstr_init(PHPSTR(b));
+ if ((b = pecalloc(1, sizeof(HTTP_FILTER_BUFFER(chunked_decode)), 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);
}
if (!strcasecmp(name, "http.chunked_encode")) {
f = php_stream_filter_alloc(&HTTP_FILTER_OP(chunked_encode), NULL, p);
+#ifdef HTTP_HAVE_ZLIB
+ } else
+
+ if (!strcasecmp(name, "http.gzencode")) {
+ HTTP_FILTER_BUFFER(gzip) *b = NULL;
+
+ if ((b = pecalloc(1, sizeof(HTTP_FILTER_BUFFER(gzip)), p))) {
+ b->flags = HTTP_ENCODING_STREAM_GZIP_HEADER;
+ if (p) {
+ b->flags |= HTTP_ENCODING_STREAM_PERSISTENT;
+ }
+ if (params) {
+ switch (Z_TYPE_P(params))
+ {
+ case IS_ARRAY:
+ case IS_OBJECT:
+ if (SUCCESS != zend_hash_find(HASH_OF(params), "zlib", sizeof("zlib"), (void **) &tmp)) {
+ break;
+ }
+ default:
+ if (zval_is_true(*tmp)) {
+ b->flags |= HTTP_ENCODING_STREAM_ZLIB_HEADER;
+ }
+ }
+ }
+ if (!(f = php_stream_filter_alloc(&HTTP_FILTER_OP(gzencode), b, p))) {
+ pefree(b, p);
+ }
+ }
+ } else
+
+ if (!strcasecmp(name, "http.deflate")) {
+ HTTP_FILTER_BUFFER(gzip) *b = NULL;
+
+ if ((b = pecalloc(1, sizeof(HTTP_FILTER_BUFFER(gzip)), p))) {
+ if (p) {
+ b->flags |= HTTP_ENCODING_STREAM_PERSISTENT;
+ }
+ if (params) {
+ switch (Z_TYPE_P(params))
+ {
+ case IS_ARRAY:
+ case IS_OBJECT:
+ if (SUCCESS != zend_hash_find(HASH_OF(params), "zlib", sizeof("zlib"), (void **) &tmp)) {
+ break;
+ }
+ default:
+ if (zval_is_true(*tmp)) {
+ b->flags |= HTTP_ENCODING_STREAM_ZLIB_HEADER;
+ }
+ }
+ }
+ if (!(f = php_stream_filter_alloc(&HTTP_FILTER_OP(deflate), b, p))) {
+ pefree(b, p);
+ }
+ }
+#endif /* HTTP_HAVE_ZLIB */
}
return f;
http_filter_create
};
+#endif /* ZEND_ENGINE_2 */
+
/*
* Local variables:
* tab-width: 4