- Reverted mem alloc function change

- Fixed lineno on method declarations
- Update exit status
2026-11-10 02:30:50 +00:00 · 2010-07-20 17:22:51 +00:00 · 2010-07-19 23:34:16 +00:00 · 2010-07-19 22:46:45 +00:00 · 2010-07-17 17:47:06 +00:00 · 2010-07-17 01:24:20 +00:00
5955 changed files with 303327 additions and 464712 deletions
@@ -1,21 +1,8 @@
-define set_ts
-	set $tsrm_ls = $arg0
-end
-
-document set_ts
-	set the ts resource, it is impossible for gdb to
-	call ts_resource_ex while no process is running,
-	but we could get the resource from the argument 
-	of frame info.
-end
-
 define ____executor_globals
 	if basic_functions_module.zts
-		if !$tsrm_ls
-			set $tsrm_ls = ts_resource_ex(0, 0)
-		end
-		set $eg = ((zend_executor_globals*) (*((void ***) $tsrm_ls))[executor_globals_id-1])
-		set $cg = ((zend_compiler_globals*) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
+		set $tsrm_ls = ts_resource_ex(0, 0)
+		set $eg = ((zend_executor_globals) (*((void ***) $tsrm_ls))[executor_globals_id-1])
+		set $cg = ((zend_compiler_globals) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
 	else
 		set $eg = executor_globals
 		set $cg = compiler_globals
@@ -50,101 +37,9 @@ end
 define dump_bt
 	set $t = $arg0
 	while $t
-		printf "[%p] ", $t
-		set $fst = $t->function_state
-		if $fst.function->common.function_name
-			if $fst.arguments
-				set $count = (int)*($fst.arguments)
-
-				if $t->object
-					if $fst.function.common.scope
-						printf "%s->", $fst.function.common.scope->name
-					else
-						if !$eg
-							____executor_globals
-						end
-
-						set $known_class = 0
-						if $eg
-							set $handle = $t->object.value.obj.handle
-							set $handlers = $t->object.value.obj.handlers
-							set $zobj = (zend_object *)$eg.objects_store.object_buckets[$handle].bucket.obj.object
-
-							if $handlers->get_class_entry == &zend_std_object_get_class
-								set $known_class = 1
-
-								if $handlers.get_class_name
-									if $handlers.get_class_name != &zend_std_object_get_class_name
-										set $known_class = 0
-									end
-								end
-
-								if $known_class
-									printf "%s->", $zobj->ce.name
-								end
-							end
-						end
-
-						if !$known_class
-							printf "(Unknown)->"
-						end
-					end
-				else
-					if $fst.function.common.scope
-						printf "%s::", $fst.function.common.scope->name
-					end
-				end
-
-				printf "%s(", $fst.function->common.function_name
-				while $count > 0
-					set $zvalue = *(zval **)($fst.arguments - $count)
-					set $type = $zvalue->type
-					if $type == 0
-						printf "NULL"
-					end
-					if $type == 1
-						printf "%ld", $zvalue->value.lval
-					end
-					if $type == 2
-						printf "%lf", $zvalue->value.dval
-					end
-					if $type == 3
-						if $zvalue->value.lval
-							printf "true"
-						else
-							printf "false"
-						end
-					end
-					if $type == 4
-						printf "array(%d)[%p]", $zvalue->value.ht->nNumOfElements, $zvalue
-					end
-					if $type == 5
-						printf "object[%p]", $zvalue
-					end
-					if $type == 6
-						____print_str $zvalue->value.str.val $zvalue->value.str.len
-					end
-					if $type == 7
-						printf "resource(#%d)", $zvalue->value.lval
-					end
-					if $type == 8
-						printf "constant"
-					end
-					if $type == 9
-						printf "const_array"
-					end
-					if $type > 9
-						printf "unknown type %d", $type
-					end
-					set $count = $count -1
-					if $count > 0
-						printf ", "
-					end
-				end
-				printf ") "
-			else
-				printf "%s() ", $fst.function->common.function_name
-			end
+		printf "[0x%08x] ", $t
+		if $t->function_state.function->common.function_name
+			printf "%s() ", $t->function_state.function->common.function_name
 		else
 			printf "??? "
 		end
@@ -272,7 +167,7 @@ define ____printzv
 	____executor_globals
 	set $zvalue = $arg0

-	printf "[%p] ", $zvalue
+	printf "[0x%08x] ", $zvalue

 	if $zvalue == $eg.uninitialized_zval_ptr
 		printf "*uninitialized* "
@@ -313,7 +208,7 @@ end

 define print_const_table
 	set $ind = 1
-	printf "[%p] {\n", $arg0
+	printf "[0x%08x] {\n", $arg0
 	____print_const_table $arg0
 	printf "}\n"
 end
@@ -353,7 +248,7 @@ end

 define print_ht
 	set $ind = 1
-	printf "[%p] {\n", $arg0
+	printf "[0x%08x] {\n", $arg0
 	____print_ht $arg0 1
 	printf "}\n"
 end
@@ -364,7 +259,7 @@ end

 define print_htptr
 	set $ind = 1
-	printf "[%p] {\n", $arg0
+	printf "[0x%08x] {\n", $arg0
 	____print_ht $arg0 0
 	printf "}\n"
 end
@@ -375,7 +270,7 @@ end

 define print_htstr
 	set $ind = 1
-	printf "[%p] {\n", $arg0
+	printf "[0x%08x] {\n", $arg0
 	____print_ht $arg0 2
 	printf "}\n"
 end
@@ -411,7 +306,7 @@ end

 define print_ft
 	set $ind = 1
-	printf "[%p] {\n", $arg0
+	printf "[0x%08x] {\n", $arg0
 	____print_ft $arg0
 	printf "}\n"
 end
@@ -488,7 +383,7 @@ end

 define print_pi
 	set $pi = $arg0
-	printf "[%p] {\n", $pi
+	printf "[0x%08x] {\n", $pi
 	printf "    h     = %lu\n", $pi->h
 	printf "    flags = %d (", $pi->flags
 	if $pi->flags & 0x100
@@ -544,7 +439,7 @@ define printzn
 		set $optype = "IS_UNUSED"
 	end

-	printf "[%p] %s", $znode, $optype
+	printf "[0x%08x] %s", $znode, $optype

 	if $znode->op_type == 1
 		printf ": "
@@ -624,7 +519,7 @@ define zmemcheck
 			else
 				set $filename = $filename + 1
 			end
-			printf " %p ", $aptr
+			printf " 0x%08x ", $aptr
 			if $p->size == sizeof(struct _zval_struct) && ((struct _zval_struct *)$aptr)->type >= 0 && ((struct _zval_struct *)$aptr)->type < 10
 				printf "ZVAL?(%-2d) ", $p->size
 			else
@@ -654,7 +549,7 @@ define zmemcheck
 		end
 	end
 	if $not_found
-		printf "no such block that begins at %p.\n", $aptr
+		printf "no such block that begins at 0x%08x.\n", $aptr 
 	end
 	if $arg0 == 0
 		printf "-------------------------------------------------------------------------------\n"
@@ -1,177 +0,0 @@
-ext/mysqlnd/mysqlnd.h           ident
-ext/simplexml/simplexml.c       ident
-ext/iconv/php_iconv.h           ident
-ext/posix/posix.c               ident
-ext/recode/recode.c             ident
-ext/skeleton/create_stubs       ident
-ext/phar/phar/pharcommand.inc   ident
-ext/phar/phar.c                 ident
-ext/sysvmsg/sysvmsg.c           ident
-ext/enchant/enchant.c           ident
-ext/reflection/php_reflection.c ident
-ext/oci8/oci8.c                 ident
-ext/dba/libinifile/inifile.c    ident
-ext/dba/libflatfile/flatfile.c  ident
-ext/dba/libcdb/cdb_make.c       ident
-ext/dba/libcdb/cdb.c            ident
-ext/filter/filter.c             ident
-ext/zip/php_zip.c               ident
-README.input_filter             ident
-run-tests.php                   ident
-sapi/nsapi/nsapi.c              ident
-sapi/continuity/capi.c          ident
-Zend/RFCs/002.txt               ident
-Zend/RFCs/003.txt               ident
-NEWS                            merge=NEWS
-UPGRADING                       merge=NEWS
-UPGRADING.INTERNALS             merge=NEWS
-/ext/bz2/tests/with_strings.phpt	-crlf
-/ext/dom/tests/bug40836.phpt	-crlf
-/ext/dom/tests/domelement.phpt	-crlf
-/ext/ereg/tests/eregi_basic_002.phpt	-crlf
-/ext/iconv/tests/iconv004.phpt	-crlf
-/ext/iconv/tests/iconv_basic.phpt	-crlf
-/ext/iconv/tests/iconv_strpos.phpt	-crlf
-/ext/iconv/tests/iconv_strpos_variation2.phpt	-crlf
-/ext/mbstring/tests/mb_strtoupper_error2.phpt	-crlf
-/ext/phar/tests/delete_in_phar_confirm.phpt	-crlf
-/ext/phar/tests/frontcontroller12.phpt	-crlf
-/ext/phar/tests/security.phpt	-crlf
-/ext/phar/tests/test_signaturealgos.phpt	-crlf
-/ext/reflection/tests/ReflectionMethod_invokeArgs_basic.phpt	-crlf
-/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt	-crlf
-/ext/spl/tests/dllist_007.phpt	-crlf
-/ext/spl/tests/iterator_012.phpt	-crlf
-/ext/spl/tests/SplArray_fromArray.phpt	-crlf
-/ext/standard/tests/dir/scandir_variation3.phpt	-crlf
-/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt	-crlf
-/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt	-crlf
-/ext/standard/tests/strings/bug26817.phpt	-crlf
-/ext/standard/tests/strings/bug26973.phpt	-crlf
-/ext/standard/tests/strings/bug27457.phpt	-crlf
-/ext/standard/tests/strings/bug28386.phpt	-crlf
-/ext/standard/tests/strings/bug37262.phpt	-crlf
-/ext/standard/tests/strings/bug40637.phpt	-crlf
-/ext/standard/tests/strings/bug40915.phpt	-crlf
-/ext/standard/tests/strings/bug61374.phpt	-crlf
-/ext/standard/tests/strings/chop_error.phpt	-crlf
-/ext/standard/tests/strings/chop_variation2.phpt	-crlf
-/ext/standard/tests/strings/chunk_split_variation10.phpt	-crlf
-/ext/standard/tests/strings/chunk_split_variation8.phpt	-crlf
-/ext/standard/tests/strings/count_chars_variation2.phpt	-crlf
-/ext/standard/tests/strings/dirname_error.phpt	-crlf
-/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt	-crlf
-/ext/standard/tests/strings/highlight_file.phpt	-crlf
-/ext/standard/tests/strings/htmlentities03.phpt	-crlf
-/ext/standard/tests/strings/htmlentities04.phpt	-crlf
-/ext/standard/tests/strings/htmlentities08.phpt	-crlf
-/ext/standard/tests/strings/htmlentities15.phpt	-crlf
-/ext/standard/tests/strings/http_build_query.phpt	-crlf
-/ext/standard/tests/strings/metaphone.phpt	-crlf
-/ext/standard/tests/strings/ord_error.phpt	-crlf
-/ext/standard/tests/strings/printf_basic2.phpt	-crlf
-/ext/standard/tests/strings/printf_variation2.phpt	-crlf
-/ext/standard/tests/strings/quoted_printable_decode_basic.phpt	-crlf
-/ext/standard/tests/strings/rtrim.phpt	-crlf
-/ext/standard/tests/strings/setlocale_variation1.phpt	-crlf
-/ext/standard/tests/strings/sha1_basic.phpt	-crlf
-/ext/standard/tests/strings/similar_text_basic.phpt	-crlf
-/ext/standard/tests/strings/soundex.phpt	-crlf
-/ext/standard/tests/strings/sprintf_basic1.phpt	-crlf
-/ext/standard/tests/strings/sprintf_basic4.phpt	-crlf
-/ext/standard/tests/strings/sprintf_basic7.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation12.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation28.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation29.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation30.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation31.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation38.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation42.phpt	-crlf
-/ext/standard/tests/strings/sprintf_variation6.phpt	-crlf
-/ext/standard/tests/strings/sscanf_basic2.phpt	-crlf
-/ext/standard/tests/strings/sscanf_basic3.phpt	-crlf
-/ext/standard/tests/strings/str_getcsv_001.phpt	-crlf
-/ext/standard/tests/strings/stripcslashes_basic.phpt	-crlf
-/ext/standard/tests/strings/stripos_variation11.phpt	-crlf
-/ext/standard/tests/strings/stripos_variation13.phpt	-crlf
-/ext/standard/tests/strings/stripslashes_variation1.phpt	-crlf
-/ext/standard/tests/strings/stripslashes_variation2.phpt	-crlf
-/ext/standard/tests/strings/stristr_error.phpt	-crlf
-/ext/standard/tests/strings/strnatcasecmp_basic.phpt	-crlf
-/ext/standard/tests/strings/strncasecmp_variation6.phpt	-crlf
-/ext/standard/tests/strings/strncasecmp_variation7.phpt	-crlf
-/ext/standard/tests/strings/strncasecmp_variation8.phpt	-crlf
-/ext/standard/tests/strings/strrchr_error.phpt	-crlf
-/ext/standard/tests/strings/strrchr.phpt	-crlf
-/ext/standard/tests/strings/strrchr_variation11.phpt	-crlf
-/ext/standard/tests/strings/strrpos_error.phpt	-crlf
-/ext/standard/tests/strings/strrpos_variation4.phpt	-crlf
-/ext/standard/tests/strings/strrpos_variation8.phpt	-crlf
-/ext/standard/tests/strings/strstr2.phpt	-crlf
-/ext/standard/tests/strings/strtok_error.phpt	-crlf
-/ext/standard/tests/strings/strtok_variation2.phpt	-crlf
-/ext/standard/tests/strings/strtolower-win32.phpt	-crlf
-/ext/standard/tests/strings/substr_compare.phpt	-crlf
-/ext/standard/tests/strings/ucwords_variation1.phpt	-crlf
-/ext/standard/tests/strings/unpack.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_variation12.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt	-crlf
-/ext/standard/tests/strings/vfprintf_variation7.phpt	-crlf
-/ext/standard/tests/strings/vprintf_basic2.phpt	-crlf
-/ext/standard/tests/strings/vprintf_basic7_64bit.phpt	-crlf
-/ext/standard/tests/strings/vprintf_variation10.phpt	-crlf
-/ext/standard/tests/strings/vprintf_variation14_64bit.phpt	-crlf
-/ext/standard/tests/strings/vprintf_variation17.phpt	-crlf
-/ext/standard/tests/strings/vprintf_variation4.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_basic4.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_basic8.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation17.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt	-crlf
-/ext/standard/tests/strings/vsprintf_variation7.phpt	-crlf
-/ext/standard/tests/strings/wordwrap.phpt	-crlf
-/ext/standard/tests/strings/wordwrap_variation5.phpt	-crlf
-/ext/standard/tests/url/rawurldecode_variation_001.phpt	-crlf
-/ext/tidy/tests/009.phpt	-crlf
-/ext/tidy/tests/013.phpt	-crlf
-/ext/tidy/tests/021.phpt	-crlf
-/ext/tidy/tests/tidy_error.phpt	-crlf
-/ext/tokenizer/tests/002.phpt	-crlf
-/ext/tokenizer/tests/bug26463.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_error.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation11.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation12.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation13.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation14.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation15.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation18.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation19.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation1.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation2.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation3.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation5.phpt	-crlf
-/ext/tokenizer/tests/token_get_all_variation8.phpt	-crlf
-/ext/xml/tests/bug32001b.phpt		-crlf
-/ext/xmlwriter/tests/OO_003.phpt	-crlf
-/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt	-crlf
-/ext/zlib/tests/008.phpt			-crlf
-/ext/zlib/tests/gzopen_variation4.phpt	-crlf
-/ext/zlib/tests/gzrewind_error.phpt	-crlf
-/ext/zlib/tests/readgzfile_variation7.phpt	-crlf
-/ext/zlib/tests/readgzfile_variation8.phpt	-crlf
-/ext/zlib/tests/zlib_scheme_stat_basic.phpt	-crlf
-/sapi/cli/tests/006.phpt			-crlf
-/tests/run-test/test009.phpt		-crlf
-/Zend/tests/012.phpt				-crlf
-/Zend/tests/bug28072.phpt			-crlf
-/Zend/tests/bug38624.phpt			-crlf
-/Zend/tests/bug40784.phpt			-crlf
-/Zend/tests/bug43053.phpt			-crlf
-/Zend/tests/bug51176.phpt			-crlf
-/Zend/tests/each_003.phpt			-crlf
-/Zend/tests/errmsg_006.phpt			-crlf
@@ -1,256 +0,0 @@
-# General Ignores
-*~
-.#*
-*.
-*.slo
-*.mk
-*.mem
-*.gcda
-*.gcno
-*.la
-*.lo
-*.o
-*.a
-*.ncb
-*.opt
-*.plg
-*swp
-*.patch
-*.tgz
-*.tar.gz
-*.tar.bz2
-.FBCIndex
-.FBCLockFolder
-.deps
-.libs
-phpt.*
-core
-dynlib.m4
-Debug
-Debug_TS
-Makefile
-Makefile.fragments
-Makefile.objects
-Release
-Release_TS
-Release_TSDbg
-Release_TS_inline
-Release_inline
-ZendEngine1
-_libs
-acconfig.h
-aclocal.m4
-autom4te.cache
-bsd_converted
-buildconf.stamp
-buildmk.stamp
-confdefs.h
-config.h
-config.guess
-config.cache
-config.h.in
-config.log
-config.nice
-config.nice.bat
-config.status
-config.sub
-config_vars.mk
-configuration-parser.c
-configuration-parser.h
-configuration-parser.output
-configuration-scanner.c
-configure
-configure.bat
-configure.js
-conftest
-conftest.c
-debug.log
-diff
-generated_lists
-include
-install-sh
-internal_functions.c
-lcov_data
-lcov_html
-libs
-libtool
-meta_cc
-meta_ccld
-missing
-mkinstalldirs
-modules
-php
-php-*.tar.gz
-php5.spec
-php_lcov.info
-php_test_results_*.txt
-php_version.h
-results.txt
-shlibtool
-stamp-h
-test.php3
-tmp-php.ini
-want_dependencies
-x64
-stamp-h.in
-scan_makefile_in.awk
-TSRM/tsrm_config.h
-Zend/zend_config.h
-Zend/zend_dtrace_gen.h
-Zend/zend_dtrace_gen.hbak
-Zend/zend_ini_parser.c
-Zend/zend_ini_parser.h
-Zend/zend_ini_parser.output
-Zend/zend_language_parser.c
-Zend/zend_language_parser.h
-Zend/zend_language_parser.output
-ext/date/lib/timelib_config.h
-ext/iconv/php_iconv_aliased_libiconv.h
-ext/phar/phar.php
-main/php_config.h
-main/php_config.h.in
-
-# Test specific Ignores
-tests/*/*.diff
-tests/*/*.out
-tests/*/*.php
-tests/*/*.exp
-tests/*/*.log
-tests/*/*.sh
-*/tests/*.diff
-*/tests/*.out
-*/tests/*.php
-*/tests/*.exp
-*/tests/*.log
-*/tests/*.sh
-*/tests/*/*.diff
-*/tests/*/*.out
-*/tests/*/*.php
-*/tests/*/*.exp
-*/tests/*/*.log
-*/tests/*/*.sh
-*/*/tests/*.diff
-*/*/tests/*.out
-*/*/tests/*.php
-*/*/tests/*.exp
-*/*/tests/*.log
-*/*/tests/*.sh
-*/*/tests/*/*.diff
-*/*/tests/*/*.out
-*/*/tests/*/*.php
-*/*/tests/*/*.exp
-*/*/tests/*/*.log
-*/*/tests/*/*.sh
-
-# Extension specifc ignores
-ext/*/configure.in
-ext/*/ltmain.sh
-ext/*/libs.mk
-ext/*/build
-ext/*/scan_makefile_in.awk
-ext/*/Makefile.global
-ext/*/acinclude.m4
-ext/*/config.sub
-
-# Extension specific
-ext/iconv/scan_makefile_in.awk
-ext/iconv/php_have_bsd_iconv.h
-ext/iconv/php_have_ibm_iconv.h
-ext/iconv/php_have_libiconv.h
-ext/iconv/php_php_iconv_h_path.h
-ext/iconv/php_have_glibc_iconv.h
-ext/iconv/php_php_iconv_impl.h
-ext/iconv/php_have_iconv.h
-ext/iconv/php_iconv_supports_errno.h
-ext/mbstring/libmbfl/Makefile.in
-ext/mbstring/libmbfl/autoscan.log
-ext/mbstring/libmbfl/config.sub
-ext/mbstring/libmbfl/depcomp
-ext/mbstring/libmbfl/ltmain.sh
-ext/mbstring/libmbfl/stamp-h1
-ext/mbstring/libmbfl/*.dll
-ext/mbstring/libmbfl/*.lib
-ext/mbstring/libmbfl/*.RES
-ext/mbstring/libmbfl/*.res
-ext/mbstring/libmbfl/*.obj
-ext/mbstring/libmbfl/*.tds
-ext/mbstring/libmbfl/filters/Makefile.in
-ext/mbstring/libmbfl/mbfl/Makefile.in
-ext/mbstring/libmbfl/mbfl/EastAsianWidth.txt
-ext/mbstring/libmbfl/nls/Makefile.in
-ext/mssql/#*#
-ext/mssql/Makefile.global
-ext/mssql/acinclude.m4
-ext/mssql/config.sub
-ext/mssql/configure.in
-ext/mssql/ltmain.sh
-ext/mysql/weztest.sqlite
-ext/oci8/tests/*.tmp
-ext/oci8/tests/*.vglog
-ext/pdo/conftest*
-ext/pdo/tests/*.db
-ext/pdo/tests/*.tmp
-ext/pdo_firebird/conftest*
-ext/pdo_mysql/conftest*
-ext/pdo_mysql/tests/*.db
-ext/pdo_mysql/tests/*.tmp
-ext/pdo_oci/conftest*
-ext/pdo_odbc/tests/*.db
-ext/pdo_odbc/tests/*.tmp
-ext/pdo_odbc/tests/*.mdb
-ext/pdo_pgsql/conftest*
-ext/pdo_pgsql/tests/*.db
-ext/pdo_pgsql/tests/*.tmp
-ext/pdo_sqlite/conftest*
-ext/pdo_sqlite/sqlite3.h
-ext/pdo_sqlite/tests/*.db
-ext/pdo_sqlite/tests/*.tmp
-ext/phar/phar.phar
-ext/pspell/tests/*.tmp
-ext/reflection/xml
-ext/reflection/html
-ext/reflection/spl.chm
-ext/simplexml/examples/security.new.xml
-ext/spl/examples/.htaccess
-ext/spl/examples/*.phps
-ext/sqlite/weztest.sqlite
-ext/sqlite/libsqlite/src/sqlite.h
-ext/sqlite/libsqlite/src/parse.out
-ext/sqlite/libsqlite/src/libsqlite.dsw
-ext/sqlite3/tests/phpsql*
-ext/sqlite3/tests/*.db
-ext/sqlite3/tests/*.tmp
-ext/standard/tests/misc/*.txt
-ext/standard/tests/strings/*.txt
-main/build-defs.h
-main/internal_functions_cli.c
-main/config.w32.h
-main/stamp-h1
-main/streams/build-defs.h
-main/streams/stamp-h1
-pear/install-pear-nozlib.phar
-pear/phpize
-pear/run-tests
-pear/php-config
-pear/scripts
-sapi/apache/libphp5.module
-sapi/apache2handler/libphp5.module
-sapi/apache_hooks/libphp5.module
-sapi/cgi/php-cgi
-sapi/cli/php.1
-sapi/fpm/php-fpm
-sapi/fpm/php-fpm.1
-sapi/fpm/init.d.php-fpm
-sapi/fpm/php-fpm.conf
-sapi/fpm/fpm/php-cgi
-scripts/php-config
-scripts/phpize
-scripts/man1/*.1
-win32/*.suo
-win32/*.aps
-win32/*.positions
-win32/ext
-win32/phpts.def
-win32/wsyslog.h
-win32/win32.dsp
-win32/php.dsw
@@ -1,24 +0,0 @@
-language: php
-
-php:
-    # We only specify one version so we only get one worker
-    - 5.4
-
-notifications:
-    email: false
-
-env:
-    - REPORT_EXIT_STATUS=1
-
-before_script:
-    # Compile PHP
-    - ./travis/compile.sh
-    # Setup Extensions 
-    - . ./travis/ext/mysql/setup.sh
-    - . ./travis/ext/mysqli/setup.sh
-    - . ./travis/ext/pdo_mysql/setup.sh
-    - . ./travis/ext/pgsql/setup.sh
-    - . ./travis/ext/pdo_pgsql/setup.sh
-
-# Run PHPs run-tests.php 
-script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff
@@ -2,11 +2,11 @@
  PHP Coding Standards
 ========================

-This file lists several standards that any programmer adding or changing
-code in PHP should follow.  Since this file was added at a very late
+This file lists several standards that any programmer, adding or changing
+code in PHP, should follow.  Since this file was added at a very late
 stage of the development of PHP v3.0, the code base does not (yet) fully
 follow it, but it's going in that general direction.  Since we are now
-well into version 5 releases, many sections have been recoded to use
+well into the version 4 releases, many sections have been recoded to use
 these rules.

 Code Implementation
@@ -337,7 +337,7 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           curl
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>, Ilia Alshanetsky <iliaa@php.net>, Pierrick Charron <pierrick@php.net>
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>,Ilia Alshanetsky <iliaa@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.2
@@ -497,8 +497,8 @@ STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
 EXTENSION:           snmp
-PRIMARY MAINTAINER:  Boris Lytochkin <lytboris@php.net>, Rasmus Lerdorf <rasmus@php.net>, Pierre-Alain Joye <pajoye@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>, Pierre-Alain Joye <pajoye@php.net>
+MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sockets
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2009 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -1,3 +1,8 @@
+#
+# Lemon
+#
+lemon: lemon.c
+	$(CC) -o $@ -Wall $?

 #
 # Zend
@@ -10,12 +15,12 @@ $(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
 	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)

 $(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
-$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
-	@$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@
+$(srcdir)/zend_language_parser.c: lemon $(srcdir)/zend_language_parser.y
+	$(LEMON) $(LEMON_FLAGS) $(srcdir)/zend_language_parser.y || test $$? -eq 2

 $(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
-$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
-	@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
+$(srcdir)/zend_ini_parser.c: lemon $(srcdir)/zend_ini_parser.y
+	@$(LEMON) $(LEMON_FLAGS) $(srcdir)/zend_ini_parser.y 

 $(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
 	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
@@ -3,8 +3,6 @@
 # LCOV
 #

-LCOV_INCLUDE="."
-
 lcov: lcov-html

 lcov-test: lcov-clean-data test
@@ -14,8 +12,7 @@ php_lcov.info: lcov-test
 	@rm -rf lcov_data/
 	@$(mkinstalldirs) lcov_data/
 	@echo
-	-@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | $(EGREP) $(LCOV_INCLUDE) | uniq` ;\
-	for x in $$files; do \
+	-@find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | while read x; do \
 		echo -n . ;\
 		y=`echo $$x | sed -e 's!\.libs/!!'`; \
 		dir=lcov_data/`dirname $$x`; \
@@ -41,26 +38,14 @@ php_lcov.info: lcov-test
 		if test -f "$(top_builddir)/$$y.c"; then \
 			ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
 		fi; \
-		if test -f "$$x.gcno"; then \
-			cp $$x.gcno lcov_data/$$y.gcno ; \
-		fi; \
-		if test -f "$$x.gcda"; then \
-			cp $$x.gcda lcov_data/$$y.gcda ; \
-		fi; \
-		if test -f "$$x.da"; then \
-			cp $$x.da   lcov_data/$$y.da ; \
-		fi; \
-		if test -f "$$x.bb"; then \
-			cp $$x.bb   lcov_data/$$y.bb ; \
-		fi; \
-		if test -f "$$x.bbg"; then \
-			cp $$x.bbg  lcov_data/$$y.bbg ; \
-		fi; \
-	done; \
+		test -f "$$x.gcno" && cp $$x.gcno lcov_data/$$y.gcno ; \
+		test -f "$$x.gcda" && cp $$x.gcda lcov_data/$$y.gcda ; \
+		test -f "$$x.da"   && cp $$x.da   lcov_data/$$y.da ; \
+		test -f "$$x.bb"   && cp $$x.bb   lcov_data/$$y.bb ; \
+		test -f "$$x.bbg"  && cp $$x.bbg  lcov_data/$$y.bbg ; \
+	done
 	for dir in ext/bcmath/libbcmath ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
-		if test -d lcov_data/$$dir; then \
-			rm -rf lcov_data/$$dir ; \
-		fi; \
+		test -d lcov_data/$$dir && rm -rf lcov_data/$$dir ; \
 	done
 	@echo 
 	@echo "Generating $@"
@@ -1,3 +1,4 @@
+LEMON = $(top_srcdir)/lemon
 mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
 INSTALL = $(top_srcdir)/build/shtool install -c
 INSTALL_DATA = $(INSTALL) -m 644
@@ -13,8 +14,6 @@ all: $(all_targets)
 	
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)

-build-binaries: $(PHP_BINARIES)
-
 libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
@@ -37,8 +36,6 @@ install-sapi: $(OVERALL_TARGET)
 	fi
 	@$(INSTALL_IT)

-install-binaries: build-binaries $(install_binary_targets)
-
 install-modules: build-modules
 	@test -d modules && \
 	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
@@ -86,7 +83,7 @@ PHP_TEST_SHARED_EXTENSIONS =  ` \
 PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='

 test: all
-	@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
 		INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
 		if test "$$INI_FILE"; then \
 			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
@@ -102,9 +99,6 @@ test: all
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
 			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
-		TEST_RESULT_EXIT_CODE=$$?; \
-		rm $(top_builddir)/tmp-php.ini; \
-		exit $$TEST_RESULT_EXIT_CODE; \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
@@ -118,7 +112,7 @@ clean:
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*

 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+	rm -f Makefile lemon config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f

 .PHONY: all clean install distclean test
@@ -1,126 +0,0 @@
-====================
-  Git Commit Rules
-====================
-
-This is the first file you should be reading when contributing code via Git.
-We'll assume you're basically familiar with Git, but feel free to post
-your questions on the mailing list. Please have a look at
-http://git-scm.com/ for more detailed information on Git.
-
-PHP is developed through the efforts of a large number of people.
-Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
-some basic rules with regards to Git usage will::
-
-   a. Make everybody happier, especially those responsible for maintaining
-      Git itself.
-
-   b. Keep the changes consistently well documented and easily trackable.
-
-   c. Prevent some of those 'Oops' moments.
-
-   d. Increase the general level of good will on planet Earth.
-
-Having said that, here are the organizational rules::
-
-   1. Respect other people working on the project.
-
-   2. Discuss any significant changes on the list before committing and get
-      confirmation from the release manager for the given branch.
-
-   3. Look at EXTENSIONS file to see who is the primary maintainer of
-      the code you want to contribute to.
-
-   4. If you "strongly disagree" about something another person did, don't
-      start fighting publicly - take it up in private email.
-
-   5. If you don't know how to do something, ask first!
-
-   6. Test your changes before committing them. We mean it. Really.
-      To do so use "make test".
-
-   7. For development use the --enable-maintainer-zts switch to ensure your
-      code handles TSRM correctly and doesn't break for those who need that.
-
-Currently we have the following branches in use::
-
-  master    The active development branch. 
-
-  PHP-5.5   Is used to release the PHP 5.5.x series. It allows for larger
-            enhancements.
-
-  PHP-5.4   Is used to release the PHP 5.4.x series. This is current
-            stable version and is open for bugfixes only.
-
-  PHP-5.3   Is used to release the PHP 5.3.x series. This is current 
-            stable version and is open for bugfixes only.
-
-  PHP-5.2   This branch is closed.
-
-  PHP-5.1   This branch is closed.
-
-  PHP-4.4   This branch is closed.
-
-The next few rules are more of a technical nature::
-
-   1. All changes should first go to the lowest branch (i.e. 5.3) and then 
-      get merged up to all other branches. If a change is not needed for
-      later branches (i.e. fixes for features which where dropped from later
-      branches) an empty merge should be done.
-
-   2. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file of the
-      *first* to be released version with the given change. In other words
-      any NEWS file change only needs to done in one branch.
-
-   3. Do not commit multiple file and dump all messages in one commit. If you
-      modified several unrelated files, commit each group separately and
-      provide a nice commit message for each one. See example below.
-
-   4. Do write your commit message in such a way that it makes sense even
-      without the corresponding diff. One should be able to look at it, and
-      immediately know what was modified. Definitely include the function name
-      in the message as shown below.
-
-   5. In your commit messages, keep each line shorter than 80 characters. And
-      try to align your lines vertically, if they wrap. It looks bad otherwise.
-
-   6. If you modified a function that is callable from PHP, prepend PHP to
-      the function name as shown below.
-
-
-The format of the commit messages is pretty simple.
-
-<max 79 characters short description>\n
-\n
-<long description, 79 chars per line>
-\n
-
-An Example from the git project (commit 2b34e486bc):
-
-pack-objects: Fix compilation with NO_PTHREDS
-  
-It looks like commit 99fb6e04 (pack-objects: convert to use
-parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
-hasn't noticed that the 'arg' variable no longer is available.
-
-If you fix some bugs, you should note the bug ID numbers in your
-commit message. Bug ID should be prefixed by "#" for easier access to
-bug report when developers are browsing CVS via LXR or Bonsai.
-
-Example::
-
-  Fixed bug #14016 (pgsql notice handler double free crash bug.)
-
-When you change the NEWS file for a bug fix, then please keep the bugs
-sorted in decreasing order under the fixed version.
-
-You can use OpenGrok (http://lxr.php.net/) and gitweb (http://git.php.net/)
-to look at PHP Git repository in various ways.
-
-
-For further information on the process and further details please refer to
-https://wiki.php.net/vcs/gitworkflow and https://wiki.php.net/vcs/gitfaq
-
-Happy hacking,
-
-PHP Team
@@ -28,17 +28,6 @@ Both functions return SUCCESS or FAILURE depending on the result.
 The auto-conversions are performed as necessary. Arrays, objects, and
 resources cannot be auto-converted.

-PHP 5.5 includes a new function:
-
-int zend_parse_parameter(int flags, int arg_num TSRMLS_DC, zval **arg, const char *spec, ...);
-
-This function behaves like zend_parse_parameters_ex() except that instead of
-reading the arguments from the stack, it receives a single zval to convert
-(passed with double indirection). The passed zval may be changed in place as
-part of the conversion process.
-
-See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse_parameter
-

 Type specifiers
 ---------------
@@ -62,7 +51,6 @@ Type specifiers
 L  - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (long)
 o  - object of any type (zval*)
 O  - object of specific type given by class entry (zval*, zend_class_entry)
- p  - valid path (string without null bytes in the middle) and its length (char*, int)
 r  - resource (zval*)
 s  - string (with possible null bytes) and its length (char*, int)
 z  - the actual zval (zval*)
@@ -76,13 +64,9 @@ Type specifiers
        will not be touched by the parsing function if they are not
        passed to it.
    / - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
-    ! - the parameter it follows can be of specified type or NULL. If NULL is
-		passed and the output for such type is a pointer, then the output
-		pointer is set to a native NULL pointer.
-		For 'b', 'l' and 'd', an extra argument of type zend_bool* must be
-		passed after the corresponding bool*, long* or double* arguments,
-		respectively. A non-zero value will be written to the zend_bool iif a
-		PHP NULL is passed.
+    ! - the parameter it follows can be of specified type or NULL (applies
+		to all specifiers except for 'b', 'l', and 'd'). If NULL is passed, the
+		results pointer is set to NULL as well.


 Note on 64bit compatibility
@@ -51,40 +51,27 @@ SUCH DAMAGE.

 6. ext/standard crypt's blowfish implementation

-The crypt_blowfish homepage is:
-
-http://www.openwall.com/crypt/
-
 This code comes from John the Ripper password cracker, with reentrant
 and crypt(3) interfaces added, but optimizations specific to password
 cracking removed.

-Written by Solar Designer <solar at openwall.com> in 1998-2011.
-No copyright is claimed, and the software is hereby placed in the public
-domain. In case this attempt to disclaim copyright and place the software
-in the public domain is deemed null and void, then the software is
-Copyright (c) 1998-2011 Solar Designer and it is hereby released to the
-general public under the following terms:
+Written by Solar Designer <solar at openwall.com> in 1998-2002 and
+placed in the public domain.

-Redistribution and use in source and binary forms, with or without
-modification, are permitted.
-
-There's ABSOLUTELY NO WARRANTY, express or implied.
+There's absolutely no warranty.

 It is my intent that you should be able to use this on your system,
-as part of a software package, or anywhere else to improve security,
+as a part of a software package, or anywhere else to improve security,
 ensure compatibility, or for any other purpose. I would appreciate
 it if you give credit where it is due and keep your modifications in
 the public domain as well, but I don't require that in order to let
 you place this code and any modifications you make under a license
 of your choice.

-This implementation is mostly compatible with OpenBSD's bcrypt.c (prefix
-"$2a$") by Niels Provos <provos at citi.umich.edu>, and uses some of his
+This implementation is compatible with OpenBSD bcrypt.c (version 2a)
+by Niels Provos <provos at citi.umich.edu>, and uses some of his
 ideas. The password hashing algorithm was designed by David Mazieres
-<dm at lcs.mit.edu>. For more information on the level of compatibility,
-please refer to the comments in BF_set_key() and to the crypt(3) man page
-included in the crypt_blowfish tarball.
+<dm at lcs.mit.edu>.

 There's a paper on the algorithm that explains its design decisions:

@@ -20,18 +20,12 @@ php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand.

 5. Verify the tags to be extra sure everything was tagged properly.

-6. Moving extensions from/to PECL requires write acces to the destination.
-Most developers should have this. 
+6. Moving extensions from/to PECL requires root level access to the CVS server.
+Contact systems@php.net to get this taken care of.

 Moving extensions from php-src to PECL
- Checkout the pecl directory, most likely you want a sparse-root checkout
-  svn co --depth=empty https://svn.php.net/repository/pecl
- Create an directory for the extension incl. branch and tag structure,
-  no trunk at this point and commit this to svn
-  cd pecl; mkdir foo foo/tags foo/branches; svn add foo; svn commit
- Move the extension from php-src to the new location
-  svn mv https://svn.php.net/repository/php/php-src/trunk/ext/foo \
-         https://svn.php.net/repository/pecl/foo/trunk
+- Filesystem: cp -r php-src/ext/foo pecl/foo
+- cvs rm php-src/ext/foo

 If the extension is still usable or not dead, in cooperation with the extension
 maintainers if any:
@@ -39,42 +33,51 @@ maintainers if any:
 - create the package.xml, commit
 - release the package

-For Moving extensions from PECL to php-src the svn mv has to be tone the other
-way round.
+Moving extensions from PECL to php-src
+- Filesystem: cp -r pecl/foo php-src/ext/foo
+OR depending on the wishes from the PECL extension maintainer.
+- Filesystem: ln -s pecl/foo php-src/ext/foo

 Rolling a non stable release (alpha/beta/RC)
 --------------------------------------------

-1. Check windows snapshot builder logs (http://windows.php.net/downloads/snaps/ the last revision)
+1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)

-2. run the "scripts/dev/credits" script in php-src and commit the changes in the
-credits files in ext/standard.
-
-3. Checkout the release branch for this release (e.g., PHP-5.4.2).
-
-4. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
 Do not use abbreviations for alpha and beta.

-5. Commit these changes to the branch with ``git commit -a``.
+3. Commit those changes

-6. Tag the repository with the version, e.g.: 
-``git tag -u YOURKEYID php-5.4.2RC2``
+4. run the "scripts/dev/credits" script in php-src and commit the changes in the
+credits files in ext/standard.

-7. Push the changes to the main repo:
-``git push --tags origin HEAD``
+5. tag the repository with the version f.e. "``cvs tag php_4_4_1RC1``"
+(of course, you need to change that to the version you're rolling an RC for).

-8. run: ``./makedist 5.4.2RC2``, this will export the tree, create configure
-and build three tarballs (gz,bz2 and xz). Make sure you use the same GNU Bison
-version as snaps. Recent bison version are known to break ZTS.
+6. Bump up the version numbers in ``main/php_version.h``, ``configure.in``
+and possibly ``NEWS`` again, to the **next** version. F.e. if the release
+candidate was "4.4.1RC1" then the new one should be "4.4.1RC2-dev" - regardless
+if we get a new RC or not. This is to make sure ``version_compare()`` can
+correctly work.

-9. Copy those three tarballs to www.php.net, in your homedir there should be a
+7. Commit those changes
+
+8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4
+branch if you're rolling 4.4.x releases).
+
+9. You do not have to update the tree, but of course you can with "``cvs up -dP``".
+
+10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure
+and build two tarballs (one gz and one bz2).
+
+11. Copy those two tarballs to www.php.net, in your homedir there should be a
 directory "downloads/". Copy them into there, so that the system can generate
 MD5 sums. If you do not have this directory, talk to Derick.

-10. Now the RC can be found on http://downloads.php.net/yourname,
+12. Now the RC can be found on http://downloads.php.net/yourname,
 f.e. http://downloads.php.net/derick/

-11. Once the release has been tagged, contact the PHP Windows development team
+13. Once the release has been tagged, contact the PHP Windows development team
 (internals-win@lists.php.net) so that Windows binaries can be created. Once
 those are made, they should be placed into the same directory as the source snapshots.

@@ -97,30 +100,33 @@ Derick) run the following commands for you:

 ``sudo -u ezmlm ezmlm-sub ~ezmlm/primary-qa-tester/mod moderator-email-address``

-3. Update ``qa.git/include/release-qa.php`` with the appropriate information.
-   See the documentation within release-qa.php for more information, but all releases
-   and RCs are configured here. Only $QA_RELEASES needs to be edited.
+3. Update the MD5 sums in ``web/qa/trunk/include/rc-md5sums.txt`` (no empty lines).

-   Example: When rolling an RC, set the 'rc' with appropriate information for the
-   given version.
+4. Update in ``web/qa/trunk/include/release-qa.php`` constants with the new RC and
+commit this.

-   Note: Remember to update the MD5 checksum information.
+ a. ``$BUILD_TEST_RELEASES`` = array("4.4.7RC1", "5.2.2RC1")

-4. Update ``php.git/include/version.inc`` (x=major version number)
+ b. ``$CURRENT_QA_RELEASE_4`` = "4.4.7RC1" (``$CURRENT_QA_RELEASE_5`` for PHP5)

- a. ``$PHP_x_RC`` = "5.4.0RC1"
+ c. ``$RELEASE_PROCESS`` = array(4 => true, 5 => true)
+
+1. Update in ``php-bugs/trunk/include/functions.inc`` the ``show_version_option``
+function to include the new RC and commit.
+
+2. Update ``phpweb/include/version.inc`` (x=major version number)
+
+ a. ``$PHP_x_RC`` = "5.3.0RC1"

 b. ``$PHP_x_RC_DATE`` = "06 September 2007"

-5. Commit and push those changes:
+3. Commit those changes:

- a. ``git commit -a && git push origin master``
+ a. ``cvs commit include/version.inc include/releases.inc``

-6. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
+4. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
 INSTALL and win32/install.txt files which are generated from the PHP manual sources.

-7. Publish the announce on www.php.net as well (for all releases, alpha, RCs or other)
-
 Rolling a stable release
 ------------------------

@@ -128,46 +134,37 @@ Rolling a stable release

 2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.

-3. **Merge** all related sections in NEWS (f.e. merge the 5.4.1RC1 and 5.4.0 sections)
+3. **Merge** all related sections in NEWS (f.e. merge the 4.4.1RC1 and 4.4.0 sections)

 4. Commit those changes

 5. run the "scripts/dev/credits" script in php-src and commit the changes in the
 credits files in ext/standard.

-6. tag the repository with the version f.e. "``git tag -s php-5.4.1``"
+6. tag the repository with the version f.e. "``cvs tag php_4_4_1``"
 (of course, you need to change that to the version you're rolling an RC for).
 When making 5.X release, you need to tag the Zend directory separately!!

 7. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and
 possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate
-was "5.4.1RC1" then the new one should be "5.4.1RC2-dev" - regardless if we get
+was "4.4.1RC1" then the new one should be "4.4.1RC2-dev" - regardless if we get
 a new RC or not. This is to make sure ``version_compare()`` can correctly work.

 8. Commit those changes

-9. Log in onto the snaps box and go into the correct tree (f.e. the PHP-5.4
-branch if you're rolling 5.5.x releases).
+9. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4
+branch if you're rolling 4.4.x releases).

-10. You do not have to update the tree, but of course you can with "``git pull
-origin <branch>``".
+10. You do not have to update the tree, but of course you can with "``cvs up -dP``".

-11. run: ``./makedist php 5.4.1``, this will export the tree, create configure
+11. run: ``./makedist php 4.4.1``, this will export the tree, create configure
 and build two tarballs (one gz and one bz2).

-12. Commit those two tarballs to web/php-distributions.git, then update the git
-    submodule reference in web/php.git: 
-    git submodule init;
-    git submodule update;
-    cd distributions;
-    git pull origin master;
-    cd ..;
-    git commit distributions;
-    git push;
+12. Commit those two tarballs to CVS (phpweb/distributions)

 13. Once the release has been tagged, contact the PHP Windows development team
 (internals-win@lists.php.net) so that Windows binaries can be created. Once
-those are made, they should be committed to SVN too.
+those are made, they should be committed to CVS too.

 14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4)

@@ -181,9 +178,6 @@ Getting the stable release announced

 a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)

- b. In case multiple PHP minor versions are in active development you have
-    to manually copy the old information to include/releases.inc
-
 2. Edit ``phpweb/include/version.inc`` and change (X=major release number):

 a. ``$PHP_X_VERSION`` to the correct version
@@ -200,7 +194,7 @@ Getting the stable release announced
 f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")

 3. Update the ChangeLog file for the given major version
-f.e. ``ChangeLog-5.php`` from the NEWS file
+f.e. ``ChangeLog-4.php`` from the NEWS file

 a. go over the list and put every element on one line

@@ -220,9 +214,9 @@ f.e. ``ChangeLog-5.php`` from the NEWS file

  V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``

-4. ``cp releases/5_4_0.php releases/5_4_1.php``
+4. ``cp releases/4_4_0.php releases/4_4_1.php``

-5. ``git add releases/5_4_1.php``
+5. ``cvs add releases/4_4_1.php``

 6. Update the ``releases/*.php`` file with relevant data. The release
 announcement file should list in detail:
@@ -245,6 +239,19 @@ to upgrade.
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 http://news.php.net/php.internals/17222.

+10. Update ``php-bugs-web/include/functions.php`` to include the new version
+number, and remove the RC from there.
+
+11. Update ``qaweb/include/release-qa.php``
+
+ a. Update the $BUILD_TEST_RELEASES array with the release name
+
+ b. Update $RELEASE_PROCESS array (set to false)
+
+  I. For PHP4: Set $CURRENT_QA_RELEASE_4 to false
+
+  II. For PHP5: Set $CURRENT_QA_RELEASE_5 to false
+
 Re-releasing the same version (or -pl)
 --------------------------------------

@@ -0,0 +1,146 @@
+====================
+  SVN Commit Rules
+====================
+
+This is the first file you should be reading after you get your SVN account.
+We'll assume you're basically familiar with SVN, but feel free to post
+your questions on the mailing list. Please have a look at
+http://svnbook.red-bean.com/ for more detailed information on SVN.
+
+PHP is developed through the efforts of a large number of people.
+Collaboration is a Good Thing(tm), and SVN lets us do this. Thus, following
+some basic rules with regards to SVN usage will::
+
+   a. Make everybody happier, especially those responsible for maintaining
+      the SVN itself.
+
+   b. Keep the changes consistently well documented and easily trackable.
+
+   c. Prevent some of those 'Oops' moments.
+
+   d. Increase the general level of good will on planet Earth.
+
+Having said that, here are the organizational rules::
+
+   1. Respect other people working on the project.
+
+   2. Discuss any significant changes on the list before committing and get
+      confirmation from the release manager for the given branch.
+
+   3. Look at EXTENSIONS file to see who is the primary maintainer of
+      the code you want to contribute to.
+
+   4. If you "strongly disagree" about something another person did, don't
+      start fighting publicly - take it up in private email.
+
+   5. If you don't know how to do something, ask first!
+
+   6. Test your changes before committing them. We mean it. Really.
+      To do so use "make test".
+
+   7. For development use the --enable-maintainer-zts switch to ensure your
+      code handles TSRM correctly and doesn't break for thos who need that.
+
+Currently we have the following branches in use::
+
+  trunk             Will become PHP 6.0. This CVS branch is for active development.
+
+  branches/PHP_5_3  Is used to release the PHP 5.3.x series. It still allows for
+                    larger enhancements.
+
+  branches/PHP_5_2  Is used to release the PHP 5.2.x series. Only bugfixes are permitted
+                    on this branch (Consult the releasemaster prior to commit).
+
+  branches/PHP_5_1  This branch is closed.
+
+  branches/PHP_4_4  This branch is closed.
+
+The next few rules are more of a technical nature::
+
+   1. All changes should first go to trunk and then get merged from trunk
+      (aka MFH'ed) to all other relevant branches.
+
+   2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
+      messages every day. Woe be to those who attempt to mess with it.
+
+   3. All news updates intended for public viewing, such as new features,
+      bug fixes, improvements, etc., should go into the NEWS file of the
+      *first* to be released version with the given change. In other words
+      any NEWS file change only needs to done in one branch.
+
+      NB! Lines, starting with @ will go automagically into NEWS file, but
+      this is NOT recommended, though. Please, add news entries directly to
+      NEWS file and don't forget to keep them adjusted and sorted.
+
+   4. Do not commit multiple file and dump all messages in one commit. If you
+      modified several unrelated files, commit each group separately and
+      provide a nice commit message for each one. See example below.
+
+   5. Do write your commit message in such a way that it makes sense even
+      without the corresponding diff. One should be able to look at it, and
+      immediately know what was modified. Definitely include the function name
+      in the message as shown below.
+
+   6. In your commit messages, keep each line shorter than 80 characters. And
+      try to align your lines vertically, if they wrap. It looks bad otherwise.
+
+   7. If you modified a function that is callable from PHP, prepend PHP to
+      the function name as shown below.
+
+
+The format of the commit messages is pretty simple.
+
+Use a - to start a new item in your commit message.
+
+If a line begins with #, it is taken to be a comment and will not appear
+in the ChangeLog. Everything else goes into the ChangeLog.
+
+It is important to note that if your comment or news logline spans multiple
+lines, you have to put # at the beginning of **every** such line.
+
+Example. Say you modified two files, datetime.c and string.c. In datetime.c you
+added a new format option for the date() function, and in string.c you fixed a
+memory leak in php_trim(). Don't commit both of these at once. Commit them
+separately and try to make sure your commit messages look something like the
+following.
+
+For datetime.c::
+
+  - Added new 'K' format modifier to date() for printing out number of days
+    until New Year's Eve.
+
+For string.c::
+
+  - Fixed a memory leak in php_trim() resulting from improper use of zval_dtor().
+  #- Man, that thing was leaking all over the place!
+
+The # lines will be omitted from the ChangeLog automagically.
+
+Use the [DOC] tag in your log message whenever you feel that your changes
+imply a documentation modification. The php-doc team will automatically
+get notified about your commit through the php-doc mailing list.
+
+If you fix some bugs, you should note the bug ID numbers in your
+commit message. Bug ID should be prefixed by "#" for easier access to
+bug report when developers are browsing CVS via LXR or Bonsai.
+
+Example::
+
+  Fixed bug #14016 (pgsql notice handler double free crash bug.)
+
+If you don't see your messages in ChangeLog right away, don't worry!
+These files are updated once a day, so your stuff will not show up until
+somewhat later.
+
+When you change the NEWS file for a bug fix, then please keep the bugs
+sorted in decreasing order under the fixed version.
+
+You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
+to look at PHP SVN repository in various ways.
+
+To receive daily updates to ChangeLog and NEWS, send an empty message to
+php-cvs-daily-subscribe@lists.php.net.
+
+Happy hacking,
+
+PHP Team
@@ -0,0 +1,112 @@
+Using PHP 5 with the Zeus Web Server
+-----------------------------------
+
+Zeus fully supports running PHP in combination with our
+webserver. There are three different interfaces that can be used to
+enable PHP:
+
+* CGI
+* ISAPI
+* FastCGI
+
+Of the three, we recommend using FastCGI, which has been tested and
+benchmarked as providing the best performance and reliability.
+
+Full details of how to install PHP are available from our
+website, at:
+
+http://support.zeus.com/products/php.html
+
+If you have any problems, please check the support site for more
+up-to-date information and advice.
+
+
+Quick guide to installing CGI/FastCGI with Zeus
+-----------------------------------------------
+
+Step 1 - Compile PHP as FastCGI.
+
+Compile as follows:
+        ./configure --enable-fastcgi
+        make
+
+Note that PHP has many options to the configure script -
+e.g. --with-mysql. You will probably want to select your usual options
+before compiling; the above is just a bare minimum, for illustration.
+
+After compilation finishes, you will be left with an executable
+program called 'php'. Copy this into your document root, under a
+dedicated FastCGI directory (e.g. $DOCROOT/fcgi-bin/php)
+
+
+Step 2 - configure Zeus
+
+Four stages:
+        -  enable FastCGI
+        -  configure FastCGI
+        -  setup alias for FastCGI
+        -  setup alias for PHP
+
+1) Using the admin server, go to the 'module configuration' page for
+your virtual server, and ensure that 'fastcgi' is enabled (select the
+tickbox to the left).
+
+2) While we can run FastCGI's locally, there are known problems with
+some OS's (specifically, the communication between web server and
+FastCGI happens over a unix domain socket, and some OS's have trouble
+sustaining high connection rates over these sockets). So instead, we
+are going to set up the PHP FastCGI to run 'remotely' over localhost
+(this uses TCP sockets, which do not suffer this problem). Go to the
+'fastcgi configuration' page, and under 'add remote fastcgi':
+        Add Remote FastCGI
+                Docroot path            /fcgi-bin/php
+                Remote machine          localhost:8002
+The first entry is where you saved PHP, above.
+The second entry is localhost:<any unused port>
+We will start the FastCGI listening on this port shortly.
+Click 'update' to commit these changes.
+
+3) Go to the path mapping module and add an alias for FastCGI:
+        Add Alias
+                Docroot path            /fcgi-bin
+                Filesystem directory    /path/to/docroot/fcgi-bin
+                Alias type              fastcgi
+Click 'update' to commit these changes
+
+4) Also on the path mapping module, add a handler for PHP:
+        Add handler
+                File extension          php
+                Handler                 /fcgi-bin/php
+Click 'update' to commit these changes
+
+Finally restart your virtual server for these changes to take effect.
+
+
+Step 3 - start PHP as a FastCGI runner
+
+When you start PHP, it will pre-fork a given number of child processes
+to handle incoming PHP requests. Each process will handle a given
+number of requests before exiting (and being replaced by a newly
+forked process). You can control these two parameters by setting the
+following environment variables BEFORE starting the FastCGI runner:
+
+PHP_FCGI_CHILDREN - the number of child processes to pre-fork. This
+variable MUST be set, if not then the PHP will not run as a FastCGI.
+We recommend a value of 8 for a fairly busy site. If you have many,
+long-running PHP scripts, then you may need to increase this further.
+
+PHP_FCGI_MAX_REQUESTS - the number of requests each PHP child process
+handles before exiting. If not set, defaults to 500.
+
+To start the FastCGI runner, execute '$ZEUSHOME/web/bin/fcgirunner
+8002 $DOCROOT/fcgi-bin/php'.  Substitute the appropriate values for
+$ZEUSHOME and $DOCROOT; also substitute for 8002 the port you chose,
+above.
+
+To stop the runner (e.g. to experiment with the above environment
+variables) you will need to manually stop and running PHP
+processes. (Use 'ps' and 'kill'). As it is PHP which is forking lots
+of children and not the runner, Zeus unfortunately cannot keep track
+of what processes are running, sorry. A typical command line may look
+like 'ps -efl | grep $DOCROOT/fcgi-bin/php | grep -v grep | awk
+'{print $4}' | xargs kill'
@@ -86,7 +86,7 @@ PHP_MINFO_FUNCTION(my_input_filter)
 {
    php_info_print_table_start();
    php_info_print_table_row( 2, "My Input Filter Support", "enabled" );
-    php_info_print_table_row( 2, "Revision", "$Id$");
+    php_info_print_table_row( 2, "Revision", "$Revision$");
    php_info_print_table_end();
 }

@@ -1,30 +0,0 @@
-The PHP Interpreter
-===================
-
-This is the github mirror of the official PHP repository located at
-http://git.php.net.
-
-[![Build Status](https://secure.travis-ci.org/php/php-src.png?branch=master)](http://travis-ci.org/php/php-src)
-
-Pull Requests
-=============
-PHP accepts pull requests via github. Discussions are done on github, but
-depending on the topic can also be relayed to the official PHP developer
-mailinglist internals@lists.php.net.
-
-New features require an RFC and must be accepted by the developers.
-See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more
-information on the process.
-
-Bug fixes **do not** require an RFC, but require a bugtracker ticket. Always
-open a ticket at http://bugs.php.net and reference the bug id using #NNNNNN.
-
-    Fix #55371: get_magic_quotes_gpc() throws deprecation warning
-
-    After removing magic quotes, the get_magic_quotes_gpc function caused
-    a deprecate warning. get_magic_quotes_gpc can be used to detected
-    the magic_quotes behavior and therefore should not raise a warning at any
-    time. The patch removes this warning
-
-We do not merge pull requests directly on github. All PRs will be
-pulled and pushed through http://git.php.net.
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2011, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999-2010, Andi Gutmans, Sascha Schumann, Zeev Suraski |
   | This source file is subject to the TSRM license, that is bundled     |
   | with this package in the file LICENSE                                |
   +----------------------------------------------------------------------+
@@ -710,22 +710,6 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #endif
 }

-/*
-  Changes the signal mask of the calling thread
-*/
-#ifdef HAVE_SIGPROCMASK
-TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset)
-{
-	TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Changed sigmask in thread: %ld", tsrm_thread_id()));
-	/* TODO: add support for other APIs */
-#ifdef PTHREADS
-	return pthread_sigmask(how, set, oldset);
-#else
-	return sigprocmask(how, set, oldset);
-#endif
-}
-#endif
-

 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler)
 {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Thread Safe Resource Manager                                         |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1999-2011, Andi Gutmans, Sascha Schumann, Zeev Suraski |
+   | Copyright (c) 1999-2010, Andi Gutmans, Sascha Schumann, Zeev Suraski |
   | This source file is subject to the TSRM license, that is bundled     |
   | with this package in the file LICENSE                                |
   +----------------------------------------------------------------------+
@@ -90,10 +90,6 @@ typedef struct {
 # define MUTEX_T beos_ben * 
 #endif

-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
 typedef void (*ts_allocate_ctor)(void *, void ***);
 typedef void (*ts_allocate_dtor)(void *, void ***);

@@ -142,9 +138,6 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void);
 TSRM_API void tsrm_mutex_free(MUTEX_T mutexp);
 TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp);
 TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp);
