helly           Sun Mar 16 21:06:55 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src    Makefile.frag NEWS acinclude.m4 configure.in 
    /pecl/phar  phar.c 
    /php-src/ext/spl    php_spl.c 
    /php-src/ext/standard/tests/strings 006.phpt 007.phpt 
                                        highlight_file.phpt 
                                        strip_tags_basic1.phpt 
                                        strip_tags_basic2.phpt 
                                        strip_tags_error.phpt 
                                        strip_tags_variation1.phpt 
                                        strip_tags_variation10.phpt 
                                        strip_tags_variation2.phpt 
                                        strip_tags_variation3.phpt 
                                        strip_tags_variation4.phpt 
                                        strip_tags_variation5.phpt 
                                        strip_tags_variation6.phpt 
                                        strip_tags_variation7.phpt 
                                        strip_tags_variation8.phpt 
                                        strip_tags_variation9.phpt 
    /php-src/ext/tokenizer      Makefile.frag tokenizer.c 
    /php-src/ext/tokenizer/tests        token_get_all_variation14.phpt 
    /php-src/main       main.c 
    /php-src/sapi/apache        mod_php5.c 
    /php-src/sapi/apache_hooks  mod_php5.c 
    /php-src/sapi/cgi   cgi_main.c 
    /php-src/sapi/cgi/tests     007.phpt 
    /php-src/sapi/cli   php_cli.c 
    /php-src/sapi/cli/tests     010.phpt 016.phpt 017.phpt 
    /php-src/sapi/tests test003.phpt test004.phpt 
    /php-src/win32/build        config.w32 
  Log:
  - Rewrite scanner to be based on re2c instead of flex
    The full patch is available as:
    http://php.net/~helly/php-re2c-5.3-20080316.diff.txt
    This is against php-re2c repository version 98
    An older patch against version 97 is available under:
    http://php.net/~helly/php-re2c-97-20080316.diff.txt
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.frag?r1=1.3.4.1.2.1&r2=1.3.4.1.2.1.2.1&diff_format=u
Index: php-src/Makefile.frag
diff -u php-src/Makefile.frag:1.3.4.1.2.1 php-src/Makefile.frag:1.3.4.1.2.1.2.1
--- php-src/Makefile.frag:1.3.4.1.2.1   Thu May 24 21:40:41 2007
+++ php-src/Makefile.frag       Sun Mar 16 21:06:53 2008
@@ -7,7 +7,7 @@
 $(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
 
 $(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-       @$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i 
$(srcdir)/zend_language_scanner.l
+       $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
$(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
 
 $(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
 $(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -18,6 +18,6 @@
        @$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
 
 $(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-       @$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
+       $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
$(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
 
 $(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo 
$(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.141&r2=1.2027.2.547.2.965.2.142&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.141 
php-src/NEWS:1.2027.2.547.2.965.2.142
--- php-src/NEWS:1.2027.2.547.2.965.2.141       Fri Mar 14 16:19:51 2008
+++ php-src/NEWS        Sun Mar 16 21:06:53 2008
@@ -79,6 +79,7 @@
 - Added PREG_BAD_UTF8_OFFSET_ERROR constant. (Nuno)
 
 - Improved PHP runtime speed and memory usage:
+  . Replaced flex based scanner with re2c based scanner. (Marcus, Nuno, Scott)
   . Added garbage collector. (David Wang, Dmitry).
   . Improved PHP binary size and startup speed with GCC4 visibility control.
     (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.26.2.1&r2=1.332.2.14.2.26.2.2&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.26.2.1 
php-src/acinclude.m4:1.332.2.14.2.26.2.2
--- php-src/acinclude.m4:1.332.2.14.2.26.2.1    Sun Feb 17 20:50:03 2008
+++ php-src/acinclude.m4        Sun Mar 16 21:06:53 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.26.2.1 2008/02/17 20:50:03 helly Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.26.2.2 2008/03/16 21:06:53 helly Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2087,64 +2087,6 @@
 ])
 
 dnl
-dnl PHP_PROG_LEX
-dnl
-dnl Search for (f)lex and check it's version
-dnl
-AC_DEFUN([PHP_PROG_LEX], [
-dnl we only support certain flex versions
-  flex_version_list="2.5.4"
-   
-  AC_PROG_LEX
-  if test "$LEX" = "flex"; then
-dnl AC_DECL_YYTEXT is obsolete since autoconf 2.50 and merged into AC_PROG_LEX
-dnl this is what causes that annoying "PHP_PROG_LEX is expanded from" warning 
with autoconf 2.50+
-dnl it should be removed once we drop support of autoconf 2.13 (if ever)
-    AC_DECL_YYTEXT
-    :
-  fi
-  dnl ## Make flex scanners use const if they can, even if __STDC__ is not
-  dnl ## true, for compilers like Sun's that only set __STDC__ true in
-  dnl ## "limit-to-ANSI-standard" mode, not in "ANSI-compatible" mode
-  AC_C_CONST
-  if test "$ac_cv_c_const" = "yes" ; then
-    LEX_CFLAGS="-DYY_USE_CONST"
-  fi
-
-  if test "$LEX" = "flex"; then
-    AC_CACHE_CHECK([for flex version], php_cv_flex_version, [
-      flex_version=`$LEX -V -v --version 2>/dev/null | $SED -e 's/^.* //'`
-      php_cv_flex_version=invalid
-      for flex_check_version in $flex_version_list; do
-        if test "$flex_version" = "$flex_check_version"; then
-          php_cv_flex_version="$flex_check_version (ok)"
-        fi
-      done
-    ])
-  else
-    flex_version=none
-  fi
-  
-  case $php_cv_flex_version in
-    ""|invalid[)]
-      if test -f "$abs_srcdir/Zend/zend_language_scanner.c" && test -f 
"$abs_srcdir/Zend/zend_ini_scanner.c"; then
-        AC_MSG_WARN([flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list  (found: $flex_version)])
-      else
-        flex_msg="Supported flex versions are: $flex_version_list"
-        if test "$flex_version" = "none"; then
-          flex_msg="flex not found. flex is required to generate the Zend/PHP 
parsers! $flex_msg"
-        else
-          flex_msg="Found invalid flex version: $flex_version. $flex_msg"
-        fi
-        AC_MSG_ERROR([$flex_msg])
-      fi
-      LEX="exit 0;"
-      ;;
-  esac
-  PHP_SUBST(LEX)
-])
-
-dnl
 dnl PHP_PROG_RE2C
 dnl
 dnl Search for the re2c binary and check the version
@@ -2153,17 +2095,17 @@
   AC_CHECK_PROG(RE2C, re2c, re2c)
   if test -n "$RE2C"; then
     AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [
-      re2c_vernum=`re2c --vernum 2>/dev/null`
-      if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "1200"; then
+      re2c_vernum=`$RE2C --vernum 2>/dev/null`
+      if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "1302"; then
         php_cv_re2c_version=invalid
       else
-        php_cv_re2c_version="`re2c --version | cut -d ' ' -f 2  2>/dev/null` 
(ok)"
+        php_cv_re2c_version="`$RE2C --version | cut -d ' ' -f 2  2>/dev/null` 
(ok)"
       fi 
     ])
   fi
   case $php_cv_re2c_version in
     ""|invalid[)]
-      AC_MSG_WARN([You will need re2c 0.12.0 or later if you want to 
regenerate PHP parsers.])
+      AC_MSG_WARN([You will need re2c 0.13.3 or later if you want to 
regenerate PHP parsers.])
       RE2C="exit 0;"
       ;;
   esac
@@ -2710,11 +2652,6 @@
       # PHP_ARG_* macros set php_enable_<arg_name> or php_with_<arg_name>
       *[)]
         # Options that exist before PHP 6
-        if test "$PHP_MAJOR_VERSION" -lt "6"; then
-          case $arg_name in
-            enable-zend-multibyte[)] continue;;
-          esac 
-        fi
         is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 
'abcdefghijklmnopqrstuvwxyz_'`
         if eval test "x\$$is_arg_set" = "x"; then
           PHP_UNKNOWN_CONFIGURE_OPTIONS="$PHP_UNKNOWN_CONFIGURE_OPTIONS
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.12&r2=1.579.2.52.2.77.2.13&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.77.2.12 
php-src/configure.in:1.579.2.52.2.77.2.13
--- php-src/configure.in:1.579.2.52.2.77.2.12   Sun Mar  9 14:27:25 2008
+++ php-src/configure.in        Sun Mar 16 21:06:53 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.77.2.12 2008/03/09 14:27:25 gwynne Exp $ 
-*- autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.77.2.13 2008/03/16 21:06:53 helly Exp $ 
-*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -161,10 +161,37 @@
 PHP_RUNPATH_SWITCH
 
 dnl Checks for some support/generator progs
-PHP_PROG_RE2C
 PHP_PROG_AWK
 PHP_PROG_BISON
-PHP_PROG_LEX
+PHP_PROG_RE2C
+
+PHP_ARG_ENABLE(re2c-cgoto, whether to enable computed goto gcc extension with 
re2c,
+[  --enable-re2c-cgoto     Enable -g flag to re2c to use computed goto gcc 
extension], no, no)
+
+if test "$PHP_RE2C_CGOTO" = "no"; then
+  RE2C_FLAGS=""
+else
+  AC_MSG_CHECKING([whether re2c -g works])
+  AC_TRY_COMPILE([],[
+               int main(int argc, const char **argv)
+               {
+                       argc = argc;
+                       argv = argv;
+label1:
+label2:
+                       static void *adr[] = { &&label1, &&label2};
+                       goto *adr[0];
+                       return 0;
+               }
+  ],[
+    RE2C_FLAGS=""
+    AC_MSG_RESULT([no])
+  ],[
+    RE2C_FLAGS="-g"
+    AC_MSG_RESULT([yes])
+  ])
+fi
+PHP_SUBST(RE2C_FLAGS)
 
 dnl Platform-specific compile settings.
 dnl -------------------------------------------------------------------------
http://cvs.php.net/viewvc.cgi/pecl/phar/phar.c?r1=1.312&r2=1.313&diff_format=u
Index: pecl/phar/phar.c
diff -u pecl/phar/phar.c:1.312 pecl/phar/phar.c:1.313
--- pecl/phar/phar.c:1.312      Thu Mar 13 09:57:48 2008
+++ pecl/phar/phar.c    Sun Mar 16 21:06:53 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar.c,v 1.312 2008/03/13 09:57:48 tony2001 Exp $ */
+/* $Id: phar.c,v 1.313 2008/03/16 21:06:53 helly Exp $ */
 
 #define PHAR_MAIN 1
 #include "phar_internal.h"
@@ -2560,11 +2560,26 @@
 }
 /* }}} */
 
+#if PHP_VERSION_ID >= 50300
+static size_t phar_zend_stream_reader(void *handle, char *buf, size_t len 
TSRMLS_DC) /* {{{ */
+{
+       return php_stream_read(((phar_archive_data*)handle)->fp, buf, len);
+}
+/* }}} */
+
+static size_t phar_zend_stream_fsizer(void *handle TSRMLS_DC) /* {{{ */
+{
+       return ((phar_archive_data*)handle)->halt_offset + 32;
+} /* }}} */
+
+#else /* PHP_VERSION_ID */
+
 static long stream_fteller_for_zend(void *handle TSRMLS_DC) /* {{{ */
 {
        return (long)php_stream_tell((php_stream*)handle);
 }
 /* }}} */
+#endif
 
 zend_op_array *(*phar_orig_compile_file)(zend_file_handle *file_handle, int 
type TSRMLS_DC);
 #if PHP_VERSION_ID >= 50300
@@ -2832,9 +2847,19 @@
                                } else {
                                        *file_handle = f;
                                }
-                               goto skip_phar;
                        } else if (phar->flags & PHAR_FILE_COMPRESSION_MASK) {
                                /* compressed phar */
+#if PHP_VERSION_ID >= 50300
+                               file_handle->type = ZEND_HANDLE_STREAM;
+                               file_handle->free_filename = 0;
+                               file_handle->handle.stream.handle  = phar;
+                               file_handle->handle.stream.reader  = 
phar_zend_stream_reader;
+                               file_handle->handle.stream.closer  = NULL;
+                               file_handle->handle.stream.fsizer  = 
phar_zend_stream_fsizer;
+                               file_handle->handle.stream.isatty  = 0;
+                               php_stream_rewind(phar->fp);
+                               memset(&file_handle->handle.stream.mmap, 0, 
sizeof(file_handle->handle.stream.mmap));
+#else /* PHP_VERSION_ID */
                                file_handle->type = ZEND_HANDLE_STREAM;
                                file_handle->free_filename = 0;
                                file_handle->handle.stream.handle = phar->fp;
@@ -2843,11 +2868,10 @@
                                file_handle->handle.stream.fteller = 
stream_fteller_for_zend;
                                file_handle->handle.stream.interactive = 0;
                                php_stream_rewind(phar->fp);
-                               goto skip_phar;
+#endif
                        }
                }
        }
-skip_phar:
        zend_try {
                failed = 0;
                res = phar_orig_compile_file(file_handle, type TSRMLS_CC);
@@ -3059,7 +3083,7 @@
        php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
        php_info_print_table_row(2, "Phar EXT version", PHAR_EXT_VERSION_STR);
        php_info_print_table_row(2, "Phar API version", PHAR_API_VERSION_STR);
-       php_info_print_table_row(2, "CVS revision", "$Revision: 1.312 $");
+       php_info_print_table_row(2, "CVS revision", "$Revision: 1.313 $");
        php_info_print_table_row(2, "Phar-based phar archives", "enabled");
        php_info_print_table_row(2, "Tar-based phar archives", "enabled");
        php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.14&r2=1.52.2.28.2.17.2.15&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.14 
php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.15
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.14       Fri Feb 29 13:55:23 2008
+++ php-src/ext/spl/php_spl.c   Sun Mar 16 21:06:53 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_spl.c,v 1.52.2.28.2.17.2.14 2008/02/29 13:55:23 colder Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.17.2.15 2008/03/16 21:06:53 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -238,7 +238,7 @@
                        zend_destroy_file_handle(&file_handle TSRMLS_CC);
                } else {
                        new_op_array = NULL;
-                       zend_file_handle_dtor(&file_handle);
+                       zend_file_handle_dtor(&file_handle TSRMLS_CC);
                }
                if (new_op_array) {
                        EG(return_value_ptr_ptr) = &result;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/006.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/strings/006.phpt
diff -u php-src/ext/standard/tests/strings/006.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/006.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/strings/006.phpt:1.1.2.2 Thu May 10 16:28:11 2007
+++ php-src/ext/standard/tests/strings/006.phpt Sun Mar 16 21:06:53 2008
@@ -8,12 +8,12 @@
 var_dump(highlight_file($file, true));
 var_dump(ob_get_contents());
 
-echo "Done\n";
 ?>
+===DONE===
 --EXPECTF--    
-Warning: 
highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA in %s on line %d
+Warning: 
highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): failed to open 
stream: File name too long in %s006.php on line %d
 
-Warning: highlight_file(): Failed opening 
'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA in %s on line %d
+Warning: highlight_file(): Failed opening 
'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
 for highlighting in %s006.php on line %d
 bool(false)
 bool(false)
-Done
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/007.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/strings/007.phpt
diff -u php-src/ext/standard/tests/strings/007.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/007.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/strings/007.phpt:1.1.2.2 Thu May 10 16:28:11 2007
+++ php-src/ext/standard/tests/strings/007.phpt Sun Mar 16 21:06:53 2008
@@ -8,10 +8,10 @@
 var_dump(php_strip_whitespace($file));
 var_dump(ob_get_contents());
 
-echo "Done\n";
 ?>
+===DONE===
 --EXPECTF--    
-Warning: 
php_strip_whitespace(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA in %s on line %d
+Warning: 
php_strip_whitespace(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): failed to 
open stream: File name too long in %s007.php on line %d
 string(0) ""
 bool(false)
-Done
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/highlight_file.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/strings/highlight_file.phpt
diff -u php-src/ext/standard/tests/strings/highlight_file.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/highlight_file.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/strings/highlight_file.phpt:1.1.2.2      Thu Nov 
16 13:01:23 2006
+++ php-src/ext/standard/tests/strings/highlight_file.phpt      Sun Mar 16 
21:06:53 2008
@@ -7,6 +7,7 @@
 highlight.bg=#FFFFFF
 highlight.default=#0000BB
 highlight.html=#000000
+allow_url_include=1
 --FILE--
 <?php
 
@@ -15,19 +16,9 @@
 var_dump(highlight_file());
 var_dump(highlight_file($filename));
 
-$data = <<<DATA
-<?php echo "test"; ?>
-DATA;
+var_dump(highlight_file('data:,<?php echo "test"; ?>'));
 
-file_put_contents($filename, $data);
-var_dump(highlight_file($filename));
-
-$data = <<<DATA
-<?php echo "test ?>
-DATA;
-
-file_put_contents($filename, $data);
-var_dump(highlight_file($filename));
+var_dump(highlight_file('data:,<?php echo "test ?>'));
 
 $data = '
 <?php 
@@ -58,7 +49,7 @@
 </span>
 </code>bool(true)
 <code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: 
#007700">echo&nbsp;</span><span style="color: #DD0000">"test&nbsp;?&gt;</span>
+<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: 
#007700">echo&nbsp;</span><span style="color: #FF9900">"test&nbsp;?&gt;</span>
 </span>
 </code>bool(true)
 <code><span style="color: #000000">
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_basic1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_basic1.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_basic1.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_basic1.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_basic1.phpt:1.1.2.2   Tue Oct 
 9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_basic1.phpt   Sun Mar 16 
21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : basic functionality - with default arguments
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_basic2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_basic2.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_basic2.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_basic2.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_basic2.phpt:1.1.2.2   Tue Oct 
 9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_basic2.phpt   Sun Mar 16 
21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : basic functionality - with all arguments
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_error.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_error.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_error.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_error.phpt:1.1.2.2    Tue Oct 
 9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_error.phpt    Sun Mar 16 
21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : error conditions
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation1.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation1.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_variation1.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_variation1.phpt:1.1.2.2       
Tue Oct  9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_variation1.phpt       Sun Mar 
16 21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - unexpected values for 'str' 
argument
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation10.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation10.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation10.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_variation10.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_variation10.phpt:1.1.2.2      
Tue Oct  9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_variation10.phpt      Sun Mar 
16 21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - single quoted strings
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation2.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation2.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_variation2.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_variation2.phpt:1.1.2.2       
Tue Oct  9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_variation2.phpt       Sun Mar 
16 21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - unexpected values for 
'allowable_tags'
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation3.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation3.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation3.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_variation3.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_variation3.phpt:1.1.2.2       
Tue Oct  9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_variation3.phpt       Sun Mar 
16 21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - unexpected values for both 
'str' and 'allowable_tags'
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation4.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation4.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation4.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_variation4.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_variation4.phpt:1.1.2.2       
Tue Oct  9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_variation4.phpt       Sun Mar 
16 21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - invalid values for 'str' and 
valid 'allowable_tags'
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation5.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation5.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation5.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_variation5.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_variation5.phpt:1.1.2.2       
Tue Oct  9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_variation5.phpt       Sun Mar 
16 21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - heredoc strings
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation6.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation6.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation6.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_variation6.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_variation6.phpt:1.1.2.2       
Tue Oct  9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_variation6.phpt       Sun Mar 
16 21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - binary safe checking
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation7.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation7.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation7.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_variation7.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_variation7.phpt:1.1.2.2       
Tue Oct  9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_variation7.phpt       Sun Mar 
16 21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - invalid values for 'str' and 
'allowable_tags'
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation8.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation8.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation8.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_variation8.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_variation8.phpt:1.1.2.2       
Tue Oct  9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_variation8.phpt       Sun Mar 
16 21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - valid value for 'str' and 
invalid values for 'allowable_tags'
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strip_tags_variation9.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strip_tags_variation9.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags_variation9.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strip_tags_variation9.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strip_tags_variation9.phpt:1.1.2.2       
Tue Oct  9 12:44:45 2007
+++ php-src/ext/standard/tests/strings/strip_tags_variation9.phpt       Sun Mar 
16 21:06:53 2008
@@ -1,7 +1,7 @@
 --TEST--
 Test strip_tags() function : usage variations - double quoted strings
 --INI--
-set short_open_tag = on
+short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/Makefile.frag?r1=1.3.6.1&r2=1.3.6.1.2.1&diff_format=u
Index: php-src/ext/tokenizer/Makefile.frag
diff -u php-src/ext/tokenizer/Makefile.frag:1.3.6.1 
php-src/ext/tokenizer/Makefile.frag:1.3.6.1.2.1
--- php-src/ext/tokenizer/Makefile.frag:1.3.6.1 Thu May 24 21:40:41 2007
+++ php-src/ext/tokenizer/Makefile.frag Sun Mar 16 21:06:53 2008
@@ -1,2 +1,2 @@
-$(top_srcdir)/Zend/zend_language_parser.h:
-$(builddir)/tokenizer.lo: $(top_srcdir)/Zend/zend_language_parser.h
+
+$(builddir)/tokenizer.lo: $(top_srcdir)/Zend/zend_language_parser.c 
$(top_srcdir)/Zend/zend_language_scanner.c
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.7.2.3&r2=1.31.2.5.2.7.2.4&diff_format=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.3 
php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.4
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.3  Tue Feb 12 09:28:01 2008
+++ php-src/ext/tokenizer/tokenizer.c   Sun Mar 16 21:06:53 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.3 2008/02/12 09:28:01 dmitry Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.4 2008/03/16 21:06:53 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -27,67 +27,9 @@
 #include "ext/standard/info.h"
 #include "php_tokenizer.h"
 
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-typedef unsigned int yy_size_t;
-struct yy_buffer_state
-       {
-       FILE *yy_input_file;
- 
-       char *yy_ch_buf;   /* input buffer */
-       char *yy_buf_pos;  /* current position in input buffer */
- 
-       /* Size of input buffer in bytes, not including room for EOB
-        * characters.
-        */
-       yy_size_t yy_buf_size;
- 
-       /* Number of characters read into yy_ch_buf, not including EOB
-        * characters.
-        */
-       int yy_n_chars;
- 
-       /* Whether we "own" the buffer - i.e., we know we created it,
-        * and can realloc() it to grow it, and should free() it to
-        * delete it.
-        */
-       int yy_is_our_buffer;
- 
-       /* Whether this is an "interactive" input source; if so, and
-        * if we're using stdio for input, then we want to use getc()
-        * instead of fread(), to make sure we stop fetching input after
-        * each newline.
-        */
-       int yy_is_interactive;
- 
-       /* Whether we're considered to be at the beginning of a line.
-        * If so, '^' rules will be active on the next match, otherwise
-        * not.
-        */
-       int yy_at_bol;
- 
-       /* Whether to try to fill the input buffer when we reach the
-        * end of it.
-        */
-       int yy_fill_buffer;
- 
-       int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-       /* When an EOF's been seen but there's still some text to process
-        * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-        * shouldn't try reading from the input source any more.  We might
-        * still have a bunch of tokens to match, though, because of
-        * possible backing-up.
-        *
-        * When we actually see the EOF, we change the status to "new"
-        * (via yyrestart()), so that the user can continue scanning by
-        * just pointing yyin at a new input file.
-        */
-#define YY_BUFFER_EOF_PENDING 2
-       };
-
 #include "zend.h"
 #include "zend_language_scanner.h"
+#include "zend_language_scanner_defs.h"
 #include <zend_language_parser.h>
 
 #define zendtext LANG_SCNG(yy_text)
@@ -222,7 +164,7 @@
                RETURN_EMPTY_STRING();
        }
 
-       LANG_SCNG(start) = 1;
+       LANG_SCNG(yy_state) = yycINITIAL;
 
        tokenize(return_value TSRMLS_CC);
        
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tests/token_get_all_variation14.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/tokenizer/tests/token_get_all_variation14.phpt
diff -u php-src/ext/tokenizer/tests/token_get_all_variation14.phpt:1.1.2.2 
php-src/ext/tokenizer/tests/token_get_all_variation14.phpt:1.1.2.3
--- php-src/ext/tokenizer/tests/token_get_all_variation14.phpt:1.1.2.2  Fri Dec 
14 16:21:33 2007
+++ php-src/ext/tokenizer/tests/token_get_all_variation14.phpt  Sun Mar 16 
21:06:54 2008
@@ -266,22 +266,13 @@
   }
 }
 -- with invalid PHP tags and tokens --
-array(2) {
+array(1) {
   [0]=>
   array(3) {
     [0]=>
     int(311)
     [1]=>
-    string(18) "<PDP display  $a; "
-    [2]=>
-    int(1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(311)
-    [1]=>
-    string(1) "<"
+    string(19) "<PDP display  $a; <"
     [2]=>
     int(1)
   }
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.13&r2=1.640.2.23.2.57.2.14&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.13 
php-src/main/main.c:1.640.2.23.2.57.2.14
--- php-src/main/main.c:1.640.2.23.2.57.2.13    Wed Mar 12 20:24:45 2008
+++ php-src/main/main.c Sun Mar 16 21:06:54 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.13 2008/03/12 20:24:45 stas Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.14 2008/03/16 21:06:54 helly Exp $ */
 
 /* {{{ includes
  */
@@ -1055,15 +1055,26 @@
 }
 /* }}} */
 
-static void stream_closer_for_zend(void *handle TSRMLS_DC) /* {{{ */
+static void php_zend_stream_closer(void *handle TSRMLS_DC) /* {{{ */
 {
        php_stream_close((php_stream*)handle);
 }
 /* }}} */
 
-static long stream_fteller_for_zend(void *handle TSRMLS_DC) /* {{{ */
+static void php_zend_stream_mmap_closer(void *handle TSRMLS_DC) /* {{{ */
 {
-       return (long)php_stream_tell((php_stream*)handle);
+       php_stream_mmap_unmap((php_stream*)handle);
+       php_zend_stream_closer(handle);
+}
+/* }}} */
+
+static size_t php_zend_stream_fsizer(void *handle TSRMLS_DC) /* {{{ */
+{
+       php_stream_statbuf  ssb;
+       if (php_stream_stat((php_stream*)handle, &ssb) == 0) {
+               return ssb.sb.st_size;
+       }
+       return 0;
 }
 /* }}} */
 
@@ -1075,19 +1086,30 @@
 
 PHPAPI int php_stream_open_for_zend_ex(const char *filename, zend_file_handle 
*handle, int mode TSRMLS_DC) /* {{{ */
 {
-       php_stream *stream;
-
-       stream = php_stream_open_wrapper((char *)filename, "rb", mode, 
&handle->opened_path);
+       char *p;
+       size_t len, mapped_len;
+       php_stream *stream = php_stream_open_wrapper((char *)filename, "rb", 
mode, &handle->opened_path);
 
        if (stream) {
-               handle->type = ZEND_HANDLE_STREAM;
                handle->filename = (char*)filename;
                handle->free_filename = 0;
-               handle->handle.stream.handle = stream;
-               handle->handle.stream.reader = 
(zend_stream_reader_t)_php_stream_read;
-               handle->handle.stream.closer = stream_closer_for_zend;
-               handle->handle.stream.fteller = stream_fteller_for_zend;
-               handle->handle.stream.interactive = 0;
+               handle->handle.stream.handle  = stream;
+               handle->handle.stream.reader  = 
(zend_stream_reader_t)_php_stream_read;
+               handle->handle.stream.fsizer  = php_zend_stream_fsizer;
+               handle->handle.stream.isatty  = 0;
+               /* can we mmap immeadiately? */
+               memset(&handle->handle.stream.mmap, 0, 
sizeof(handle->handle.stream.mmap));
+               len = php_zend_stream_fsizer(stream TSRMLS_CC) + 
ZEND_MMAP_AHEAD;
+               if (php_stream_mmap_possible(stream)
+               && (p = php_stream_mmap_range(stream, 0, len, 
PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped_len TSRMLS_CC)) != NULL) {
+                       handle->handle.stream.closer   = 
php_zend_stream_mmap_closer;
+                       handle->handle.stream.mmap.buf = p;
+                       handle->handle.stream.mmap.len = mapped_len;
+                       handle->type = ZEND_HANDLE_MAPPED;
+               } else {
+                       handle->handle.stream.closer = php_zend_stream_closer;
+                       handle->type = ZEND_HANDLE_STREAM;
+               }
                /* suppress warning if this stream is not explicitly closed */
                php_stream_auto_cleanup(stream);
 
@@ -1964,7 +1986,7 @@
 
        EG(exit_status) = 0;
        if (php_handle_special_queries(TSRMLS_C)) {
-               zend_file_handle_dtor(primary_file);
+               zend_file_handle_dtor(primary_file TSRMLS_CC);
                return 0;
        }
 #ifndef HAVE_BROKEN_GETCWD
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.13.2.1&r2=1.19.2.7.2.13.2.2&diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.1 
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.2
--- php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.1    Mon Dec 31 07:17:18 2007
+++ php-src/sapi/apache/mod_php5.c      Sun Mar 16 21:06:54 2008
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>                      |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.1 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.2 2008/03/16 21:06:54 helly Exp $ */
 
 #include "php_apache_http.h"
 #include "http_conf_globals.h"
@@ -26,10 +26,6 @@
 #define SIGPIPE SIGINT
 #endif
 
-#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
-#include "ext/mbstring/mbstring.h"
-#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */
-
 #undef shutdown
 
 /* {{{ Prototypes
@@ -589,10 +585,6 @@
                fh.free_filename = 0;
                fh.type = ZEND_HANDLE_FILENAME;
 
-#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
-               php_mb_set_zend_encoding(TSRMLS_C);
-#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */
-
                zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &fh);
                return OK;
        }
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/mod_php5.c?r1=1.11.2.1.2.5.2.1&r2=1.11.2.1.2.5.2.2&diff_format=u
Index: php-src/sapi/apache_hooks/mod_php5.c
diff -u php-src/sapi/apache_hooks/mod_php5.c:1.11.2.1.2.5.2.1 
php-src/sapi/apache_hooks/mod_php5.c:1.11.2.1.2.5.2.2
--- php-src/sapi/apache_hooks/mod_php5.c:1.11.2.1.2.5.2.1       Mon Dec 31 
07:17:18 2007
+++ php-src/sapi/apache_hooks/mod_php5.c        Sun Mar 16 21:06:54 2008
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>                       
                  |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php5.c,v 1.11.2.1.2.5.2.1 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: mod_php5.c,v 1.11.2.1.2.5.2.2 2008/03/16 21:06:54 helly Exp $ */
 
 #include "php_apache_http.h"
 
@@ -25,10 +25,6 @@
 #define SIGPIPE SIGINT
 #endif
 
-#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
-#include "ext/mbstring/mbstring.h"
-#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */
-
 #undef shutdown
 
 /* {{{ Prototypes
@@ -645,10 +641,6 @@
                fh.free_filename = 0;
                fh.type = ZEND_HANDLE_FILENAME;
 
-#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
-               php_mbstring_set_zend_encoding(TSRMLS_C);
-#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */
-
                zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &fh);
                return OK;
        }
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.13&r2=1.267.2.15.2.50.2.14&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.13 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.14
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.13    Thu Feb 28 00:51:56 2008
+++ php-src/sapi/cgi/cgi_main.c Sun Mar 16 21:06:54 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.13 2008/02/28 00:51:56 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.14 2008/03/16 21:06:54 helly Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1960,7 +1960,7 @@
                                case PHP_MODE_STRIP:
                                        if (open_file_for_scanning(&file_handle 
TSRMLS_CC) == SUCCESS) {
                                                zend_strip(TSRMLS_C);
-                                               fclose(file_handle.handle.fp);
+                                               
zend_file_handle_dtor(&file_handle TSRMLS_CC);
                                                php_end_ob_buffers(1 TSRMLS_CC);
                                        }
                                        return SUCCESS;
@@ -1975,7 +1975,7 @@
                                                        if (fastcgi) {
                                                                goto 
fastcgi_request_done;
                                                        }
-                                                       
fclose(file_handle.handle.fp);
+                                                       
zend_file_handle_dtor(&file_handle TSRMLS_CC);
                                                        php_end_ob_buffers(1 
TSRMLS_CC);
                                                }
                                                return SUCCESS;
@@ -1986,7 +1986,7 @@
                                case PHP_MODE_INDENT:
                                        open_file_for_scanning(&file_handle 
TSRMLS_CC);
                                        zend_indent();
-                                       fclose(file_handle.handle.fp);
+                                       zend_file_handle_dtor(&file_handle 
TSRMLS_CC);
                                        return SUCCESS;
                                        break;
 #endif
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/007.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/sapi/cgi/tests/007.phpt
diff -u php-src/sapi/cgi/tests/007.phpt:1.1.2.2 
php-src/sapi/cgi/tests/007.phpt:1.1.2.2.2.1
--- php-src/sapi/cgi/tests/007.phpt:1.1.2.2     Tue Apr 17 19:49:26 2007
+++ php-src/sapi/cgi/tests/007.phpt     Sun Mar 16 21:06:54 2008
@@ -12,11 +12,11 @@
 var_dump(`"$php" -n -f some.php -f some.php`);
 var_dump(`"$php" -s -w -l`);
 
-echo "Done\n";
 ?>
+===DONE===
 --EXPECTF--    
 string(25) "No input file specified.
 "
 string(31) "No syntax errors detected in -
 "
-Done
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.22.2.4&r2=1.129.2.13.2.22.2.5&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.4 
php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.5
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.4      Sun Feb  3 17:49:46 2008
+++ php-src/sapi/cli/php_cli.c  Sun Mar 16 21:06:54 2008
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli.c,v 1.129.2.13.2.22.2.4 2008/02/03 17:49:46 helly Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.22.2.5 2008/03/16 21:06:54 helly Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -550,6 +550,9 @@
 
        *lineno = 1;
 
+       file_handle->type = ZEND_HANDLE_FP;
+       file_handle->opened_path = NULL;
+       file_handle->free_filename = 0;
        if (!(file_handle->handle.fp = VCWD_FOPEN(script_file, "rb"))) {
                php_printf("Could not open input file: %s\n", script_file);
                return FAILURE;
@@ -1166,7 +1169,7 @@
                case PHP_MODE_INDENT:
                        open_file_for_scanning(&file_handle TSRMLS_CC);
                        zend_indent();
-                       fclose(file_handle.handle.fp);
+                       zend_file_handle_dtor(file_handle.handle TSRMLS_CC);
                        goto out;
                        break;
 #endif
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/010.phpt?r1=1.1.2.4&r2=1.1.2.4.2.1&diff_format=u
Index: php-src/sapi/cli/tests/010.phpt
diff -u php-src/sapi/cli/tests/010.phpt:1.1.2.4 
php-src/sapi/cli/tests/010.phpt:1.1.2.4.2.1
--- php-src/sapi/cli/tests/010.phpt:1.1.2.4     Sat Jan 20 22:12:55 2007
+++ php-src/sapi/cli/tests/010.phpt     Sun Mar 16 21:06:54 2008
@@ -12,8 +12,8 @@
 
 $php = getenv('TEST_PHP_EXECUTABLE');
 
-$filename = dirname(__FILE__)."/010.test.php";
-$filename_txt = dirname(__FILE__)."/010.test.txt";
+$filename = __DIR__."/010.test.php";
+$filename_txt = __DIR__."/010.test.txt";
 
 $code = '
 <?php
@@ -25,23 +25,22 @@
 
 $txt = '
 test
-hello
-';
+hello';
 
 file_put_contents($filename_txt, $txt);
 
 var_dump(`cat "$filename_txt" | "$php" -n -F "$filename"`);
 
[EMAIL PROTECTED]($filename);
[EMAIL PROTECTED]($filename_txt);
-
-echo "Done\n";
+?>
+===DONE===
+--CLEAN--
+<?php
[EMAIL PROTECTED](__DIR__."/010.test.php");
[EMAIL PROTECTED](__DIR__."/010.test.txt");
 ?>
 --EXPECTF--    
-string(39) "
+string(25) "
 string(10) "test
 hello"
-
-string(0) ""
 "
-Done
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/016.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/sapi/cli/tests/016.phpt
diff -u php-src/sapi/cli/tests/016.phpt:1.1.2.2 
php-src/sapi/cli/tests/016.phpt:1.1.2.3
--- php-src/sapi/cli/tests/016.phpt:1.1.2.2     Sat Mar  1 21:55:38 2008
+++ php-src/sapi/cli/tests/016.phpt     Sun Mar 16 21:06:54 2008
@@ -103,3 +103,108 @@
 php > 
 
 Done
+--TEST--
+CLI -a and readline 
+--SKIPIF--
+<?php 
+include "skipif.inc"; 
+if (!extension_loaded('readline') || readline_info('done') === NULL) {
+       die ("skip need readline support");
+}
+?>
+--FILE--
+<?php
+$php = getenv('TEST_PHP_EXECUTABLE');
+
+$codes = array();
+
+$codes[1] = <<<EOT
+echo 'Hello world';
+exit
+EOT;
+
+$codes[] = <<<EOT
+echo 'multine
+single
+quote';
+exit
+EOT;
+
+$codes[] = <<<EOT
+echo <<<HEREDOC
+Here
+comes
+the
+doc
+HEREDOC;
+EOT;
+
+$codes[] = <<<EOT
+if (0) {
+    echo "I'm not there";
+}
+echo "Done";
+EOT;
+
+$codes[] = <<<EOT
+function a_function_with_some_name() {
+    echo "I was called!";
+}
+a_function_w   );
+EOT;
+
+foreach ($codes as $key => $code) {
+       echo "\n--------------\nSnippet no. $key:\n--------------\n";
+       $code = escapeshellarg($code);
+       echo `echo $code | "$php" -a`, "\n";
+}
+
+echo "\nDone\n";
+?>
+--EXPECTF--
+--------------
+Snippet no. 1:
+--------------
+Interactive shell
+
+php > Hello world
+php > 
+
+--------------
+Snippet no. 2:
+--------------
+Interactive shell
+
+php > php ' php ' multine
+single
+quote
+php > 
+
+--------------
+Snippet no. 3:
+--------------
+Interactive shell
+
+php > <<< > <<< > <<< > <<< > <<< > Here
+comes
+the
+doc
+php > 
+
+--------------
+Snippet no. 4:
+--------------
+Interactive shell
+
+php > php { php { php > Done
+php > 
+
+--------------
+Snippet no. 5:
+--------------
+Interactive shell
+
+php > php { php { php > I was called!
+php > 
+
+Done
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/017.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/sapi/cli/tests/017.phpt
diff -u php-src/sapi/cli/tests/017.phpt:1.1.2.2 
php-src/sapi/cli/tests/017.phpt:1.1.2.3
--- php-src/sapi/cli/tests/017.phpt:1.1.2.2     Sat Mar  1 21:55:38 2008
+++ php-src/sapi/cli/tests/017.phpt     Sun Mar 16 21:06:54 2008
@@ -104,3 +104,109 @@
 
 
 Done
+--TEST--
+CLI -a and libedit 
+--SKIPIF--
+<?php 
+include "skipif.inc"; 
+if (!extension_loaded('readline') || readline_info('done') !== NULL) {
+       die ("skip need readline support using libedit");
+}
+?>
+--FILE--
+<?php
+$php = getenv('TEST_PHP_EXECUTABLE');
+
+$codes = array();
+
+$codes[1] = <<<EOT
+echo 'Hello world';
+exit
+EOT;
+
+$codes[] = <<<EOT
+echo 'multine
+single
+quote';
+exit
+EOT;
+
+$codes[] = <<<EOT
+echo <<<HEREDOC
+Here
+comes
+the
+doc
+HEREDOC;
+EOT;
+
+$codes[] = <<<EOT
+if (0) {
+    echo "I'm not there";
+}
+echo "Done";
+EOT;
+
+$codes[] = <<<EOT
+function a_function_with_some_name() {
+    echo "I was called!";
+}
+a_function_w   );
+EOT;
+
+foreach ($codes as $key => $code) {
+       echo "\n--------------\nSnippet no. $key:\n--------------\n";
+       $code = escapeshellarg($code);
+       echo `echo $code | "$php" -a`, "\n";
+}
+
+echo "\nDone\n";
+?>
+--EXPECTF--
+--------------
+Snippet no. 1:
+--------------
+Interactive shell
+
+Hello world
+
+
+--------------
+Snippet no. 2:
+--------------
+Interactive shell
+
+multine
+single
+quote
+
+
+--------------
+Snippet no. 3:
+--------------
+Interactive shell
+
+Here
+comes
+the
+doc
+
+
+--------------
+Snippet no. 4:
+--------------
+Interactive shell
+
+Done
+
+
+--------------
+Snippet no. 5:
+--------------
+Interactive shell
+
+
+Parse error: syntax error, unexpected ')' in php shell code on line 1
+
+
+Done
http://cvs.php.net/viewvc.cgi/php-src/sapi/tests/test003.phpt?r1=1.2&r2=1.2.8.1&diff_format=u
Index: php-src/sapi/tests/test003.phpt
diff -u php-src/sapi/tests/test003.phpt:1.2 
php-src/sapi/tests/test003.phpt:1.2.8.1
--- php-src/sapi/tests/test003.phpt:1.2 Wed May 19 08:45:23 2004
+++ php-src/sapi/tests/test003.phpt     Sun Mar 16 21:06:54 2008
@@ -9,9 +9,9 @@
 END;
 --ENV--
 return <<<END
-PATH_TRANSLATED=$filename/path/info
-PATH_INFO=$scriptname/path/info
-SCRIPT_NAME=$scriptname
+PATH_TRANSLATED=/path/bla
+PATH_INFO=/path/info
+SCRIPT_NAME=path
 END;
 --FILE--
 <?php
http://cvs.php.net/viewvc.cgi/php-src/sapi/tests/test004.phpt?r1=1.2&r2=1.2.8.1&diff_format=u
Index: php-src/sapi/tests/test004.phpt
diff -u php-src/sapi/tests/test004.phpt:1.2 
php-src/sapi/tests/test004.phpt:1.2.8.1
--- php-src/sapi/tests/test004.phpt:1.2 Wed May 19 08:45:23 2004
+++ php-src/sapi/tests/test004.phpt     Sun Mar 16 21:06:54 2008
@@ -12,9 +12,9 @@
 END;
 --ENV--
 return <<<END
-REDIRECT_URL=$scriptname
-PATH_TRANSLATED=$filename/path/info
-PATH_INFO=$scriptname/path/info
+REDIRECT_URL=/path
+PATH_TRANSLATED=/path/info/fpp
+PATH_INFO=/path/info
 SCRIPT_NAME=/scriptalias/php
 SCRIPT_FILENAME=$this->conf['TEST_PHP_EXECUTABLE']
 END;
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.4&r2=1.40.2.8.2.10.2.5&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.4 
php-src/win32/build/config.w32:1.40.2.8.2.10.2.5
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.4    Wed Jan 23 19:55:37 2008
+++ php-src/win32/build/config.w32      Sun Mar 16 21:06:54 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.4 2008/01/23 19:55:37 stas Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.5 2008/03/16 21:06:54 helly Exp $
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
@@ -333,12 +333,6 @@
 ARG_ENABLE('fd-setsize', "Set maximum number of sockets for select(2)", "256");
 ADD_FLAG("CFLAGS", "/D FD_SETSIZE=" + parseInt(PHP_FD_SETSIZE));
 
-ARG_ENABLE("zend-multibyte", "Enable Zend multibyte encoding support", "no");
-if (PHP_ZEND_MULTIBYTE == "yes") {
-       STDOUT.WriteLine("Enabling Zend multibyte encoding support");
-       AC_DEFINE('ZEND_MULTIBYTE', 1);
-}
-
 AC_DEFINE('HAVE_USLEEP', 1);
 AC_DEFINE('HAVE_STRCOLL', 1);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to