- make this class usable, mostly by fixing typos

[m6w6/ext-http] / http_filter_api.c

diff --git a/http_filter_api.c b/http_filter_api.c
index a942c1fd33df48ea3c7aea9dfbd01ab217cd481f..2553d681113728bbbe727deb95fc2c7b4ad91fe3 100644 (file)
--- a/http_filter_api.c
+++ b/http_filter_api.c
@@ -6,16 +6,12 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#      include "config.h"
-#endif
-
 #define HTTP_WANT_ZLIB
 #include "php_http.h"
 
@@ -78,7 +74,7 @@ PHP_MINIT_FUNCTION(http_filter)
                php_stream_bucket_append(buckets_out, __buck TSRMLS_CC); \
        }
 
-typedef struct {
+typedef struct _http_chunked_decode_filter_buffer_t {
        phpstr  buffer;
        ulong   hexlen;
 } HTTP_FILTER_BUFFER(chunked_decode);
@@ -169,8 +165,8 @@ static HTTP_FILTER_FUNCTION(chunked_decode)
                        
                        /* 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) {