-#ifdef HAVE_SIGPROCMASK
-TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset);
-#endif

 TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begin_handler);
 TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
@@ -0,0 +1 @@
+#undef PTHREADS
@@ -33,7 +33,7 @@ $(makefile_in_files): $(makefile_am_files)
 aclocal.m4: configure.in acinclude.m4
 	aclocal

-$(config_h_in): configure.in
+$(config_h_in): configure.in acconfig.h
 # explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
@@ -7,10 +7,6 @@ AC_INIT(TSRM.c)
 AM_INIT_AUTOMAKE(TSRM, 1.0, nodefine)
 AM_CONFIG_HEADER(tsrm_config.h)

-AH_TOP([
-#undef PTHREADS
-])
-
 sinclude(tsrm.m4)
 	
 TSRM_BASIC_CHECKS
@@ -30,8 +30,6 @@ AC_REQUIRE([AC_PROG_RANLIB])dnl

 AC_CHECK_HEADERS(stdarg.h)

-AC_CHECK_FUNCS(sigprocmask)
-
 ])


@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2010 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2010 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2010 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -14,7 +14,6 @@
   +----------------------------------------------------------------------+
   | Authors: Andi Gutmans <andi@zend.com>                                |
   |          Sascha Schumann <sascha@schumann.cx>                        |
-   |          Pierre Joye <pierre@php.net>                                |
   +----------------------------------------------------------------------+
 */

@@ -39,22 +38,6 @@
 # ifndef IO_REPARSE_TAG_SYMLINK
 #  define IO_REPARSE_TAG_SYMLINK 0xA000000C
 # endif
-
-# ifndef IO_REPARSE_TAG_DEDUP
-#  define IO_REPARSE_TAG_DEDUP   0x80000013
-# endif
-
-# ifndef VOLUME_NAME_NT
-#  define VOLUME_NAME_NT 0x2
-# endif
-
-# ifndef VOLUME_NAME_DOS
-#  define VOLUME_NAME_DOS 0x0
-# endif
-#endif
-
-#ifndef S_IFLNK
-# define S_IFLNK 0120000
 #endif

 #ifdef NETWARE
@@ -100,14 +83,14 @@ cwd_state main_cwd_state; /* True global */
 #include <tchar.h>
 #define tsrm_strtok_r(a,b,c) _tcstok((a),(b))
 #define TOKENIZER_STRING "/\\"
-
-static int php_check_dots(const char *element, int n)
+	
+static int php_check_dots(const char *element, int n) 
 {
 	while (n-- > 0) if (element[n] != '.') break;

 	return (n != -1);
 }
-
+	
 #define IS_DIRECTORY_UP(element, len) \
 	(len >= 2 && !php_check_dots(element, len))

@@ -141,7 +124,7 @@ static int php_check_dots(const char *element, int n)

 /* define this to check semantics */
 #define IS_DIR_OK(s) (1)
-
+	
 #ifndef IS_DIR_OK
 #define IS_DIR_OK(state) (php_is_dir_ok(state) == 0)
 #endif
@@ -154,7 +137,7 @@ static int php_check_dots(const char *element, int n)

 #define CWD_STATE_FREE(s)			\
 	free((s)->cwd);
-
+	
 #ifdef TSRM_WIN32

 #ifdef CTL_CODE
@@ -219,86 +202,21 @@ static inline time_t FileTimeToUnixTime(const FILETIME FileTime)
 	return (time_t)UnixTime;
 }

-CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len){ /* {{{ */
-	HINSTANCE kernel32;
-	HANDLE hFile;
-	DWORD dwRet;
-
-	typedef BOOL (WINAPI *gfpnh_func)(HANDLE, LPTSTR, DWORD, DWORD);
-	gfpnh_func pGetFinalPathNameByHandle;
-
-	kernel32 = LoadLibrary("kernel32.dll");
-
-	if (kernel32) {
-		pGetFinalPathNameByHandle = (gfpnh_func)GetProcAddress(kernel32, "GetFinalPathNameByHandleA");
-		if (pGetFinalPathNameByHandle == NULL) {
-			return -1;
-		}
-	} else {
-		return -1;
-	}
-
-	hFile = CreateFile(link,            // file to open
-				 GENERIC_READ,          // open for reading
-				 FILE_SHARE_READ,       // share for reading
-				 NULL,                  // default security
-				 OPEN_EXISTING,         // existing file only
-				 FILE_FLAG_BACKUP_SEMANTICS, // normal file
-				 NULL);                 // no attr. template
-
-	if( hFile == INVALID_HANDLE_VALUE) {
-			return -1;
-	}
-
-	dwRet = pGetFinalPathNameByHandle(hFile, target, MAXPATHLEN, VOLUME_NAME_DOS);
-	if(dwRet >= MAXPATHLEN) {
-		return -1;
-	}
-
-	CloseHandle(hFile);
-
-	if(dwRet > 4) {
-		/* Skip first 4 characters if they are "\??\" */
-		if(target[0] == '\\' && target[1] == '\\' && target[2] == '?' && target[3] ==  '\\') {
-			char tmp[MAXPATHLEN];
-			unsigned int offset = 4;
-			dwRet -= 4;
-
-			/* \??\UNC\ */
-			if (dwRet > 7 && target[4] == 'U' && target[5] == 'N' && target[6] == 'C') {
-				offset += 2;
-				dwRet -= 2;
-				target[offset] = '\\';
-			}
-
-			memcpy(tmp, target + offset, dwRet);
-			memcpy(target, tmp, dwRet);
-		}
-	}
-
-	target[dwRet] = '\0';
-	return dwRet;
-}
-/* }}} */
-
-CWD_API int php_sys_stat_ex(const char *path, struct stat *buf, int lstat) /* {{{ */
+CWD_API int php_sys_stat(const char *path, struct stat *buf) /* {{{ */
 {
 	WIN32_FILE_ATTRIBUTE_DATA data;
 	__int64 t;
-	const size_t path_len = strlen(path);

 	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &data)) {
 		return stat(path, buf);
 	}

-	if (path_len >= 1 && path[1] == ':') {
+	if (path[1] == ':') {
 		if (path[0] >= 'A' && path[0] <= 'Z') {
 			buf->st_dev = buf->st_rdev = path[0] - 'A';
 		} else {
 			buf->st_dev = buf->st_rdev = path[0] - 'a';
 		}
-	} else if (IS_UNC_PATH(path, path_len)) {
-		buf->st_dev = buf->st_rdev = 0;
 	} else {
 		char  cur_path[MAXPATHLEN+1];
 		DWORD len = sizeof(cur_path);
@@ -327,56 +245,19 @@ CWD_API int php_sys_stat_ex(const char *path, struct stat *buf, int lstat) /* {{
 		}
 		if (tmp != cur_path) {
 			free(tmp);
-		}
+		}		    	
 	}
-
 	buf->st_uid = buf->st_gid = buf->st_ino = 0;
-
-	if (lstat && data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-		/* File is a reparse point. Get the target */
-		HANDLE hLink = NULL;
-		REPARSE_DATA_BUFFER * pbuffer;
-		unsigned int retlength = 0;
-		TSRM_ALLOCA_FLAG(use_heap_large);
-
-		hLink = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, NULL);
-		if(hLink == INVALID_HANDLE_VALUE) {
-			return -1;
-		}
-
-		pbuffer = (REPARSE_DATA_BUFFER *)tsrm_do_alloca(MAXIMUM_REPARSE_DATA_BUFFER_SIZE, use_heap_large);
-		if(!DeviceIoControl(hLink, FSCTL_GET_REPARSE_POINT, NULL, 0, pbuffer,  MAXIMUM_REPARSE_DATA_BUFFER_SIZE, &retlength, NULL)) {
-			tsrm_free_alloca(pbuffer, use_heap_large);
-			CloseHandle(hLink);
-			return -1;
-		}
-
-		CloseHandle(hLink);
-
-		if(pbuffer->ReparseTag == IO_REPARSE_TAG_SYMLINK) {
-			buf->st_mode = S_IFLNK;
-			buf->st_mode |= (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)) : (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)|S_IWRITE|(S_IWRITE>>3)|(S_IWRITE>>6));
-		}
-
-#if 0 /* Not used yet */
-		else if(pbuffer->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT) {
-			buf->st_mode |=;
-		}
-#endif
-		tsrm_free_alloca(pbuffer, use_heap_large);
-	} else {
-		buf->st_mode = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? (S_IFDIR|S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6)) : S_IFREG;
-		buf->st_mode |= (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)) : (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)|S_IWRITE|(S_IWRITE>>3)|(S_IWRITE>>6));
-	}
-
+	buf->st_mode = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? (S_IFDIR|S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6)) : S_IFREG;
+	buf->st_mode |= (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)) : (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)|S_IWRITE|(S_IWRITE>>3)|(S_IWRITE>>6));
 	if ((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
 		int len = strlen(path);

 		if (path[len-4] == '.') {
 			if (_memicmp(path+len-3, "exe", 3) == 0 ||
-				_memicmp(path+len-3, "com", 3) == 0 ||
-				_memicmp(path+len-3, "bat", 3) == 0 ||
-				_memicmp(path+len-3, "cmd", 3) == 0) {
+			    _memicmp(path+len-3, "com", 3) == 0 ||
+			    _memicmp(path+len-3, "bat", 3) == 0 ||
+			    _memicmp(path+len-3, "cmd", 3) == 0) {
 				buf->st_mode  |= (S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6));
 			}
 		}
@@ -451,7 +332,7 @@ CWD_API void virtual_cwd_startup(void) /* {{{ */
 		}
 	}
 #else
-	result = getcwd(cwd, sizeof(cwd));
+	result = getcwd(cwd, sizeof(cwd));	
 #endif
 	if (!result) {
 		cwd[0] = '\0';
@@ -501,11 +382,8 @@ CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC) /* {{{ */

 		*length = 1;
 		retval = (char *) malloc(2);
-		if (retval == NULL) {
-			return NULL;
-		}
 		retval[0] = DEFAULT_SLASH;
-		retval[1] = '\0';
+		retval[1] = '\0';	
 		return retval;
 	}

@@ -516,9 +394,6 @@ CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC) /* {{{ */

 		*length = state->cwd_length+1;
 		retval = (char *) malloc(*length+1);
-		if (retval == NULL) {
-			return NULL;
-		}
 		memcpy(retval, state->cwd, *length);
 		retval[0] = toupper(retval[0]);
 		retval[*length-1] = DEFAULT_SLASH;
