- Prepare for including in PHP core

diff --git a/ext/filter/callback_filter.c b/ext/filter/callback_filter.c
index 446d72e56eec2a42fee4c6666b46c78715de6db9..f2cbc35f9be77a6dbd425827d243c00f61a45a24 100644 (file)
--- a/ext/filter/callback_filter.c
+++ b/ext/filter/callback_filter.c
@@ -16,6 +16,8 @@
   +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 #include "php_filter.h"
 
 void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
@@ -34,3 +36,12 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
 
        call_user_function(EG(function_table), NULL, option_array, value, 1, args TSRMLS_CC);
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */

diff --git a/ext/filter/config.m4 b/ext/filter/config.m4
index 0c3bc46983913ef1528d434a82f9dca1d5f2f082..7899fe55c8d7f400bac6eb8585337f6844754adb 100644 (file)
--- a/ext/filter/config.m4
+++ b/ext/filter/config.m4
@@ -2,10 +2,9 @@ dnl $Id$
 dnl config.m4 for input filtering extension
 
 PHP_ARG_ENABLE(filter, whether to enable input filter support,
-[  --enable-filter           Enable input filter support])
+[  --disable-filter           Disable input filter support], yes)
 
 if test "$PHP_FILTER" != "no"; then
-  PHP_SUBST(FILTER_SHARED_LIBADD)
   PHP_NEW_EXTENSION(filter, filter.c sanitizing_filters.c logical_filters.c callback_filter.c, $ext_shared)
-  CPPFLAGS="$CPPFLAGS -Wall"
+  PHP_SUBST(FILTER_SHARED_LIBADD)
 fi

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 763637bd8cdbe37d7cd55a73f73bdba248a5d0ef..74076e5c4f9ddd578484dbb7a701f82c391458f3 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -99,7 +99,7 @@ zend_module_entry filter_module_entry = {
        NULL,
        PHP_RSHUTDOWN(filter),
        PHP_MINFO(filter),
-    "0.1",
+       "0.9.2",
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -128,7 +128,6 @@ static PHP_INI_MH(UpdateDefaultFilter)
 
 /* {{{ PHP_INI
  */
-
 static PHP_INI_MH(OnUpdateFlags)
 {
        if (!new_value) {
@@ -139,15 +138,14 @@ static PHP_INI_MH(OnUpdateFlags)
        return SUCCESS;
 }
 
-
 PHP_INI_BEGIN()
-    STD_PHP_INI_ENTRY("filter.default",       "string", PHP_INI_ALL, UpdateDefaultFilter, default_filter,       zend_filter_globals, filter_globals)
-    PHP_INI_ENTRY("filter.default_flags",     NULL,     PHP_INI_ALL, OnUpdateFlags)
+       STD_PHP_INI_ENTRY("filter.default",   "string", PHP_INI_ALL, UpdateDefaultFilter, default_filter, zend_filter_globals, filter_globals)
+       PHP_INI_ENTRY("filter.default_flags", NULL,     PHP_INI_ALL, OnUpdateFlags)
 PHP_INI_END()
 /* }}} */
 
 /* {{{ php_filter_init_globals
- */
+*/
 static void php_filter_init_globals(zend_filter_globals *filter_globals)
 {
        filter_globals->post_array = NULL;
@@ -404,7 +402,7 @@ PHP_FUNCTION(input_has_variable)
        long        arg;
        char       *var;
        int         var_len;
-    zval      **tmp;
+       zval      **tmp;
        zval       *array_ptr = NULL;
        HashTable  *hash_ptr;
        int         found = 0;
@@ -413,7 +411,7 @@ PHP_FUNCTION(input_has_variable)
                return;
        }
 
-       switch(arg) {
+       switch (arg) {
                case PARSE_GET:     FIND_SOURCE(get_array,     TRACK_VARS_GET)
                case PARSE_POST:    FIND_SOURCE(post_array,    TRACK_VARS_POST)
                case PARSE_COOKIE:  FIND_SOURCE(cookie_array,  TRACK_VARS_COOKIE)
@@ -445,8 +443,7 @@ PHP_FUNCTION(input_get)
        char       *var, *charset = NULL;
        int         var_len, charset_len;
        zval       *flags = NULL;
-
-    zval      **tmp;
+       zval      **tmp;
        zval       *array_ptr = NULL, *array_ptr2 = NULL, *array_ptr3 = NULL;
        HashTable  *hash_ptr;
        int         found = 0;

diff --git a/ext/filter/filter_private.h b/ext/filter/filter_private.h
index 6e70eae103ddf0ada33241ddaa94452161c86fd3..26ced7aaed794d943ca52d23037f3454c99c1915 100644 (file)
--- a/ext/filter/filter_private.h
+++ b/ext/filter/filter_private.h
@@ -16,6 +16,11 @@
   +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
+#ifndef FILTER_PRIVATE_H
+#define FILTER_PRIVATE_H
+
 #define FILTER_FLAG_NONE                    0x0000
 
 #define FILTER_FLAG_ALLOW_OCTAL             0x0001
@@ -70,3 +75,13 @@
 
 #define FC_CALLBACK      0x0400
 
+#endif FILTER_PRIVATE_H
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */

diff --git a/ext/filter/sanitizing_filters.c b/ext/filter/sanitizing_filters.c
index d7fae27c27482789a20a7253ba5d34e756c7322f..827d88c98459c16792dbd7009d4932266460a6a8 100644 (file)
--- a/ext/filter/sanitizing_filters.c
+++ b/ext/filter/sanitizing_filters.c
@@ -16,6 +16,8 @@
   +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 #include "php_filter.h"
 #include "filter_private.h"
 #include "ext/standard/php_smart_str.h"
@@ -313,3 +315,12 @@ void php_filter_magic_quotes(PHP_INPUT_FILTER_PARAM_DECL)
        Z_STRLEN_P(value) = len;
 }
 /* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */