At 20:41 19.02.2003, Rasmus Lerdorf wrote:
rasmus          Wed Feb 19 14:41:10 2003 EDT

  Added files:
    /php4       README.input_filter

  Modified files:
    /php4/ext/mbstring  mb_gpc.c mbstring.c
    /php4/main  SAPI.c SAPI.h php_content_types.c php_variables.c
                rfc1867.c
  Log:
  Input Filter support.  See README.input_filter for details.
  @- Input Filter support added. See  README.input_filter. (Rasmus)


That broke the build - I suppose you missed this:
cvs -z3 -q diff mb_gpc.c mb_gpc.h (in directory S:\php4-HEAD\ext\mbstring\)
Index: mb_gpc.c
===================================================================
RCS file: /repository/php4/ext/mbstring/mb_gpc.c,v
retrieving revision 1.4
diff -u -r1.4 mb_gpc.c
--- mb_gpc.c 19 Feb 2003 19:41:07 -0000 1.4
+++ mb_gpc.c 19 Feb 2003 20:43:10 -0000
@@ -379,7 +379,7 @@
{
MBSTRG(http_input_identify_post) = mbfl_no_encoding_invalid;

- _php_mb_encoding_handler_ex(arg, SG(request_info).post_data, "&", 0, 0 TSRMLS_CC);
+ _php_mb_encoding_handler_ex(PARSE_POST, arg, SG(request_info).post_data, "&", 0, 0 TSRMLS_CC);

if (MBSTRG(http_input_identify) != mbfl_no_encoding_invalid) {
MBSTRG(http_input_identify_post) = MBSTRG(http_input_identify);
Index: mb_gpc.h
===================================================================
RCS file: /repository/php4/ext/mbstring/mb_gpc.h,v
retrieving revision 1.1
diff -u -r1.1 mb_gpc.h
--- mb_gpc.h 23 Nov 2002 20:08:44 -0000 1.1
+++ mb_gpc.h 19 Feb 2003 20:43:10 -0000
@@ -33,7 +33,7 @@
MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data);

int _php_mb_enable_encoding_translation(int flag);
-int _php_mb_encoding_handler_ex(zval *arg, char *res, char *separator, int force_register_globals, int report_errors TSRMLS_DC);
+int _php_mb_encoding_handler_ex(int data_type, zval *arg, char *res, char *separator, int force_register_globals, int report_errors TSRMLS_DC);
/* }}} */
#endif /* HAVE_MBSTRING */


Reply via email to