@@ -618,17 +493,10 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC) /* {{{

 	while (*bucket != NULL) {
 		if (key == (*bucket)->key && path_len == (*bucket)->path_len &&
-					memcmp(path, (*bucket)->path, path_len) == 0) {
+		           memcmp(path, (*bucket)->path, path_len) == 0) {
 			realpath_cache_bucket *r = *bucket;
 			*bucket = (*bucket)->next;
-		   
-			/* if the pointers match then only subtract the length of the path */
-		   	if(r->path == r->realpath) {
-				CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1;
-			} else {
-				CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
-			}
-		   
+			CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
 			free(r);
 			return;
 		} else {
@@ -642,9 +510,9 @@ static inline void realpath_cache_add(const char *path, int path_len, const char
 {
 	long size = sizeof(realpath_cache_bucket) + path_len + 1;
 	int same = 1;
-
+	
 	if (realpath_len != path_len ||
-		memcmp(path, realpath, path_len) != 0) {
+	    memcmp(path, realpath, path_len) != 0) {
 		size += realpath_len + 1;
 		same = 0;
 	}
@@ -653,10 +521,6 @@ static inline void realpath_cache_add(const char *path, int path_len, const char
 		realpath_cache_bucket *bucket = malloc(size);
 		unsigned long n;

-		if (bucket == NULL) {
-			return;
-		}
-
 #ifdef PHP_WIN32
 		bucket->key = realpath_cache_key(path, path_len TSRMLS_CC);
 #else
@@ -703,16 +567,10 @@ static inline realpath_cache_bucket* realpath_cache_find(const char *path, int p
 		if (CWDG(realpath_cache_ttl) && (*bucket)->expires < t) {
 			realpath_cache_bucket *r = *bucket;
 			*bucket = (*bucket)->next;
-
-			/* if the pointers match then only subtract the length of the path */		   
-		   	if(r->path == r->realpath) {
-				CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1;
-			} else {
-				CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
-			}
+			CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
 			free(r);
 		} else if (key == (*bucket)->key && path_len == (*bucket)->path_len &&
-					memcmp(path, (*bucket)->path, path_len) == 0) {
+		           memcmp(path, (*bucket)->path, path_len) == 0) {
 			return *bucket;
 		} else {
 			bucket = &(*bucket)->next;
@@ -724,21 +582,21 @@ static inline realpath_cache_bucket* realpath_cache_find(const char *path, int p

 CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_len, time_t t TSRMLS_DC) /* {{{ */
 {
-	return realpath_cache_find(path, path_len, t TSRMLS_CC);
+    return realpath_cache_find(path, path_len, t TSRMLS_CC);
 }
 /* }}} */

-CWD_API int realpath_cache_size(TSRMLS_D)
+CWD_API int realpath_cache_size(TSRMLS_D) 
 {
 	return CWDG(realpath_cache_size);
 }

-CWD_API int realpath_cache_max_buckets(TSRMLS_D)
+CWD_API int realpath_cache_max_buckets(TSRMLS_D) 
 {
 	return (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
 }

-CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D)
+CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D) 
 {
 	return CWDG(realpath_cache);
 }
@@ -764,9 +622,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i

 	while (1) {
 		if (len <= start) {
-			if (link_is_dir) {
-				*link_is_dir = 1;
-			}
 			return start;
 		}

@@ -783,10 +638,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 			continue;
 		} else if (i == len - 2 && path[i] == '.' && path[i+1] == '.') {
 			/* remove '..' and previous directory */
-			is_dir = 1;
-			if (link_is_dir) {
-				*link_is_dir = 1;
-			}
 			if (i - 1 <= start) {
 				return start ? start : len;
 			}
@@ -799,14 +650,14 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 				if (!start) {
 					/* leading '..' must not be removed in case of relative path */
 					if (j == 0 && path[0] == '.' && path[1] == '.' &&
-							IS_SLASH(path[2])) {
+					    IS_SLASH(path[2])) {
 						path[3] = '.';
 						path[4] = '.';
 						path[5] = DEFAULT_SLASH;
 						j = 5;
-					} else if (j > 0 &&
-							path[j+1] == '.' && path[j+2] == '.' &&
-							IS_SLASH(path[j+3])) {
+					} else if (j > 0 && 
+				               path[j+1] == '.' && path[j+2] == '.' &&
+				               IS_SLASH(path[j+3])) {
 						j += 4;
 						path[j++] = '.';
 						path[j++] = '.';
@@ -822,7 +673,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 			}
 			return j;
 		}
-
+	
 		path[len] = 0;

 		save = (use_realpath != CWD_EXPAND);
@@ -832,18 +683,18 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 			if (!*t) {
 				*t = time(0);
 			}
-			if ((bucket = realpath_cache_find(path, len, *t TSRMLS_CC)) != NULL) {
-				if (is_dir && !bucket->is_dir) {
+		    if ((bucket = realpath_cache_find(path, len, *t TSRMLS_CC)) != NULL) {
+		    	if (is_dir && !bucket->is_dir) {
 					/* not a directory */
 					return -1;
-				} else {
-					if (link_is_dir) {
-						*link_is_dir = bucket->is_dir;
-					}
+		    	} else {
+		    		if (link_is_dir) {
+		    			*link_is_dir = bucket->is_dir;
+		    		}
 					memcpy(path, bucket->realpath, bucket->realpath_len + 1);
-					return bucket->realpath_len;
+				    return bucket->realpath_len;
 				}
-			}
+	    	}
 		}

 #ifdef TSRM_WIN32
@@ -855,7 +706,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 			/* continue resolution anyway but don't save result in the cache */
 			save = 0;
 		}
-
+		
 		if (save) {
 			FindClose(hFind);
 		}
@@ -863,9 +714,9 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 		tmp = tsrm_do_alloca(len+1, use_heap);
 		memcpy(tmp, path, len+1);

-		if(save &&
-				!(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
-				(data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+		if(save && 
+		!(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
+		(data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
 			/* File is a reparse point. Get the target */
 			HANDLE hLink = NULL;
 			REPARSE_DATA_BUFFER * pbuffer;
@@ -888,9 +739,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 			}

 			pbuffer = (REPARSE_DATA_BUFFER *)tsrm_do_alloca(MAXIMUM_REPARSE_DATA_BUFFER_SIZE, use_heap_large);
-			if (pbuffer == NULL) {
-				return -1;
-			}
 			if(!DeviceIoControl(hLink, FSCTL_GET_REPARSE_POINT, NULL, 0, pbuffer,  MAXIMUM_REPARSE_DATA_BUFFER_SIZE, &retlength, NULL)) {
 				tsrm_free_alloca(pbuffer, use_heap_large);
 				CloseHandle(hLink);
@@ -903,7 +751,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 				reparsetarget = pbuffer->SymbolicLinkReparseBuffer.ReparseTarget;
 				printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
 				isabsolute = (pbuffer->SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0;
-				if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+				if (!WideCharToMultiByte(CP_THREAD_ACP, 0, 
 					reparsetarget + pbuffer->MountPointReparseBuffer.PrintNameOffset  / sizeof(WCHAR),
 					printname_len + 1,
 					printname, MAX_PATH, NULL, NULL
@@ -915,7 +763,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 				printname[printname_len] = 0;

 				substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
-				if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+				if (!WideCharToMultiByte(CP_THREAD_ACP, 0, 
 					reparsetarget + pbuffer->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
 					substitutename_len + 1,
 					substitutename, MAX_PATH, NULL, NULL
@@ -929,7 +777,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 				isabsolute = 1;
 				reparsetarget = pbuffer->MountPointReparseBuffer.ReparseTarget;
 				printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
-				if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+				if (!WideCharToMultiByte(CP_THREAD_ACP, 0, 
 					reparsetarget + pbuffer->MountPointReparseBuffer.PrintNameOffset  / sizeof(WCHAR),
 					printname_len + 1,
 					printname, MAX_PATH, NULL, NULL
@@ -940,7 +788,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 				printname[pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR)] = 0;

 				substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
-				if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
+				if (!WideCharToMultiByte(CP_THREAD_ACP, 0, 
 					reparsetarget + pbuffer->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
 					substitutename_len + 1,
 					substitutename, MAX_PATH, NULL, NULL
@@ -949,42 +797,35 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 					return -1;
 				};
 				substitutename[substitutename_len] = 0;
-			}
-			else if (pbuffer->ReparseTag == IO_REPARSE_TAG_DEDUP) {
-				isabsolute = 1;
-				memcpy(substitutename, path, len + 1);
-				substitutename_len = len;
 			} else {
 				tsrm_free_alloca(pbuffer, use_heap_large);
 				return -1;
 			}

 			if(isabsolute && substitutename_len > 4) {
-				/* Do not resolve volumes (for now). A mounted point can
+				/* Do not resolve volumes (for now). A mounted point can 
 				   target a volume without a drive, it is not certain that
-				   all IO functions we use in php and its deps support
+				   all IO functions we use in php and its deps support 
 				   path with volume GUID instead of the DOS way, like:
 				   d:\test\mnt\foo
 				   \\?\Volume{62d1c3f8-83b9-11de-b108-806e6f6e6963}\foo
 				*/
-				if (strncmp(substitutename, "\\??\\Volume{",11) == 0
-					|| strncmp(substitutename, "\\\\?\\Volume{",11) == 0
-					|| strncmp(substitutename, "\\??\\UNC\\", 8) == 0
-					) {
-					isVolume = TRUE;
+				if (strncmp(substitutename, "\\??\\Volume{",11) == 0 
+					|| strncmp(substitutename, "\\\\?\\Volume{",11) == 0) {
+					isVolume = TRUE;					
 					substitutename_off = 0;
 				} else
 					/* do not use the \??\ and \\?\ prefix*/
-					if (strncmp(substitutename, "\\??\\", 4) == 0
+					if (strncmp(substitutename, "\\??\\", 4) == 0 
 						|| strncmp(substitutename, "\\\\?\\", 4) == 0) {
 					substitutename_off = 4;
 				}
 			}

 			if (!isVolume) {
-				char * tmp2 = substitutename + substitutename_off;
+				char * tmp = substitutename + substitutename_off;
 				for(bufindex = 0; bufindex < (substitutename_len - substitutename_off); bufindex++) {
-					*(path + bufindex) = *(tmp2 + bufindex);
+					*(path + bufindex) = *(tmp + bufindex);
 				}

 				*(path + bufindex) = 0;
@@ -1046,7 +887,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 		tmp = tsrm_do_alloca(len+1, use_heap);
 		memcpy(tmp, path, len+1);
 #else
-		if (save && php_sys_lstat(path, &st) < 0) {
+		if (save && lstat(path, &st) < 0) {
 			if (use_realpath == CWD_REALPATH) {
 				/* file not found */
 				return -1;
@@ -1059,8 +900,8 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 		memcpy(tmp, path, len+1);

 		if (save && S_ISLNK(st.st_mode)) {
-			if (++(*ll) > LINK_MAX || (j = php_sys_readlink(tmp, path, MAXPATHLEN)) < 0) {
-				/* too many links or broken symlinks */
+			if (++(*ll) > LINK_MAX || (j = readlink(tmp, path, MAXPATHLEN)) < 0) {
+			    /* too many links or broken symlinks */
 				tsrm_free_alloca(tmp, use_heap);
 				return -1;
 			}
@@ -1072,10 +913,10 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 					return -1;
 				}
 			} else {
-				if (i + j >= MAXPATHLEN-1) {
+			    if (i + j >= MAXPATHLEN-1) {
 					tsrm_free_alloca(tmp, use_heap);
 					return -1; /* buffer overflow */
-				}
+			    }
 				memmove(path+i, path, j+1);
 				memcpy(path, tmp, i-1);
 				path[i-1] = DEFAULT_SLASH;
@@ -1096,7 +937,6 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
 				}
 				if (is_dir && !directory) {
 					/* not a directory */
-					tsrm_free_alloca(tmp, use_heap);
 					return -1;
 				}
 			}
@@ -1148,7 +988,7 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i

 /* Resolve path relatively to state and put the real path into state */
 /* returns 0 for ok, 1 for error */
-CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath TSRMLS_DC) /* {{{ */
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath) /* {{{ */
 {
 	int path_length = strlen(path);
 	char resolved_path[MAXPATHLEN];
@@ -1158,6 +998,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	int ret;
 	int add_slash;
 	void *tmp;
+	TSRMLS_FETCH();

 	if (path_length == 0 || path_length >= MAXPATHLEN-1) {
 #ifdef TSRM_WIN32
@@ -1197,18 +1038,18 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 					state_cwd_length = 2;
 					while (IS_SLASH(state->cwd[state_cwd_length])) {
 						state_cwd_length++;
-					}
+					}						 
 					while (state->cwd[state_cwd_length] &&
-							!IS_SLASH(state->cwd[state_cwd_length])) {
+					       !IS_SLASH(state->cwd[state_cwd_length])) {
 						state_cwd_length++;
-					}
+					}						 
 					while (IS_SLASH(state->cwd[state_cwd_length])) {
 						state_cwd_length++;
-					}
+					}						 
 					while (state->cwd[state_cwd_length] &&
-							!IS_SLASH(state->cwd[state_cwd_length])) {
+					       !IS_SLASH(state->cwd[state_cwd_length])) {
 						state_cwd_length++;
-					}
+					}						 
 				}
 			}
 #endif
@@ -1216,16 +1057,11 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 				return 1;
 			}
 			memcpy(resolved_path, state->cwd, state_cwd_length);
-			if (resolved_path[state_cwd_length-1] == DEFAULT_SLASH) {
-				memcpy(resolved_path + state_cwd_length, path, path_length + 1);
-				path_length += state_cwd_length;
-			} else {
-				resolved_path[state_cwd_length] = DEFAULT_SLASH;
-				memcpy(resolved_path + state_cwd_length + 1, path, path_length + 1);
-				path_length += state_cwd_length + 1;
-			}
+			resolved_path[state_cwd_length] = DEFAULT_SLASH;
+			memcpy(resolved_path + state_cwd_length + 1, path, path_length + 1);
+			path_length += state_cwd_length + 1;
 		}
-	} else {
+	} else {		
 #ifdef TSRM_WIN32
 		if (path_length > 2 && path[1] == ':' && !IS_SLASH(path[2])) {
 			resolved_path[0] = path[0];
@@ -1236,11 +1072,11 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 		} else
 #endif
 		memcpy(resolved_path, path, path_length + 1);
-	}
+	} 

 #ifdef TSRM_WIN32
 	if (memchr(resolved_path, '*', path_length) ||
-		memchr(resolved_path, '?', path_length)) {
+	    memchr(resolved_path, '?', path_length)) {
 		return 1;
 	}
 #endif
@@ -1290,12 +1126,12 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	add_slash = (use_realpath != CWD_REALPATH) && path_length > 0 && IS_SLASH(resolved_path[path_length-1]);
 	t = CWDG(realpath_cache_ttl) ? 0 : -1;
 	path_length = tsrm_realpath_r(resolved_path, start, path_length, &ll, &t, use_realpath, 0, NULL TSRMLS_CC);
-
+	
 	if (path_length < 0) {
 		errno = ENOENT;
 		return 1;
 	}
-
+	
 	if (!start && !path_length) {
 		resolved_path[path_length++] = '.';
 	}
@@ -1348,7 +1184,7 @@ verify:
 		memcpy(state->cwd, resolved_path, state->cwd_length+1);
 		ret = 0;
 	}
-
+	
 #if VIRTUAL_CWD_DEBUG
 	fprintf (stderr, "virtual_file_ex() = %s\n",state->cwd);
 #endif
@@ -1358,7 +1194,7 @@ verify:

 CWD_API int virtual_chdir(const char *path TSRMLS_DC) /* {{{ */
 {
-	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok, CWD_REALPATH TSRMLS_CC)?-1:0;
+	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok, CWD_REALPATH)?-1:0;
 }
 /* }}} */

@@ -1371,7 +1207,7 @@ CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path

 	if (length == 0) {
 		return 1; /* Can't cd to empty string */
-	}
+	}	
 	while(--length >= 0 && !IS_SLASH(path[length])) {
 	}

@@ -1405,28 +1241,20 @@ CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC) /* {
 	/* realpath("") returns CWD */
 	if (!*path) {
 		new_state.cwd = (char*)malloc(1);
-		if (new_state.cwd == NULL) {
-			retval = NULL;
-			goto end;
-		}
 		new_state.cwd[0] = '\0';
-		new_state.cwd_length = 0;
-		if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
-			path = cwd;
+		new_state.cwd_length = 0;		
+	    if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
+		    path = cwd;
 		}
 	} else if (!IS_ABSOLUTE_PATH(path, strlen(path))) {
 		CWD_STATE_COPY(&new_state, &CWDG(cwd));
 	} else {
 		new_state.cwd = (char*)malloc(1);
-		if (new_state.cwd == NULL) {
-			retval = NULL;
-			goto end;
-		}
 		new_state.cwd[0] = '\0';
-		new_state.cwd_length = 0;
+		new_state.cwd_length = 0;		
 	}

-	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH TSRMLS_CC)==0) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)==0) {
 		int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;

 		memcpy(real_path, new_state.cwd, len);
@@ -1437,7 +1265,7 @@ CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC) /* {
 	}

 	CWD_STATE_FREE(&new_state);
-end:
+
 	return retval;
 }
 /* }}} */
@@ -1448,7 +1276,7 @@ CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_f
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	retval = virtual_file_ex(&new_state, path, verify_path, CWD_FILEPATH TSRMLS_CC);
+	retval = virtual_file_ex(&new_state, path, verify_path, CWD_FILEPATH);

 	*filepath = new_state.cwd;

@@ -1473,7 +1301,7 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC) /* {{{
 	}

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
 		CWD_STATE_FREE(&new_state);
 		return NULL;
 	}
@@ -1489,21 +1317,21 @@ CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC) /* {{{ */
 {
 	cwd_state new_state;
 	int ret;
-
+	
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}

 #if defined(TSRM_WIN32)
-	ret = tsrm_win32_access(new_state.cwd, mode TSRMLS_CC);
+	ret = tsrm_win32_access(new_state.cwd, mode);
 #else
 	ret = access(new_state.cwd, mode);
 #endif
-
+	
 	CWD_STATE_FREE(&new_state);
-
+	
 	return ret;
 }
 /* }}} */
@@ -1524,12 +1352,12 @@ static void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {{{ */
 TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
 {
 	FILETIME mtime, atime;
-	HANDLE hFile;
+	HANDLE hFile; 

 	hFile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, NULL,
 				 OPEN_ALWAYS, FILE_FLAG_BACKUP_SEMANTICS, NULL);

-	/* OPEN_ALWAYS mode sets the last error to ERROR_ALREADY_EXISTS but
+	/* OPEN_ALWAYS mode sets the last error to ERROR_ALREADY_EXISTS but 
 	   the CreateFile operation succeeds */
 	if (GetLastError() == ERROR_ALREADY_EXISTS) {
 		SetLastError(0);
@@ -1564,7 +1392,7 @@ CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC) /
 	int ret;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
@@ -1587,7 +1415,7 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC) /* {{{ */
 	int ret;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
@@ -1606,7 +1434,7 @@ CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int li
 	int ret;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
@@ -1633,7 +1461,7 @@ CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...) /* {{{ */
 	int f;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
@@ -1649,7 +1477,7 @@ CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...) /* {{{ */
 		f = open(new_state.cwd, flags, mode);
 	} else {
 		f = open(new_state.cwd, flags);
-	}
+	}	
 	CWD_STATE_FREE(&new_state);
 	return f;
 }
@@ -1661,7 +1489,7 @@ CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC) /* {{{ */
 	int f;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
@@ -1680,14 +1508,14 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC) /* {{{ */
 	int retval;

 	CWD_STATE_COPY(&old_state, &CWDG(cwd));
-	if (virtual_file_ex(&old_state, oldname, NULL, CWD_EXPAND TSRMLS_CC)) {
+	if (virtual_file_ex(&old_state, oldname, NULL, CWD_EXPAND)) {
 		CWD_STATE_FREE(&old_state);
 		return -1;
 	}
 	oldname = old_state.cwd;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, newname, NULL, CWD_EXPAND TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, newname, NULL, CWD_EXPAND)) {
 		CWD_STATE_FREE(&old_state);
 		CWD_STATE_FREE(&new_state);
 		return -1;
@@ -1716,7 +1544,7 @@ CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC) /* {{{ */
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
@@ -1728,23 +1556,25 @@ CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC) /* {{{ */
 }
 /* }}} */

+#if !defined(TSRM_WIN32)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC) /* {{{ */
 {
 	cwd_state new_state;
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}

-	retval = php_sys_lstat(new_state.cwd, buf);
+	retval = lstat(new_state.cwd, buf);

 	CWD_STATE_FREE(&new_state);
 	return retval;
 }
 /* }}} */
+#endif

 CWD_API int virtual_unlink(const char *path TSRMLS_DC) /* {{{ */
 {
@@ -1752,7 +1582,7 @@ CWD_API int virtual_unlink(const char *path TSRMLS_DC) /* {{{ */
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
@@ -1770,7 +1600,7 @@ CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC) /* {{{ */
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, pathname, NULL, CWD_FILEPATH TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_FILEPATH)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
@@ -1791,7 +1621,7 @@ CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC) /* {{{ */
 	int retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, pathname, NULL, CWD_EXPAND TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_EXPAND)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
@@ -1813,7 +1643,7 @@ CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC) /* {{{ */
 	DIR *retval;

 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH)) {
 		CWD_STATE_FREE(&new_state);
 		return NULL;
 	}
@@ -1828,7 +1658,7 @@ CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC) /* {{{ */
 #ifdef TSRM_WIN32
 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC) /* {{{ */
 {
-	return popen_ex(command, type, CWDG(cwd).cwd, NULL TSRMLS_CC);
+	return popen_ex(command, type, CWDG(cwd).cwd, NULL);
 }
 /* }}} */
 #elif defined(NETWARE)
@@ -1908,7 +1738,7 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC) /*
 		}
 		*ptr++ = '\'';
 	}
-
+	
 	*ptr++ = ' ';
 	*ptr++ = ';';
 	*ptr++ = ' ';
@@ -1930,28 +1760,22 @@ CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC) /* {{{
 	/* realpath("") returns CWD */
 	if (!*path) {
 		new_state.cwd = (char*)malloc(1);
-		if (new_state.cwd == NULL) {
-			return NULL;
-		}
 		new_state.cwd[0] = '\0';
-		new_state.cwd_length = 0;
-		if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
-			path = cwd;
+		new_state.cwd_length = 0;		
+	    if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
+		    path = cwd;
 		}
 	} else if (!IS_ABSOLUTE_PATH(path, strlen(path)) &&
-					VCWD_GETCWD(cwd, MAXPATHLEN)) {
+	    VCWD_GETCWD(cwd, MAXPATHLEN)) {
 		new_state.cwd = strdup(cwd);
 		new_state.cwd_length = strlen(cwd);
 	} else {
 		new_state.cwd = (char*)malloc(1);
-		if (new_state.cwd == NULL) {
-			return NULL;
-		}
 		new_state.cwd[0] = '\0';
-		new_state.cwd_length = 0;
+		new_state.cwd_length = 0;		
 	}

-	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {
 		free(new_state.cwd);
 		return NULL;
 	}
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2010 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -14,7 +14,6 @@
   +----------------------------------------------------------------------+
   | Authors: Andi Gutmans <andi@zend.com>                                |
   |          Sascha Schumann <sascha@schumann.cx>                        |
-   |          Pierre Joye <pierre@php.net>                                |
   +----------------------------------------------------------------------+
 */

@@ -108,7 +107,7 @@ typedef unsigned short mode_t;
 #define COPY_WHEN_ABSOLUTE(path) 0
 #endif

-#ifndef IS_ABSOLUTE_PATH
+#ifndef IS_ABSOLUTE_PATH	
 #define IS_ABSOLUTE_PATH(path, len) \
 	(IS_SLASH(path[0]))
 #endif
@@ -130,16 +129,9 @@ typedef unsigned short mode_t;
 #endif

 #ifdef TSRM_WIN32
-CWD_API int php_sys_stat_ex(const char *path, struct stat *buf, int lstat);
-# define php_sys_stat(path, buf) php_sys_stat_ex(path, buf, 0)
-# define php_sys_lstat(path, buf) php_sys_stat_ex(path, buf, 1)
-CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len);
+CWD_API int php_sys_stat(const char *path, struct stat *buf);
 #else
 # define php_sys_stat stat
-# define php_sys_lstat lstat
-# ifdef HAVE_SYMLINK
-# define php_sys_readlink(link, target, target_len) readlink(link, target, target_len)
-# endif
 #endif

 typedef struct _cwd_state {
@@ -163,7 +155,9 @@ CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...);
 CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
+#if !defined(TSRM_WIN32)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
+#endif
 CWD_API int virtual_unlink(const char *path TSRMLS_DC);
 CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC);
@@ -194,14 +188,14 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC);
 CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC);
 #endif

-/* One of the following constants must be used as the last argument
+/* One of the following constants must be used as the last argument 
   in virtual_file_ex() call. */

 #define CWD_EXPAND   0 /* expand "." and ".." but dont resolve symlinks      */
 #define CWD_FILEPATH 1 /* resolve symlinks if file is exist otherwise expand */
 #define CWD_REALPATH 2 /* call realpath(), resolve symlinks. File must exist */

-CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath TSRMLS_DC);
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath);

 CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC);

@@ -222,7 +216,7 @@ typedef struct _realpath_cache_bucket {
 	unsigned char                  is_wvalid;
 	unsigned char                  is_writable;
 #endif
-	struct _realpath_cache_bucket *next;
+	struct _realpath_cache_bucket *next;	
 } realpath_cache_bucket;

 typedef struct _virtual_cwd_globals {
@@ -250,7 +244,7 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);

 /* The actual macros to be used in programs using TSRM
 * If the program defines VIRTUAL_DIR it will use the
- * virtual_* functions
+ * virtual_* functions 
 */

 #ifdef VIRTUAL_DIR
@@ -267,7 +261,9 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 #define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
+#if !defined(TSRM_WIN32)
 # define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
+#endif
 #define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
 #define VCWD_MKDIR(pathname, mode) virtual_mkdir(pathname, mode TSRMLS_CC)
 #define VCWD_RMDIR(pathname) virtual_rmdir(pathname TSRMLS_CC)
@@ -310,7 +306,7 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
 #define VCWD_OPENDIR(pathname) opendir(pathname)
 #define VCWD_POPEN(command, type) popen(command, type)
 #if defined(TSRM_WIN32)
-#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode TSRMLS_CC)
+#define VCWD_ACCESS(pathname, mode) tsrm_win32_access(pathname, mode)
 #else
 #define VCWD_ACCESS(pathname, mode) access(pathname, mode)
 #endif
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2010 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -190,10 +190,10 @@ Finished:
 	return NULL;
 }

-TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
+TSRM_API int tsrm_win32_access(const char *pathname, int mode)
 {
 	time_t t;
-	HANDLE thread_token = NULL;
+	HANDLE thread_token;
 	PSID token_sid;
 	SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
 	GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };
@@ -208,6 +208,8 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 	realpath_cache_bucket * bucket = NULL;
 	char * real_path = NULL;

+	TSRMLS_FETCH();
+
 	if (mode == 1 /*X_OK*/) {
 		DWORD type;
 		return GetBinaryType(pathname, &type) ? 0 : -1;
@@ -363,9 +365,6 @@ Finished_Impersonate:
 		}

 Finished:
-		if(thread_token != NULL) {
-			CloseHandle(thread_token);
-		}
 		if(real_path != NULL) {
 			free(real_path);
 			real_path = NULL;
@@ -449,12 +448,10 @@ static HANDLE dupHandle(HANDLE fh, BOOL inherit) {

 TSRM_API FILE *popen(const char *command, const char *type)
 {
-	TSRMLS_FETCH();
-
-	return popen_ex(command, type, NULL, NULL TSRMLS_CC);
+	return popen_ex(command, type, NULL, NULL);
 }

-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC)
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
 {
 	FILE *stream = NULL;
 	int fno, type_len = strlen(type), read, mode;
@@ -472,6 +469,8 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	HANDLE token_user = NULL;
 	BOOL asuser = TRUE;

+	TSRMLS_FETCH();
+
 	if (!type) {
 		return NULL;
 	}
@@ -533,10 +532,6 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 	}

 	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
-	if (!cmd) {
-		return NULL;
-	}
-
 	sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
 	if (asuser) {
 		res = CreateProcessAsUser(token_user, NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2010 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -95,10 +95,10 @@ char * tsrm_win32_get_path_sid_key(const char *pathname  TSRMLS_DC);
 TSRM_API void tsrm_win32_startup(void);
 TSRM_API void tsrm_win32_shutdown(void);

-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env TSRMLS_DC);
+TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env);
 TSRM_API FILE *popen(const char *command, const char *type);
 TSRM_API int pclose(FILE *stream);
-TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC);
+TSRM_API int tsrm_win32_access(const char *pathname, int mode);
 TSRM_API int win32_utime(const char *filename, struct utimbuf *buf);

 TSRM_API int shmget(int key, int size, int flags);
@@ -1,395 +1,249 @@
 $Id$

-PHP 5.5 UPGRADE NOTES
+UPGRADE NOTES - PHP X.Y

-1. Backward Incompatible Changes
-2. New Features
-2. Changes in SAPI modules
-3. Deprecated Functionality
-4. Changed Functions
-5. New Functions
-6. New Classes and Interfaces
-7. Removed Extensions
-8. Other Changes to Extensions
-9. New Global Constants
-10. Changes to INI File Handling
-11. Windows Support
-12. Other Changes
+1. Changes made to default configuration
+2. Reserved words and classes
+3. Changes made to existing functions
+4. Changes made to existing methods
+5. Changes made to existing classes
+6. Deprecated
+7. Extensions:
+     a. moved out to PECL and actively maintained there
+     b. no longer maintained
+     c. with changed behaviour
+     d. no longer possible to disable
+8. Changes in SAPI support
+9. Changes in INI directives
+10. Syntax additions
+11. Windows support
+12. New in PHP X.Y:
+     a. New libraries
+     b. New extensions
+     c. New stream wrappers
+     d. New stream filters
+     e. New functions
+     f. New global constants
+     g. New classes
+     h. New methods
+     i. New class constants
+     j. New hash algorithms


 ========================================
-1. Backward Incompatible Changes
+1. Changes made to default configuration
 ========================================

- Drop Windows XP and 2003 support. (Pierre)
- All internal case insensitivity handling for class, function and constant 
-  names is done according to ASCII rules, current locale settings are ignored. 
- self, parent & static keywords now are always case-insensitive (see bug
-  #60833).
- php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and 
-  zend_logo_guid() have been removed
- Removal of Logo GUIDs
+- The default_charset setting now defaults to UTF-8.
+  It was ISO-88590-1 before, so if you were relying 
+  on the default, you will need to add:

-========================================
-2. New Features
-========================================
+    default_charset = iso-8859-1

- Support list in foreach. (Laruence)
-  (wiki.php.net/rfc/foreachlist)
- Support finally keyword. (Laruence)
-  (wiki.php.net/rfc/finally)
- Support constant array/string dereferencing. (Laruence)
-  (https://wiki.php.net/rfc/constdereference)
- Add support for using empty() on the result of function calls and
-  other expressions. Thus it is now possible to write empty(getArray()),
-  for example. (https://wiki.php.net/rfc/empty_isset_exprs)
- Added generators.
-  (https://wiki.php.net/rfc/generators)
- ClassName::class syntax returning full class name for a class as 
-  a string constant. (https://wiki.php.net/rfc/class_name_scalars)
- Added support for non-scalar Iterator keys in foreach.
-  (https://wiki.php.net/rfc/foreach-non-scalar-keys).
- Bundled Zend OPcache extension
- (https://wiki.php.net/rfc/optimizerplus)
+  to your php.ini to preserve pre-PHPX.Y behavior.

-========================================
-2. Changes in SAPI modules
-========================================
+- We now check at compile time if /dev/urandom or /dev/arandom
+  are present to provide non-blocking entropy to session id
+  generation.  If either is present, session.entropy_file
+  now defaults to that file and session.entropy_length defaults
+  to 32.  If you do not want extra entropy for your session ids
+  for some reason, add:

- Support for changing the process's title in CLI/CLI-Server SAPIs. (Keyur)
-  (https://wiki.php.net/rfc/cli_process_title)
+    session.entropy_file=
+    session.entropy_length=0

-========================================
-3. Deprecated Functionality
-========================================
+  to your php.ini to preserve pre-PHPX.Y behavior.

- The original MySQL extension is now deprecated, and will generate deprecation
-  warnings when connecting to a database through mysql_connect(),
-  mysql_pconnect() or by establishing an implicit connection. Use MySQLi or PDO
-  instead.
- The preg_replace /e modifier is now deprecated.  Use
-  preg_replace_callback instead.
-  (https://wiki.php.net/rfc/remove_preg_replace_eval_modifier)
- IntlDateFormatter::setTimeZoneID() and datefmt_set_timezone_id() are
-  deprecated. Use IntlDateFormatter::setTimeZone() or datefmt_set_timezone()
-  instead.
- mcrypt_ecb(), mcrypt_cbc(), mcrypt_cfb() and mcrypt_ofb() now throw
-  E_DEPRECATED. Their use was already previously discouraged in the docs,
-  but that predated the existence of E_DEPRECATED.
+- Deprecated ini directives will now throw an E_CORE_WARNING's 
+  instead of the previous E_WARNING's.

-========================================
-4. Changed Functions
-========================================
+  The following directives are marked as deprecated:
+  - magic_quotes_gpc
+  - magic_quotes_runtime
+  - magic_quotes_sybase

- pack()/unpack() had the following changes, which bring it more in line
-  with Perl's behavior:
-  - Implemented format character "Z": NULL padded string, with trailing NULL
-    bytes removed.
-  - Changed format character "a": this no longer removes trailing NULL bytes.
-  - Changed format character "A": all trailing ASCII whitespace is now removed
-    (defined as spaces, tabs, \r, \n and NULL).
- MessageFormatter::format() and related functions now accepted named arguments
-  and mixed numeric/named arguments in ICU 4.8+.
- MessageFormatter::format() and related functions now don't error out when
-  an insufficient argument count is provided. Instead, the placeholders will
-  remain unsubstituted.
- MessageFormatter::parse() and MessageFormat::format() (and their static
-  equivalents) now don't throw away better than second precision in the
-  arguments.
- IntlDateFormatter::__construct and datefmt_create() now accept for the
-  $timezone argument time zone identifiers, IntlTimeZone objects, DateTimeZone
-  objects and NULL. It used to accept only time zone identifiers and NULL.
-  Invalid time zone identifiers are no longer accepted. Emptry strings are
-  no longer accepted.
- The default time zone used in IntlDateFormatter::__construct and
-  datefmt_create() (when the corresponding argument is not passed or NULL is
-  passed) is now the one given by date_default_timezone_get(), not the
-  default ICU time zone.
- The time zone passed to the IntlDateFormatter is ignored if it is NULL and if
-  the calendar passed is an IntlCalendar object -- in this case, the
-  IntlCalendar's time zone will be used instead. Otherwise, the time zone
-  specified in the $timezone argument is used instead. This does not affect
-  old code, as IntlCalendar was introduced in this version.
- IntlDateFormatter::__construct and datefmt_create() now accept for the
-  $calendar argument also IntlCalendar objects.
- IntlDateFormatter::getCalendar() and datefmt_get_calendar() return false
-  if the IntlDateFormatter was set up with an IntlCalendar instead of the
-  constants IntlDateFormatter::GREGORIAN/TRADITIONAL. IntlCalendar did not
-  exist before this version.
- IntlDateFormatter::setCalendar() and datefmt_set_calendar() now also accept
-  an IntlCalendar object, in which case its time zone is taken. Passing a
-  constant is still allowed, and still keeps the time zone.
- IntlDateFormatter::format() and datefmt_format() now also accept an
-  IntlCalendar object for formatting.
- php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and 
-  zend_logo_guid() have been removed
- set_error_handler(NULL) can now be used to reset the error handler.
-  Furthermore both set_error_handler(NULL) and set_exception_handler(NULL) will
-  now return the previously defined error/exception handler. Previously
-  bool(true) was returned.
- setcookie(), setrawcookie() and ext/session now send Max-Age headers alongside
-  Expires headers. (see https://wiki.php.net/rfc/cookie_max-age)
- curl_setopt now accepts new option CURLOPT_SAFE_UPLOAD and CURLFile object for
-  safer file uploads (see https://wiki.php.net/rfc/curl-file-upload)
- Functions in the socket extension now do not emit warnings when the errno is
-  EAGAIN, EWOULDBLOCK or EINPROGRESS.
+- The following directives, which indicates a removed feature 
+  in PHP will now throw an E_CORE_ERROR upon startup like the 
+  deprecation warnings.

-========================================
-5. New Functions
-========================================
+  The following directives are no longer available:
+  - allow_call_time_pass_reference
+  - define_syslog_variables
+  - highlight.bg
+  - register_globals
+  - register_long_arrays
+  - safe_mode
+  - safe_mode_gid
+  - safe_mode_include_dir
+  - safe_mode_exec_dir
+  - safe_mode_allowed_env_vars
+  - safe_mode_protected_env_vars
+  - zend.ze1_compatibility_mode

- Core:
-  - array_column()
-  - boolval()
-  - password_get_info()
-  - password_hash()
-  - password_needs_rehash()
-  - password_verify()
+=============================
+2. Reserved words and classes
+=============================

- cURL:
-  - curl_file_create
+- 

- GD
-  - imageflip
-  - imagecrop
-  - imagecropauto
-  - imagesetinterpolation
-  - imageaffine
-  - imageaffinematrixget
-  - imageaffinematrixconcat
-  - imagescale
+=====================================
+3. Changes made to existing functions
+=====================================

- Hash:
-  - hash_pbkdf2()
+- 

- Intl:
-  - datefmt_format_object()
-  - datefmt_get_calendar_object()
-  - datefmt_get_timezone()
-  - datefmt_set_timezone()
-  - datefmt_get_calendar_object()
-  - intlcal_create_instance()
-  - intlcal_get_keyword_values_for_locale()
-  - intlcal_get_now()
-  - intlcal_get_available_locales()
-  - intlcal_get()
-  - intlcal_get_time()
-  - intlcal_set_time()
-  - intlcal_add()
-  - intlcal_set_time_zone()
-  - intlcal_after()
-  - intlcal_before()
-  - intlcal_set()
-  - intlcal_roll()
-  - intlcal_clear()
-  - intlcal_field_difference()
-  - intlcal_get_actual_maximum()
-  - intlcal_get_actual_minimum()
-  - intlcal_get_day_of_week_type()
-  - intlcal_get_first_day_of_week()
-  - intlcal_get_greatest_minimum()
-  - intlcal_get_least_maximum()
-  - intlcal_get_locale()
-  - intlcal_get_maximum()
-  - intlcal_get_minimal_days_in_first_week()
-  - intlcal_get_minimum()
-  - intlcal_get_time_zone()
-  - intlcal_get_type()
-  - intlcal_get_weekend_transition()
-  - intlcal_in_daylight_time()
-  - intlcal_is_equivalent_to()
-  - intlcal_is_lenient()
-  - intlcal_is_set()
-  - intlcal_is_weekend()
-  - intlcal_set_first_day_of_week()
-  - intlcal_set_lenient()
-  - intlcal_equals()
-  - intlcal_get_repeated_wall_time_option()
-  - intlcal_get_skipped_wall_time_option()
-  - intlcal_set_repeated_wall_time_option()
-  - intlcal_set_skipped_wall_time_option()
-  - intlcal_from_date_time()
-  - intlcal_to_date_time()
-  - intlcal_get_error_code()
-  - intlcal_get_error_message()
-  - intlgregcal_create_instance()
-  - intlgregcal_set_gregorian_change()
-  - intlgregcal_get_gregorian_change()
-  - intlgregcal_is_leap_year()
-  - intltz_create_time_zone()
-  - intltz_create_default()
-  - intltz_get_id()
-  - intltz_get_gmt()
-  - intltz_get_unknown()
-  - intltz_create_enumeration()
-  - intltz_count_equivalent_ids()
-  - intltz_create_time_zone_id_enumeration()
-  - intltz_get_canonical_id()
-  - intltz_get_region()
-  - intltz_get_tz_data_version()
-  - intltz_get_equivalent_id()
-  - intltz_use_daylight_time()
-  - intltz_get_offset()
-  - intltz_get_raw_offset()
-  - intltz_has_same_rules()
-  - intltz_get_display_name()
-  - intltz_get_dst_savings()
-  - intltz_from_date_time_zone()
-  - intltz_to_date_time_zone()
-  - intltz_get_error_code()
-  - intltz_get_error_message()
+===================================
+4. Changes made to existing methods
+===================================

-  - IntlDateFormatter::formatObject()
-  - IntlDateFormatter::getCalendarObject()
-  - IntlDateFormatter::getTimeZone()
-  - IntlDateFormatter::setTimeZone()
+- 

- Sockets:
-  - socket_sendmsg()
-  - socket_recvmsg()
-  - socket_cmsg_space()
+===================================
+5. Changes made to existing classes
+===================================

- SPL:
-  - SplFixedArray::__wakeup()
-  - SplDoublyLinkedList::add()
+- 

- Zend OPcache
- - opcache_get_configuration()
- - opcache_get_status()
- - opcache_reset()
+=============
+6. Deprecated
+=============

-========================================
-6. New Classes and Interfaces
-========================================
+- 

- Intl:
-  - IntlCalendar
-  - IntlGregorianCalendar
-  - IntlTimeZone
-  - IntlBreakIterator
-  - IntlRuleBasedBreakIterator
-  - IntlCodePointBreakIterator
-  - UConverter
+==========
+7. Removed
+==========

- cURL:
-  - CURLFile
+    a. removed features

-========================================
-7. Removed Extensions
-========================================
+       - register_globals
+       - register_long_arrays
+       - Safe mode
+       - Session extension bug compatibility mode
+       - y2k_compliance mode

+    b. removed ini directives

-========================================
-8. Other Changes to Extensions
-========================================
+       - define_syslog_variables
+       - register_globals
+       - register_long_arrays
+       - safe_mode
+       - safe_mode_gid
+       - safe_mode_include_dir
+       - safe_mode_exec_dir
+       - safe_mode_allowed_env_vars
+       - safe_mode_protected_env_vars
+       - session.bug_compat42
+       - session.bug_compat_warn
+       - y2k_compliance

- Intl:
-  - This extension now requires ICU 4.0+.
+    c. removed functions

-========================================
-9. New Global Constants
-========================================
+       - define_syslog_variables()
+       - import_request_variables()
+       - session_is_registered()
+       - session_register()
+       - session_unregister()

- mysqli:
-  - Added MYSQLI_SERVER_PUBLIC_KEY constant to be used with mysqli_options()
+=============
+8. Extensions
+=============

- cURL:
-  - Added CURLOPT_SAFE_UPLOAD to be used with curl_setopt().
+     a. moved out to PECL and actively maintained there

- GD
-  - Added constants for imageflip:
-    . IMG_FLIP_HORIZONTAL
-	. IMG_FLIP_VERTICAL
-    . IMG_FLIP_BOTH
-  - Added constants for imagecrop
-    . IMG_CROP_DEFAULT
-    . IMG_CROP_TRANSPARENT
-    . IMG_CROP_BLACK
-    . IMG_CROP_WHITE
-    . IMG_CROP_SIDES
-    . IMG_CROP_THRESHOLD
-  - Added constants for imagesetinterpolation, used by imagescale
-    imagerotate and imageaffine:
-    . IMG_BELL
-    . IMG_BESSEL
-    . IMG_BILINEAR_FIXED
-    . IMG_BICUBIC
-    . IMG_BICUBIC_FIXED
-    . IMG_BLACKMAN
-    . IMG_BOX
-    . IMG_BSPLINE
-    . IMG_CATMULLROM
-    . IMG_GAUSSIAN
-    . IMG_GENERALIZED_CUBIC
-    . IMG_HERMITE
-    . IMG_HAMMING
-    . IMG_HANNING
-    . IMG_MITCHELL
-    . IMG_POWER
-    . IMG_QUADRATIC
-    . IMG_SINC
-    . IMG_NEAREST_NEIGHBOUR
-    . IMG_WEIGHTED4
-    . IMG_TRIANGLE
-  - Added constants for imageaffinematrixget
-    . IMG_AFFINE_TRANSLATE
-    . IMG_AFFINE_SCALE
-    . IMG_AFFINE_ROTATE
-    . IMG_AFFINE_SHEAR_HORIZONTAL
-    . IMG_AFFINE_SHEAR_VERTICAL
+        - 

-========================================
-10. Changes to INI File Handling
-========================================
+     b. no longer maintained

- Core:
-  - Added sys_temp_dir INI directive, for specifying temp directory.
+        - 

- Intl:
-  - Added intl.use_exceptions INI directive, which controls what happens when
-    global errors are set together with intl.error_level.
+     c. with changed behaviour

- mysqlnd:
-  - Added mysqlnd.sha256_server_public_key INI PERDIR setting that affects all
-    APIs which use(are built) for mysqlnd. This allows ext/mysqli to be used
-	with the new auth protocol, although at coarser level.
+        - The session extension now can hook into the file upload feature
+          in order to provide upload progress information through session 
+          variables.

- Zend OPcache (See ext/opcache/README for more details)
-  - Added the following directives:
-    - opcache.enable (default "1")
-    - opcache.memory_consumption (default "64")
-    - opcache.interned_strings_buffer (default "4")
-    - opcache.max_accelerated_files (default "2000")
-    - opcache.max_wasted_percentage (default "5")
-    - opcache.use_cwd (default "1")
-    - opcache.validate_timestamps (default "1")
-    - opcache.revalidate_freq (default "2")
-    - opcache.revalidate_path (default "0")
-    - opcache.save_comments (default "1")
-    - opcache.load_comments (default "1")
-    - opcache.fast_shutdown (default "0")
-    - opcache.enable_file_override (default "0")
-    - opcache.optimization_level (default "0xffffffff")
-    - opcache.inherited_hack (default "1")
-    - opcache.blacklist_filename (default "")
-    - opcache.max_file_size (default "0")
-    - opcache.consistency_checks (default "0")
-    - opcache.force_restart_timeout (default "180")
-    - opcache.error_log (default "" which means stderr)
-    - opcache.log_verbosity_level (default "1")
-    - opcache.preferred_memory_model (default "")
-    - opcache.protect_memory (default "0")
-    - opcache.mmap_base (Windows-only)
+     d. no longer possible to disable

-========================================
-11. Windows Support
-========================================
+        - 

- Apache 2.4 handler is supported as of PHP 5.5.0
+==========================
+9. Changes in SAPI support
+==========================

+- 

-========================================
-12. Other Changes
-========================================
+=============================
+10. Changes in INI directives
+=============================

- Logo GUIDs will no longer work
+- Added session.upload_progress.enabled, session.upload_progress.cleanup, 
+  session.upload_progress.prefix, session.upload_progress.name, 
+  session.upload_progress.freq, session.upload_progress.min_freq.
+
+====================
+11. Syntax additions
+====================
+
+- Array dereferencing.
+  e.g.
+    foo()[0]
+    $foo->bar()[0]
+
+===================
+12. Windows support
+===================
+
+- 
+
+===================
+13. New in PHP X.Y:
+===================
+
+     a. New libraries
+
+       - 
+
+     b. New extensions
+
+       - 
+
+     c. New stream wrappers
+
+       - 
+
+     d. New stream filters
+
+       - 
+
+     e. New functions
+
+       - Core:
+
+     f. New global constants
+
+       - Core:
+         - get_declared_traits()
+
+     g. New classes
+
+       - Reflection:
+         - ReflectionZendExtension
+
+     h. New methods
+
+       - Reflection:
+         - ReflectionClass::isCloneable()
+         - ReflectionClass::getTraits()
+         - ReflectionClass::getTraitNames()
+         - ReflectionClass::getTraitAliases()
+
+     i. New class constants
+
+       - 
+
+     j. New Hash algorithms
+
+       - fnv132
+       - fnv164
+       - joaat
@@ -1,120 +0,0 @@
-$Id$
-
-UPGRADE NOTES - PHP X.Y
-
-1. Internal API changes
-  a. Executor changes
-  b. Streams pooling API
-  c. Lowercasing and locales
-  d. zend_qsort_r
-  e. get_current_key
-
-2. Build system changes
-  a. Unix build system changes
-  b. Windows build system changes
-
-
-========================
-1. Internal API changes
-========================
-
-	a. Executor changes
-
- * extensions can't override zend_execute() any more, they should override
-   zend_execute_ex() instead. The EG(current_execute_data) is already
-   initialized in zend_execute_ex(), so for compatibility extensions
-   may need to use EG(current_execute_data)->prev_execute_data instead.
- * removed EG(arg_types_stack), EX(fbc), EX(called_scope), EX(current_object)
- * added op_array->nested_calls. It's calculated at compile time.
- * added EX(call_slots). It is an array to store information about syntaticaly
-   nested calls (e.g. foo(bar())). It's preallocated together with execute_data.
- * added EX(call) - pointer to a current calling function. Actually an
-   element of EX(call_slots)
- * opcodes INIT_METHOD_CALL, ZEND_INIT_STATIC_METHOD_CALL,
-   ZEND_INIT_FCALL_BY_NAME, ZEND_INIT_NS_FCALL_BY_NAME use result.num as
-   an index in EX(call_slots)
- * opcode ZEND_NEW uses extended_vallue as an index in EX(call_slots)
- * opcoes ZEND_DO_FCALL and ZEND_DO_FCALL_BY_NAME use op2.num as
-   an index in EX(call_slots)
- * added op_array->used_stack. It's calculated at compile time and the
-   corresponding stack space is preallocated together with execute_data.
-   ZEND_SEND* and ZEND_DO_FCALL* don't need to check for stack overflow
-   anymore.
- * Removed execute_data->Ts field. The VM temporary variables always allocated
-   immediately before execute_data structure. Now they are accessed by offset
-   from the execute_data base pointer (instead of execute_data->Ts). Compiler
-   stores new offsets in op_array->opcodes[*].op?.num. You can use macros
-   EX_TMP_VAR() and EX_TMP_VAR_NUM() to access temp_variable by offset or
-   number. You can convert number to offset using EX_TMP_VAR_NUM(0, num) or
-   offset to number (EX_TMP_VAR_NUM(0,0)-EX_TMP_VAR(0,offset)).
- * Removed execute_data->CVs field. The VM compiled variables always allocated
-   immediately after execute_data structure. Now they are accessed by offset
-   from the execute_data base pointer (instead of execute_data->CVs). You can
-   use macros EX_CV_NUM() to access compiled variables by number.
-
-	b. Streams pooling API
-
-The streams pooling API has been removed. The following functions no longer
-exist:
-
-PHPAPI int php_stream_context_get_link(php_stream_context *context,
-		const char *hostent, php_stream **stream);
-PHPAPI int php_stream_context_set_link(php_stream_context *context,
-		const char *hostent, php_stream *stream);
-PHPAPI int php_stream_context_del_link(php_stream_context *context,
-		php_stream *stream);
-
-	c. Lowercasing and locales
-
-The lowercasing functions in zend_operators.c were split into those that do 
-lowercasing according to locale rules and those that do ASCII lowercasing.
-ASCII:
-
-                zend_str_tolower_copy
-                zend_str_tolower_dup
-                zend_str_tolower
-                zend_binary_strcasecmp
-                zend_binary_strncasecmp
-
-Locale-based:
-                zend_binary_strncasecmp_l
-                zend_binary_strcasecmp_l
-                zend_binary_zval_strcasecmp
-                zend_binary_zval_strncasecmp
-                string_compare_function_ex
-                string_case_compare_function
-
-Internal engine lowercasing will be using ASCII-only rules. User-facing functions,
-such as strcasecmp, will be using locale rules. 
-
-Two new functions - zend_binary_strncasecmp_l and zend_binary_strcasecmp_l - added as 
-locale-based counterparts to zend_binary_strcasecmp and zend_binary_strncasecmp.
-
-	d. zend_qsort_r
-
-Added the function zend_qsort_r():
-
-typedef int  (*compare_r_func_t)(const void *, const void * TSRMLS_DC, void *);
-void zend_qsort_r(void *base, size_t nmemb, size_t siz, compare_r_func_t compare, void *arg TSRMLS_DC);
-
-The extra argument it has (relatively to zend_qsort()) is passed to the
-comparison function.
-
-	e. get_current_key
-
-The signature of the get_current_key iteration handler has been changed to:
-
-void (*get_current_key)(zend_object_iterator *iter, zval *key TSRMLS_DC);
-
-The key should be written into the zval* using the ZVAL_* macros.
-
-========================
-2. Build system changes
-========================
-
-  a. Unix build system changes
-    - 
-
-  b. Windows build system changes
-    - Drop Windows XP and 2003 support.
-  
@@ -17,8 +17,7 @@ libZend_la_SOURCES=\
 	zend_objects_API.c zend_ts_hash.c zend_stream.c \
 	zend_default_classes.c \
 	zend_iterators.c zend_interfaces.c zend_exceptions.c \
-	zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \
-	zend_generators.c
+	zend_strtod.c zend_closures.c zend_float.c zend_string.c

 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
@@ -36,12 +35,13 @@ zend_language_scanner.c: $(srcdir)/zend_language_scanner.l

 zend_language_parser.h: zend_language_parser.c
 zend_language_parser.c: $(srcdir)/zend_language_parser.y
-	$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o zend_language_parser.c
+	$(LEMON) $(LEMON_FLAGS) $(srcdir)/zend_language_parser.y || test $$? -eq 2
+

 # INI parser/scanner rules

 zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
-	$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
+	$(LEMON) $(LEMON_FLAGS) $(srcdir)/zend_ini_parser.y

 zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
 	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
@@ -9,7 +9,7 @@ allocation overhead and speedup memory management.

 The new manager's "configure" has no "--disable-zend-memory-manager" option,
 but it has "--enable-malloc-mm" instead.  It is enabled by default in DEBUG
-build and disabled by default in RELEASE build. When enabled it allows selecting
+build and disabled by default in RELEASE build.  when enabled it allows selecting
 between malloc and emalloc at runtime so you can use internal and external memory
 debuggers without recompilation.

@@ -24,15 +24,6 @@ Zend MM disabled:

    $ USE_ZEND_ALLOC=0 valgrind --leak-check=full sapi/cli/php -r 'leak();'

-Shared extensions:
------------------
-
-Since PHP 5.3.11 it is possible to prevent shared extensions from unloading so
-that valgrind can correctly track the memory leaks in shared extensions. For
-this there is the ZEND_DONT_UNLOAD_MODULES environment variable. If set, then
-DL_UNLOAD() is skipped during the shutdown of shared extensions.
-
-
 Tweaking:
 ---------

@@ -1,5 +1,5 @@
 Title:           Zend 2.0 Namespaces
-Version:         $Id$
+Version:         $Revision$
 Status:          declined
 Maintainer:      Stig S. Bakken <ssb@php.net>
 Created:         2001-09-08
@@ -1,5 +1,5 @@
 Title:           Loose type requirements for functions
-Version:         $Id$
+Version:         $Revision$
 Status:          draft
 Maintainer:      Brian Moon <brianm@dealnews.com>
 Created:         2001-09-17
@@ -159,10 +159,6 @@ SOURCE=.\zend_float.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_generators.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_hash.c
 # End Source File
 # Begin Source File
@@ -323,6 +319,10 @@ SOURCE=.\zend_extensions.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_fast_cache.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_globals.h
 # End Source File
 # Begin Source File
@@ -176,6 +176,13 @@ AC_ARG_ENABLE(inline-optimization,
  ZEND_INLINE_OPTIMIZATION=yes
 ])

+AC_ARG_ENABLE(zend-multibyte,
+[  --enable-zend-multibyte Compile with zend multibyte support], [
+  ZEND_MULTIBYTE=$enableval
+],[
+  ZEND_MULTIBYTE=no
+])
+
 AC_MSG_CHECKING([virtual machine dispatch method])
 AC_MSG_RESULT($PHP_ZEND_VM)

@@ -188,6 +195,9 @@ AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
 AC_MSG_CHECKING(whether to enable Zend debugging)
 AC_MSG_RESULT($ZEND_DEBUG)

+AC_MSG_CHECKING(whether to enable Zend multibyte)
+AC_MSG_RESULT($ZEND_MULTIBYTE)
+
 case $PHP_ZEND_VM in
  SWITCH)
    AC_DEFINE(ZEND_VM_KIND,ZEND_VM_KIND_SWITCH,[virtual machine dispatch method])
@@ -222,6 +232,10 @@ if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
  LIBZEND_CPLUSPLUS_CHECKS
 fi  

+if test "$ZEND_MULTIBYTE" = "yes"; then
+  AC_DEFINE(ZEND_MULTIBYTE, 1, [ ])
+fi
+
 changequote({,})
 if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
  INLINE_CFLAGS=`echo $ac_n "$CFLAGS $ac_c" | sed s/-O[0-9s]*//`
@@ -392,28 +406,8 @@ int main()

 AC_CHECK_FUNCS(mremap)

-
-AC_ARG_ENABLE(zend-signals,
-[  --enable-zend-signals   Use zend signal handling],[
-  ZEND_SIGNALS=$enableval
-],[
-  ZEND_SIGNALS=no
-])  
-
-AC_CHECK_FUNC(sigaction, [
-	AC_DEFINE(HAVE_SIGACTION, 1, [Whether sigaction() is available])
-], [
-	ZEND_SIGNALS=no
 ])
-if test "$ZEND_SIGNALS" = "yes"; then
-	AC_DEFINE(ZEND_SIGNALS, 1, [Use zend signal handling])
-	CFLAGS="$CFLAGS -DZEND_SIGNALS"
-fi

-AC_MSG_CHECKING(whether to enable zend signal handling)
-AC_MSG_RESULT($ZEND_SIGNALS)
-
-])

 AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[

@@ -185,10 +185,6 @@ SOURCE=.\zend_extensions.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_generators.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_hash.c
 # End Source File
 # Begin Source File
@@ -353,6 +349,10 @@ SOURCE=.\zend_extensions.h
 # End Source File
 # Begin Source File

+SOURCE=.\zend_fast_cache.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_globals.h
 # End Source File
 # Begin Source File
@@ -0,0 +1,127 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define ZEND_API __attribute__ ((visibility("default")))
+# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
+#else
+# define ZEND_API
+# define ZEND_DLEXPORT
+#endif
+
+#define ZEND_DLIMPORT
+
+@TOP@
+
+#undef uint
+#undef ulong
+
+/* Define if you want to enable memory limit support */
+#define MEMORY_LIMIT 0
+
+@BOTTOM@
+
+#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifdef HAVE_IEEEFP_H
+# include <ieeefp.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#if ZEND_BROKEN_SPRINTF
+int zend_sprintf(char *buffer, const char *format, ...);
+#else
+# define zend_sprintf sprintf
+#endif
+
+#include <math.h>
+
+/* To enable the is_nan, is_infinite and is_finite PHP functions */
+#ifdef NETWARE
+	#define HAVE_ISNAN 1
+	#define HAVE_ISINF 1
+	#define HAVE_ISFINITE 1
+#endif
+
+#ifndef zend_isnan
+#ifdef HAVE_ISNAN
+#define zend_isnan(a) isnan(a)
+#elif defined(HAVE_FPCLASS)
+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+#else
+#define zend_isnan(a) 0
+#endif
+#endif
+
+#ifdef HAVE_ISINF
+#define zend_isinf(a) isinf(a)
+#elif defined(INFINITY)
+/* Might not work, but is required by ISO C99 */
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
+#else
+#define zend_isinf(a) 0
+#endif
+
+#ifdef HAVE_FINITE
+#define zend_finite(a) finite(a)
+#elif defined(HAVE_ISFINITE) || defined(isfinite)
+#define zend_finite(a) isfinite(a)
+#elif defined(fpclassify)
+#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
+#else
+#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
+#endif
+
+#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
+
+#ifdef NETWARE
+#ifdef USE_WINSOCK
+#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
+#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
+#endif
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
@@ -2,39 +2,6 @@ dnl $Id$
 dnl
 dnl This file contains local autoconf functions.

-AC_DEFUN([LIBZEND_BISON_CHECK],[
-  # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2"
-
-  # for standalone build of Zend Engine
-  test -z "$SED" && SED=sed
-
-  bison_version=none
-  if test "$YACC"; then
-    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
-      php_cv_bison_version=invalid
-      if test -n "$bison_version_vars"; then
-        set $bison_version_vars
-        bison_version="${1}.${2}"
-        for bison_check_version in $bison_version_list; do
-          if test "$bison_version" = "$bison_check_version"; then
-            php_cv_bison_version="$bison_check_version (ok)"
-            break
-          fi
-        done
-      fi
-    ])
-  fi
-  case $php_cv_bison_version in
-    ""|invalid[)]
-      bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)."
-      AC_MSG_WARN([$bison_msg])
-      YACC="exit 0;"
-      ;;
-  esac
-])
-
 AC_DEFUN([ZEND_FP_EXCEPT],[
  AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
    AC_TRY_COMPILE([
@@ -33,7 +33,7 @@ $(makefile_in_files): $(makefile_am_files)
 aclocal.m4: configure.in acinclude.m4
 	aclocal

-$(config_h_in): configure.in
+$(config_h_in): configure.in acconfig.h
 # explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@
@@ -11,105 +11,6 @@ AM_PROG_CC_STDC
 ZEND_VERSION=$VERSION
 AC_ZEND_C_BIGENDIAN

-AH_TOP([
-#if defined(__GNUC__) && __GNUC__ >= 4
-# define ZEND_API __attribute__ ((visibility("default")))
-# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
-#else
-# define ZEND_API
-# define ZEND_DLEXPORT
-#endif
-
-#define ZEND_DLIMPORT
-
-#undef uint
-#undef ulong
-
-/* Define if you want to enable memory limit support */
-#define MEMORY_LIMIT 0
-])
-
-AH_BOTTOM([
-#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#if ZEND_BROKEN_SPRINTF
-int zend_sprintf(char *buffer, const char *format, ...);
-#else
-# define zend_sprintf sprintf
-#endif
-
-#include <math.h>
-
-/* To enable the is_nan, is_infinite and is_finite PHP functions */
-#ifdef NETWARE
-	#define HAVE_ISNAN 1
-	#define HAVE_ISINF 1
-	#define HAVE_ISFINITE 1
-#endif
-
-#ifndef zend_isnan
-#ifdef HAVE_ISNAN
-#define zend_isnan(a) isnan(a)
-#elif defined(HAVE_FPCLASS)
-#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
-#else
-#define zend_isnan(a) 0
-#endif
-#endif
-
-#ifdef HAVE_ISINF
-#define zend_isinf(a) isinf(a)
-#elif defined(INFINITY)
-/* Might not work, but is required by ISO C99 */
-#define zend_isinf(a) (((a)==INFINITY)?1:0)
-#elif defined(HAVE_FPCLASS)
-#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
-#else
-#define zend_isinf(a) 0
-#endif
-
-#ifdef HAVE_FINITE
-#define zend_finite(a) finite(a)
-#elif defined(HAVE_ISFINITE) || defined(isfinite)
-#define zend_finite(a) isfinite(a)
-#elif defined(fpclassify)
-#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
-#else
-#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
-#endif
-
-#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
-
-#ifdef NETWARE
-#ifdef USE_WINSOCK
-#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
-#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
-#endif
-#endif
-])
-
 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1

@@ -174,63 +174,6 @@ function read_const($n) {
 	}
 }

-function read_auto_global($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $_GET;
-	}
-}
-
-$g_var = 0;
-
-function read_global_var($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $GLOBALS['g_var'];
-	}
-}
-
-function read_hash($n) {
-	$hash = array('test' => 0);
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $hash['test'];
-	}
-}
-
-function read_str_offset($n) {
-	$str = "test";
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $str[1];
-	}
-}
-
-function issetor($n) {
-	$val = array(0,1,2,3,4,5,6,7,8,9);
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $val ?: null;
-	}
-}
-
-function issetor2($n) {
-	$f = false; $j = 0;
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $f ?: $j + 1;
-	}
-}
-
-function ternary($n) {
-	$val = array(0,1,2,3,4,5,6,7,8,9);
-	$f = false;
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $f ? null : $val;
-	}
-}
-
-function ternary2($n) {
-	$f = false; $j = 0;
-	for ($i = 0; $i < $n; ++$i) {
-		$x = $f ? $f : $j + 1;
-	}
-}
-
 /*****/

 function empty_loop($n) {
@@ -339,20 +282,4 @@ create_object(N);
 $t = end_test($t, 'new Foo()', $overhead);
 read_const(N);
 $t = end_test($t, '$x = TEST', $overhead);
-read_auto_global(N);
-$t = end_test($t, '$x = $_GET', $overhead);
-read_global_var(N);
-$t = end_test($t, '$x = $GLOBALS[\'v\']', $overhead);
-read_hash(N);
-$t = end_test($t, '$x = $hash[\'v\']', $overhead);
-read_str_offset(N);
-$t = end_test($t, '$x = $str[0]', $overhead);
-issetor(N);
-$t = end_test($t, '$x = $a ?: null', $overhead);
-issetor2(N);
-$t = end_test($t, '$x = $f ?: tmp', $overhead);
-ternary(N);
-$t = end_test($t, '$x = $f ? $f : $a', $overhead);
-ternary2(N);
-$t = end_test($t, '$x = $f ? $f : tmp', $overhead);
 total($t0, "Total");
@@ -21,5 +21,5 @@ print "ok\n";
 Notice: Trying to get property of non-object in %s on line %d
 ok

-Warning: Creating default object from empty value in %s on line %d
+Strict Standards: Creating default object from empty value in %s on line %d
 ok
@@ -26,6 +26,6 @@ Notice: Undefined variable: arr in %s on line %d

 Notice: Trying to get property of non-object in %s on line %d

-Warning: Creating default object from empty value in %s on line %d
+Strict Standards: Creating default object from empty value in %s on line %d

-Warning: Creating default object from empty value in %s on line %d
+Strict Standards: Creating default object from empty value in %s on line %d
@@ -1,16 +0,0 @@
--TEST--
-Bug #55719 (Argument restriction should come with a more specific error message)
--FILE--
-<?php
-Class Base {
-	public function &test($foo, array $bar, $option = NULL, $extra = "lllllllllllllllllllllllllllllllllllllllllllllllllll") {
-	}	
-}
-
-class Sub extends Base {
-	public function &test() {
-	}	
-}
-?>
--EXPECTF--
-Strict Standards: Declaration of Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d 
@@ -1,16 +0,0 @@
--TEST--
-Bug #55719 (Argument restriction should come with a more specific error message)
--FILE--
-<?php
-Abstract Class Base {
-	public function test($foo, array &$bar, $option = NULL, $extra = 3.141592653589793238462643383279502884197169399375105  ) {
-	}	
-}
-
-class Sub extends Base {
-	public function test($foo, array &$bar) {
-	}	
-}
-?>
--EXPECTF--
-Strict Standards: Declaration of Sub::test() should be compatible with Base::test($foo, array &$bar, $option = NULL, $extra = 3.1415926535898) in %sargument_restriction_002.php on line %d
@@ -1,19 +0,0 @@
--TEST--
-Bug #55719 (Argument restriction should come with a more specific error message)
--FILE--
-<?php
-class Foo {
-}
-
-Abstract Class Base {
-	public function test(Foo $foo, array $bar, $option = NULL, $extra = "lllllllllllllllllllllllllllllllllllllllllllllllllll") {
-	}	
-}
-
-class Sub extends Base {
-	public function test() {
-	}	
-}
-?>
--EXPECTF--
-Strict Standards: Declaration of Sub::test() should be compatible with Base::test(Foo $foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_003.php on line %d
@@ -1,17 +0,0 @@
--TEST--
-Bug #55719 (Argument restriction should come with a more specific error message)
--FILE--
-<?php
-class Foo {
-}
-
-Abstract Class Base {
-	abstract public function test(Foo $foo, array $bar, $option = NULL, $extra = 16777215) ;
-}
-
-class Sub extends Base {
-	public function test(Foo $foo, array $bar, $option = NULL, $extra = 0xffffff ) {
-	}	
-}
-?>
--EXPECTF--
@@ -1,11 +0,0 @@
--TEST--
-Bug #55719 (Argument restriction should come with a more specific error message)
--FILE--
-<?php
-class Sub implements ArrayAccess {
-	public function offsetSet() {
-	}	
-}
-?>
--EXPECTF--
-Fatal error: Declaration of Sub::offsetSet() must be compatible with ArrayAccess::offsetSet($offset, $value) in %sargument_restriction_005.php on line %d
@@ -1,16 +0,0 @@
--TEST--
-Bug #60174 (Notice when array in method prototype error)
--FILE--
-<?php
-Abstract Class Base {
-	public function test($foo, $extra = array("test")) {
-	}	
-}
-
-class Sub extends Base {
-	public function test($foo, $extra) {
-	}	
-}
-?>
--EXPECTF--
-Strict Standards: Declaration of Sub::test() should be compatible with Base::test($foo, $extra = Array) in %sargument_restriction_006.php on line %d
@@ -1,154 +0,0 @@
--TEST--
-testing binary literals
--INI--
-precision=14
--SKIPIF--
-<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
--FILE--
-<?php
-var_dump(0b1);
-var_dump(0b11);
-var_dump(0b111);
-var_dump(0b1111);
-var_dump(0b11111);
-var_dump(0b111111);
-var_dump(0b1111111);
-var_dump(0b11111111);
-var_dump(0b111111111);
-var_dump(0b1111111111);
-var_dump(0b11111111111);
-var_dump(0b111111111111);
-var_dump(0b1111111111111);
-var_dump(0b11111111111111);
-var_dump(0b111111111111111);
-var_dump(0b1111111111111111);
-var_dump(0b11111111111111111);
-var_dump(0b111111111111111111);
-var_dump(0b1111111111111111111);
-var_dump(0b11111111111111111111);
-var_dump(0b111111111111111111111);
-var_dump(0b1111111111111111111111);
-var_dump(0b11111111111111111111111);
-var_dump(0b111111111111111111111111);
-var_dump(0b1111111111111111111111111);
-var_dump(0b11111111111111111111111111);
-var_dump(0b111111111111111111111111111);
-var_dump(0b1111111111111111111111111111);
-var_dump(0b11111111111111111111111111111);
-var_dump(0b111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111111111111111111);
-
-var_dump(-0b1111111111111111111111111111111111111111111111111111111111111111);
-var_dump(-0b111111111111111111111111111111111111111111111111111111111111111);
-var_dump(-0b11111111111111111111111111111111111111111111111111111111111111);
-var_dump(-0b111111111111111111111111111111111);
-var_dump(-0b11111111111111111111111111111111);
-var_dump(-0b1111111111111111111111111111111);
-var_dump(-0b111111111111111111111111111111);
-var_dump(-0b1);
--EXPECT--
-int(1)
-int(3)
-int(7)
-int(15)
-int(31)
-int(63)
-int(127)
-int(255)
-int(511)
-int(1023)
-int(2047)
-int(4095)
-int(8191)
-int(16383)
-int(32767)
-int(65535)
-int(131071)
-int(262143)
-int(524287)
-int(1048575)
-int(2097151)
-int(4194303)
-int(8388607)
-int(16777215)
-int(33554431)
-int(67108863)
-int(134217727)
-int(268435455)
-int(536870911)
-int(1073741823)
-int(2147483647)
-float(4294967295)
-float(8589934591)
-float(17179869183)
-float(34359738367)
-float(68719476735)
-float(137438953471)
-float(274877906943)
-float(549755813887)
-float(1099511627775)
-float(2199023255551)
-float(4398046511103)
-float(8796093022207)
-float(17592186044415)
-float(35184372088831)
-float(70368744177663)
-float(1.4073748835533E+14)
-float(2.8147497671066E+14)
-float(5.6294995342131E+14)
-float(1.1258999068426E+15)
-float(2.2517998136852E+15)
-float(4.5035996273705E+15)
-float(9.007199254741E+15)
-float(1.8014398509482E+16)
-float(3.6028797018964E+16)
-float(7.2057594037928E+16)
-float(1.4411518807586E+17)
-float(2.8823037615171E+17)
-float(5.7646075230342E+17)
-float(1.1529215046068E+18)
-float(2.3058430092137E+18)
-float(4.6116860184274E+18)
-float(9.2233720368548E+18)
-float(1.844674407371E+19)
-float(-1.844674407371E+19)
-float(-9.2233720368548E+18)
-float(-4.6116860184274E+18)
-float(-8589934591)
-float(-4294967295)
-int(-2147483647)
-int(-1073741823)
-int(-1)
@@ -1,154 +0,0 @@
--TEST--
-testing binary literals
--INI--
-precision=32
--SKIPIF--
-<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
--FILE--
-<?php
-var_dump(0b1);
-var_dump(0b11);
-var_dump(0b111);
-var_dump(0b1111);
-var_dump(0b11111);
-var_dump(0b111111);
-var_dump(0b1111111);
-var_dump(0b11111111);
-var_dump(0b111111111);
-var_dump(0b1111111111);
-var_dump(0b11111111111);
-var_dump(0b111111111111);
-var_dump(0b1111111111111);
-var_dump(0b11111111111111);
-var_dump(0b111111111111111);
-var_dump(0b1111111111111111);
-var_dump(0b11111111111111111);
-var_dump(0b111111111111111111);
-var_dump(0b1111111111111111111);
-var_dump(0b11111111111111111111);
-var_dump(0b111111111111111111111);
-var_dump(0b1111111111111111111111);
-var_dump(0b11111111111111111111111);
-var_dump(0b111111111111111111111111);
-var_dump(0b1111111111111111111111111);
-var_dump(0b11111111111111111111111111);
-var_dump(0b111111111111111111111111111);
-var_dump(0b1111111111111111111111111111);
-var_dump(0b11111111111111111111111111111);
-var_dump(0b111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111111111111111);
-var_dump(0b111111111111111111111111111111111111111111111111111111111111111 + 1);
-var_dump(0b1111111111111111111111111111111111111111111111111111111111111111);
-var_dump(0b1111111111111111111111111111111111111111111111111111111111111111 + 1);
-var_dump(0b11111111111111111111111111111111111111111111111111111111111111111);
-var_dump(0b11111111111111111111111111111111111111111111111111111111111111111 + 1);
-
-var_dump(-0b1111111111111111111111111111111111111111111111111111111111111111);
-var_dump(-0b111111111111111111111111111111111111111111111111111111111111111);
-var_dump(-0b11111111111111111111111111111111111111111111111111111111111111);
-var_dump(-0b1);
--EXPECT--
-int(1)
-int(3)
-int(7)
-int(15)
-int(31)
-int(63)
-int(127)
-int(255)
-int(511)
-int(1023)
-int(2047)
-int(4095)
-int(8191)
-int(16383)
-int(32767)
-int(65535)
-int(131071)
-int(262143)
-int(524287)
-int(1048575)
-int(2097151)
-int(4194303)
-int(8388607)
-int(16777215)
-int(33554431)
-int(67108863)
-int(134217727)
-int(268435455)
-int(536870911)
-int(1073741823)
-int(2147483647)
-int(4294967295)
-int(8589934591)
-int(17179869183)
-int(34359738367)
-int(68719476735)
-int(137438953471)
-int(274877906943)
-int(549755813887)
-int(1099511627775)
-int(2199023255551)
-int(4398046511103)
-int(8796093022207)
-int(17592186044415)
-int(35184372088831)
-int(70368744177663)
-int(140737488355327)
-int(281474976710655)
-int(562949953421311)
-int(1125899906842623)
-int(2251799813685247)
-int(4503599627370495)
-int(9007199254740991)
-int(18014398509481983)
-int(36028797018963967)
-int(72057594037927935)
-int(144115188075855871)
-int(288230376151711743)
-int(576460752303423487)
-int(1152921504606846975)
-int(2305843009213693951)
-int(4611686018427387903)
-int(9223372036854775807)
-float(9223372036854775808)
-float(18446744073709549568)
-float(18446744073709549568)
-float(36893488147419099136)
-float(36893488147419099136)
-float(-18446744073709549568)
-int(-9223372036854775807)
-int(-4611686018427387903)
-int(-1)
@@ -1,37 +0,0 @@
--TEST--
-Bug #18556 (Setting locale to 'tr_TR' lowercases class names)
--FILE--
-<?php
-$g_lang = 'tr_TR';
-putenv("LANG=$g_lang"); 
-setlocale(LC_ALL, $g_lang);
-
-class InfoBlob {
-   var $foo;
-   function InfoBlob() {
-      $this->foo = "Foo";
-   }
-}
-
-echo "Instantiating an infoBlob with a lowercase i\n";
-$foobar = new infoBlob();
-echo $foobar->foo;
-echo "\nInstantiating an InfoBlob with an uppercase I\n";
-$foobar = new InfoBlob();
-echo $foobar->foo;
-echo "\n";
-setlocale(LC_ALL, "tr_TR.utf8");
-foreach(get_declared_classes() as $class)
-{
-	if(!class_exists($class))
-		echo "$class No Longer Exists!\n";
-
-}
-echo "Done.\n";
-?>
--EXPECT--
-Instantiating an infoBlob with a lowercase i
-Foo
-Instantiating an InfoBlob with an uppercase I
-Foo
-Done.
Author	SHA1	Message	Date
Felipe Pena	4445503ae0	- Reverted mem alloc function change - Fixed lineno on method declarations	2010-07-20 17:22:51 +00:00
Felipe Pena	53293a6538	- Update exit status	2010-07-19 23:34:16 +00:00
Felipe Pena	38f2a2ed3f	- Fixed wrong lineno by fixing the rules	2010-07-19 22:46:45 +00:00
Felipe Pena	1ec1dcb0d6	- Lets avoid unnecessary zend_verify_namespace() calls	2010-07-17 17:47:06 +00:00
Felipe Pena	97c93c980e	- Opss, fix code	2010-07-17 01:24:20 +00:00
Felipe Pena	d9201cba39	- Lets use the _emalloc, _efree functions	2010-07-15 17:57:22 +00:00
Felipe Pena	09ff94e900	- Added missing --no-generation-date flag	2010-07-15 16:43:53 +00:00
Felipe Pena	14477dbb4d	- Minor compiler optimizations	2010-07-15 14:21:25 +00:00
Felipe Pena	dfe0c17e68	- Inlining parser functions	2010-07-15 13:16:53 +00:00
Felipe Pena	5e04ca2e54	- Disable error recovery	2010-07-14 02:21:38 +00:00
Felipe Pena	5f5486b706	- Update exit_status, heh	2010-07-13 19:45:07 +00:00
Kalle Sommer Nielsen	a19ab0755d	Commit Felipe's change to the re2c flags to the Windows makefile aswell	2010-07-13 16:24:26 +00:00
Felipe Pena	445fd47c79	- Added --no-generation-date re2c flag to do not change the .h files always when changing the .l file	2010-07-13 15:50:05 +00:00
Felipe Pena	75f32bdad2	- Added missing tokens on ST_VAR_OFFSET state	2010-07-13 15:30:30 +00:00
Pierrick Charron	e0c7dbf30d	- Add YYNOERRORRECOVERY to disable error recovery processing - Remove warning	2010-07-13 05:45:23 +00:00
Felipe Pena	6bed6c114e	- Fixed SIGSEGV when E_PARSE occurred in zend_eval_stringl	2010-07-12 20:11:35 +00:00
Felipe Pena	087117419b	- Woops, remove commented code	2010-07-12 19:14:26 +00:00
Felipe Pena	c4cb864b92	- Fixed ext/tokenizer line number differences	2010-07-12 19:13:00 +00:00
Felipe Pena	7da34df439	- Fixed line number on error messages	2010-07-12 18:48:09 +00:00
Felipe Pena	233bdc7d2b	- Removed Bison checks - Removed TSRMLS_FETCH() call in zend_ini_parser %syntax_error	2010-07-12 13:52:43 +00:00
Felipe Pena	4d4ec8a963	- Removed bison flags related to zend_ini_parser	2010-07-12 13:38:13 +00:00
Pierrick Charron	96d49e4d5b	Lemon version of the zend_ini_parser	2010-07-12 13:32:00 +00:00
Felipe Pena	6f32b2cda4	- Defined NDEBUG to avoid checks for tracefile, and added -l flag	2010-07-12 12:59:28 +00:00
Felipe Pena	3c8d3c08ac	- Added ParseARG_STORE into yy_destructor template for suppress warning about unused %extra_argument	2010-07-12 12:42:11 +00:00
Felipe Pena	e865de5881	- Added parser name and prototype declaration	2010-07-12 11:50:17 +00:00
Pierre Joye	811f8c32cb	- windows support for lemon, 1st shot (some warning in lemon.c but seems to work)	2010-07-12 09:02:27 +00:00
Pierre Joye	c516bfd602	- MFH pcre windows build fix	2010-07-12 08:51:41 +00:00
Felipe Pena	423c85fd8b	- Fix rule name	2010-07-11 22:20:30 +00:00
Felipe Pena	031d4d4c2f	- Woops, debug stuff :)	2010-07-11 22:00:50 +00:00
Felipe Pena	8ced178bd8	- Fixed namespace with braces rules - Fixed scanner to just return the tokens, not yytext[0]	2010-07-11 21:53:17 +00:00
Felipe Pena	5e3aa49798	- Missing T_DOLLAR	2010-07-11 17:25:06 +00:00
Felipe Pena	819fee249f	- Fixed ext/tokenizer to work with the new tokens (<, >, @, !, etc)	2010-07-11 14:17:26 +00:00
Felipe Pena	c0db570336	- Added lemon to distclean	2010-07-11 13:21:00 +00:00
Felipe Pena	d32b9dbf52	- Added lemon source to be build and use it to create the parser	2010-07-11 13:18:35 +00:00
Etienne Kneuss	64efbc9894	mostly WS, cleanup stuff	2010-07-11 00:44:07 +00:00
Felipe Pena	2610647b0e	- Fix the static_scalar rule	2010-07-10 20:16:15 +00:00
Felipe Pena	1352520286	- Fixed variable variables as function name	2010-07-10 17:11:10 +00:00
Felipe Pena	67055d0af8	- Workaround for YYACCEPT on __halt_compiler()	2010-07-10 16:57:50 +00:00
Felipe Pena	e1f175e576	- Fixed heredoc bug	2010-07-10 15:49:15 +00:00
Etienne Kneuss	79f3996bfc	Fix lemon's return value and uncomment unaries/shifts	2010-07-10 11:10:38 +00:00
Etienne Kneuss	13d45760b3	Remove T_T_DOLLAR	2010-07-10 10:29:29 +00:00
Felipe Pena	8ccf85045e	- Fixed stack overflow on ${a}	2010-07-10 00:50:56 +00:00
Felipe Pena	95210c41ac	- Rename identifier A -> B	2010-07-10 00:26:21 +00:00
Felipe Pena	9878308fb7	s/T_DOLLAR/DOLLAR/	2010-07-10 00:22:15 +00:00
Felipe Pena	1a2fe6faf0	- Removed -c Lemon flag to compress the action table (magically fixes the switch rule :D)	2010-07-09 19:41:41 +00:00
Felipe Pena	74499b10ad	- Fixed @ precedence	2010-07-09 19:39:00 +00:00
Felipe Pena	4346721c5c	- Fixed $var[0] interpolation and close tag	2010-07-09 16:26:46 +00:00
Felipe Pena	c252503965	- Fixed scanner return rules	2010-07-09 15:34:05 +00:00
Felipe Pena	80a5fda9a2	- Fix switch and Parse call	2010-07-09 15:25:08 +00:00
Felipe Pena	fdca15015b	- WS	2010-07-09 14:43:23 +00:00
Felipe Pena	68c3f855a3	- Fixed array crashing	2010-07-09 14:16:37 +00:00
Felipe Pena	5ec7eb7469	- Added Lemon check and flag setting	2010-07-09 13:21:08 +00:00
Etienne Kneuss	02da3f3332	bailout on error	2010-07-09 13:07:12 +00:00
Etienne Kneuss	e2f24383df	Fix build without new productions	2010-07-09 12:30:15 +00:00
Etienne Kneuss	8c77721502	Fix exit code tests	2010-07-09 12:19:52 +00:00
Etienne Kneuss	c7148edaeb	Allow conflicts	2010-07-09 12:06:45 +00:00
Etienne Kneuss	cfd3976960	Allow conflicts	2010-07-09 12:02:41 +00:00
Etienne Kneuss	87a3b40bc5	fix array	2010-07-09 11:43:27 +00:00
Etienne Kneuss	92e057a72d	guard tsrm inside a ifdef, remains to specify it at the time of the lemon call	2010-07-09 11:39:27 +00:00
Etienne Kneuss	24d4af25e4	Fix irreducible rule	2010-07-09 11:25:59 +00:00
Etienne Kneuss	17fd7857bc	Woops	2010-07-09 11:24:52 +00:00
Etienne Kneuss	c38ff91f0d	todo no longer needed, + A is always on the result side	2010-07-09 11:24:11 +00:00
Etienne Kneuss	a2df0bd5fc	Fix some stuff	2010-07-09 09:43:07 +00:00
Etienne Kneuss	7beb5eac3b	Some fixes	2010-07-09 09:28:39 +00:00
Felipe Pena	4cd32421fc	- More rules translated...	2010-07-09 00:43:34 +00:00
Felipe Pena	c97007e87e	- Added switch rule	2010-07-09 00:02:33 +00:00
Felipe Pena	4f55f8828a	- Added try_catch, isset_variables rule	2010-07-08 23:22:41 +00:00
Felipe Pena	195d5b7b23	- Update tokenizer	2010-07-08 22:46:56 +00:00
Felipe Pena	2de963ed2c	- Added foreach rules	2010-07-08 20:04:47 +00:00
Felipe Pena	45c6c3a75f	- Update token list	2010-07-08 19:25:20 +00:00
Felipe Pena	e81ad07c9e	- More rules translated	2010-07-08 19:20:23 +00:00
Felipe Pena	2ec11dcc7c	- Fixed array_pair_list and added T_EQUAL	2010-07-08 18:14:11 +00:00
Felipe Pena	8ba373ee6b	- More rules translated	2010-07-08 18:06:51 +00:00
Felipe Pena	86771c29c8	- More rules translated!	2010-07-08 16:28:38 +00:00
Felipe Pena	143f44aa68	- More rules translated	2010-07-08 14:25:38 +00:00
Felipe Pena	6fce15d068	- Accidental change	2010-07-08 12:36:33 +00:00
Felipe Pena	2bcffc3727	- Making it "buildable" for testing	2010-07-08 12:30:48 +00:00
Etienne Kneuss	0ce7b657b0	simplify tokens, specify some stuff	2010-07-08 09:43:21 +00:00
Etienne Kneuss	07d697d86e	move includes to the lemon definition file	2010-07-08 09:36:54 +00:00
Etienne Kneuss	5c8d488498	Initial stuff to start working on rules	2010-07-08 09:32:44 +00:00
Derick Rethans	69bb2dce74	- The Lemon branch.	2010-07-06 19:10:27 +00:00