PHP 5.3.9 (re-tag after version no. fix)

PHP 5.3.9
2026-11-09 02:00:49 +00:00 · 2012-01-10 13:33:01 +00:00 · 2012-01-10 11:25:30 +00:00
5962 changed files with 277866 additions and 469017 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,32 +0,0 @@
-language: php
-
-php:
-    # We only specify one version so we only get one worker
-    - 5.4
-
-notifications:
-    email: false
-
-env:
-    global:
-      - MYSQL_TEST_HOST=127.0.0.1
-      - MYSQL_TEST_USER=travis
-      - PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
-      - PDO_MYSQL_TEST_USER=travis
-      - PDO_MYSQL_TEST_PASS=
-      - PDO_MYSQL_TEST_HOST=127.0.0.1
-    matrix:
-      - 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 --set-timeout 120
@@ -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
@@ -59,8 +59,8 @@ Exceptions:
    you're calling.

 7.  When commenting out code using a #if statement, do NOT use 0 only. Instead
-    use "<git username here>_0". For example, #if FOO_0, where FOO is your
-    git user foo.  This allows easier tracking of why code was commented out,
+    use "<svn username here>_0". For example, #if FOO_0, where FOO is your
+    svn user foo.  This allows easier tracking of why code was commented out,
    especially in bundled libraries.

 8.  Do not define functions that are not available.  For instance, if a
@@ -151,7 +151,7 @@ Naming Conventions

 7.  Classes should be given descriptive names. Avoid using abbreviations where
    possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters (CamelCaps starting with a capital letter).
+    without underscore delimiters (CampelCaps starting with a capital letter).
    The class name should be prefixed with the name of the 'parent set' (e.g.
    the name of the extension)::

@@ -147,7 +147,7 @@ STATUS:              Working
 COMMENT:             Tested on phpts and isapi versions
 -------------------------------------------------------------------------------
 EXTENSION:           mysql
-PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>,  Ulf Wendel <uw@php.net>
+PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>,  Johannes Schlüter <johannes@php.net>,  Ulf Wendel <uw@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -158,7 +158,7 @@ STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           mysqlnd
-PRIMARY MAINTAINER:  Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
+PRIMARY MAINTAINER:  Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>,  Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>      
 MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               5.3
@@ -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
@@ -24,7 +24,6 @@ Installing PHP
          + Installing a PHP extension on Windows
          + Compiling shared PECL extensions with the pecl command
          + Compiling shared PECL extensions with phpize
-          + php-config
          + Compiling PECL extensions statically into PHP
     * Problems?
          + Read the FAQ
@@ -84,7 +83,7 @@ General Installation Considerations
   With  PHP you can also write desktop GUI applications using the PHP-GTK
   extension.  This  is  a  completely different approach than writing web
   pages,  as  you  do not output any HTML, but manage windows and objects
-   within  them.  For  more  information about PHP-GTK, please » visit the
+   within  them.  For  more information about PHP-GTK, please » visit the
   site  dedicated  to  this  extension.  PHP-GTK  is  not included in the
   official PHP distribution.

@@ -93,9 +92,9 @@ General Installation Considerations
   will  also  find  information  on  the  command  line executable in the
   following sections.

-   PHP  source  code  and binary distributions for Windows can be found at
-   » http://www.php.net/downloads.php.   We  recommend  you  to  choose  a
-   » mirror nearest to you for downloading the distributions.
+   PHP source code and binary distributions for Windows can be found at »
+   http://www.php.net/downloads.php. We recommend you to choose a » mirror
+   nearest to you for downloading the distributions.
     __________________________________________________________________
     __________________________________________________________________

@@ -141,9 +140,9 @@ Table of Contents
     * A web server
     * Any module specific components (such as GD, PDF libs, etc.)

-   When  building  directly from Git sources or after custom modifications
+   When  building  directly from SVN sources or after custom modifications
   you might also need:
-     * autoconf: 2.13+ (for PHP < 5.4.0), 2.59+ (for PHP >= 5.4.0)
+     * autoconf: 2.13
     * automake: 1.4+
     * libtool: 1.4.x+ (except 1.4.2)
     * re2c: Version 0.13.4 or newer
@@ -376,12 +375,12 @@ Apache 2.x on Unix systems
   For  information  on  why,  read the related FAQ entry on using Apache2
   with a threaded MPM

-   The   » Apache  Documentation  is  the  most  authoritative  source  of
+   The  »  Apache  Documentation  is  the  most  authoritative  source of
   information   on   the   Apache  2.x  server.  More  information  about
   installation options for Apache may be found there.

-   The  most  recent  version  of  Apache HTTP Server may be obtained from
-   » Apache  download  site,  and  a  fitting  PHP  version from the above
+   The  most  recent version of Apache HTTP Server may be obtained from »
+   Apache  download  site,  and  a  fitting  PHP  version  from  the above
   mentioned  places.  This  quick  guide  covers  only  the basics to get
   started with Apache 2.x and PHP. For more information read the » Apache
   Documentation.  The  version  numbers have been omitted here, to ensure
@@ -499,7 +498,7 @@ service httpd restart

   This  should  not be undertaken without being aware of the consequences
   of  this  decision,  and  having  at  least a fair understanding of the
-   implications.   The   Apache   documentation   regarding  » MPM-Modules
+   implications.   The   Apache  documentation  regarding  »  MPM-Modules
   discusses MPMs in a great deal more detail.

     Note:
@@ -521,7 +520,7 @@ Lighttpd 1.4 on Unix systems
   This section contains notes and hints specific to Lighttpd 1.4 installs
   of PHP on Unix systems.

-   Please  use  the  » Lighttpd  trac  to  learn  how  to install Lighttpd
+   Please  use  the  »  Lighttpd  trac  to  learn how to install Lighttpd
   properly before continuing.

   Fastcgi  is  the preferred SAPI to connect PHP and Lighttpd. Fastcgi is
@@ -628,15 +627,15 @@ Sun, iPlanet and Netscape servers on Sun Solaris
   current web servers read the note about subrequests.

   You  can  find  more  information about setting up PHP for the Netscape
-   Enterprise Server (NES) here:
-   » http://benoit.noss.free.fr/php/install-php4.html
+   Enterprise Server (NES) here: »
+   http://benoit.noss.free.fr/php/install-php4.html

   To  build  PHP  with  Sun JSWS/Sun ONE WS/iPlanet/Netscape web servers,
   enter  the  proper install directory for the --with-nsapi=[DIR] option.
   The  default directory is usually /opt/netscape/suitespot/. Please also
   read /php-xxx-version/sapi/nsapi/nsapi-readme.txt.

-    1. Install  the following packages from »  http://www.sunfreeware.com/
+    1. Install  the following packages from » http://www.sunfreeware.com/
       or another download site:
          + autoconf-2.13
          + automake-1.4
@@ -838,7 +837,7 @@ Testing
 Using Variables

   Some  server  supplied  environment  variables  are  not defined in the
-   current  » CGI/1.1  specification.  Only  the  following  variables are
+   current  »  CGI/1.1  specification.  Only  the following variables are
   defined     there:     AUTH_TYPE,     CONTENT_LENGTH,     CONTENT_TYPE,
   GATEWAY_INTERFACE,     PATH_INFO,     PATH_TRANSLATED,    QUERY_STRING,
   REMOTE_ADDR,  REMOTE_HOST,  REMOTE_IDENT,  REMOTE_USER, REQUEST_METHOD,
@@ -856,20 +855,20 @@ HP-UX specific installation notes
   There  are two main options for installing PHP on HP-UX systems. Either
   compile it, or install a pre-compiled binary.

-   Official      pre-compiled      packages      are     located     here:
-   » http://software.hp.com/
+   Official     pre-compiled     packages    are    located    here:    »
+   http://software.hp.com/

   Until  this  manual  section  is  rewritten,  the  documentation  about
   compiling  PHP  (and  related  extensions)  on  HP-UX  systems has been
-   removed.  For  now,  consider  reading the following external resource:
-   » Building Apache and PHP on HP-UX 11.11
+   removed.  For now, consider reading the following external resource: »
+   Building Apache and PHP on HP-UX 11.11
     __________________________________________________________________
     __________________________________________________________________

 OpenBSD installation notes

-   This  section  contains  notes  and hints specific to installing PHP on
-   » OpenBSD 3.6.
+   This  section contains notes and hints specific to installing PHP on »
+   OpenBSD 3.6.

 Using Binary Packages

@@ -901,12 +900,12 @@ Using Binary Packages
  (install the PEAR libraries)
 # pkg_add php4-pear-4.3.8.tgz

-   Read  the  » packages(7)  manual page for more information about binary
+   Read  the  » packages(7) manual page for more information about binary
   packages on OpenBSD.

 Using Ports

-   You  can  also  compile  up  PHP  from  source  using the » ports tree.
+   You  can  also  compile  up  PHP  from  source using the » ports tree.
   However,  this is only recommended for users familiar with OpenBSD. The
   PHP  4 port is split into two sub-directories: core and extensions. The
   extensions  directory  generates  sub-packages for all of the supported
@@ -927,7 +926,7 @@ Common Problems
       automatically  installs  into the correct chroot directories, so no
       special  modification  is  needed  there.  More  information on the
       OpenBSD Apache is available in the » OpenBSD FAQ.
-     * The  OpenBSD 3.6 package for the » gd extension requires XFree86 to
+     * The OpenBSD 3.6 package for the » gd extension requires XFree86 to
       be  installed.  If you do not wish to use some of the font features
       that  require  X11,  install  the  php4-gd-4.3.8-no_x11.tgz package
       instead.
@@ -952,26 +951,18 @@ Required software

   Solaris  installs  often lack C compilers and their related tools. Read
   this  FAQ  for  information on why using GNU versions for some of these
-   tools is necessary.
-
-   For unpacking the PHP distribution you need
-     * tar
-     * gzip or
-     * bzip2
-
-   For compiling PHP you need
+   tools is necessary. The required software is as follows:
     * gcc (recommended, other C compilers may work)
     * make
-     * GNU sed
-
-   For building extra extensions or hacking the code of PHP you might also
-   need
-     * flex (up to PHP 5.2)
-     * re2c
+     * flex
     * bison
     * m4
     * autoconf
     * automake
+     * perl
+     * gzip
+     * tar
+     * GNU sed

   In  addition,  you  will  need  to  install  (and possibly compile) any
   additional  software  specific to your configuration, such as Oracle or
@@ -980,16 +971,14 @@ Required software
 Using Packages

   You can simplify the Solaris install process by using pkgadd to install
-   most  of  your  needed components. The Image Packaging System (IPS) for
-   Solaris  11  Express  also contains most of the required components for
-   installation using the pkg command.
+   most of your needed components.
     __________________________________________________________________
     __________________________________________________________________

 Debian GNU/Linux installation notes

-   This  section  contains  notes  and hints specific to installing PHP on
-   » Debian GNU/Linux.
+   This  section contains notes and hints specific to installing PHP on »
+   Debian GNU/Linux.
   Warning

   Unofficial  builds  from third-parties are not supported here. Any bugs
@@ -1216,7 +1205,6 @@ Table of Contents
     * Installing a PHP extension on Windows
     * Compiling shared PECL extensions with the pecl command
     * Compiling shared PECL extensions with phpize
-     * php-config
     * Compiling PECL extensions statically into PHP
     __________________________________________________________________

@@ -1239,8 +1227,8 @@ Introduction to PECL Installations
   To this php.ini file, or through the use of the dl() function.

   When  building  PHP modules, it's important to have known-good versions
-   of  the  required  tools  (autoconf,  automake,  libtool, etc.) See the
-   » Anonymous  Git  Instructions  for  details on the required tools, and
+   of  the  required  tools (autoconf, automake, libtool, etc.) See the »
+   Anonymous  SVN  Instructions  for  details  on  the required tools, and
   required versions.
     __________________________________________________________________
     __________________________________________________________________
@@ -1259,7 +1247,7 @@ Downloading PECL extensions
       the PECL web site are available for download and installation using
       the » pecl command. Specific revisions may also be specified.
     * SVN  Most  PECL extensions also reside in SVN. A web-based view may
-       be  seen at » http://svn.php.net/viewvc/pecl/. To download straight
+       be seen at » http://svn.php.net/viewvc/pecl/. To download straight
       from SVN, the following sequence of commands may be used:
       $   svn  checkout  http://svn.php.net/repository/pecl/extname/trunk
       extname
@@ -1291,7 +1279,7 @@ Where to find an extension?

   PHP   extensions   are  usually  called  "php_*.dll"  (where  the  star
   represents  the  name  of the extension) and they are located under the
-   "PHP\ext" ("PHP\extensions" in PHP 4) folder.
+   "PHP\ext" ("PHP\extensions" in PHP4) folder.

   PHP   ships  with  the  extensions  most  useful  to  the  majority  of
   developers. They are called "core" extensions.
@@ -1377,7 +1365,7 @@ Resolving problems

 Compiling shared PECL extensions with the pecl command

-   PECL  makes  it  easy to create shared PHP extensions. Using the » pecl
+   PECL  makes  it easy to create shared PHP extensions. Using the » pecl
   command, do the following:

   $ pecl install extname
@@ -1436,51 +1424,6 @@ $ make
     __________________________________________________________________
     __________________________________________________________________

-php-config
-
-   php-config is a simple shell script for obtaining information about the
-   installed PHP configuration.
-
-   When compiling extensions, if you have multiple PHP versions installed,
-   you may specify for which installation you'd like to build by using the
-   --with-php-config  option  during configuration, specifying the path of
-   the respective php-config script.
-
-   The  list of command line options provided by the php-config script can
-   be queried anytime by running php-config with the -h switch:
-Usage: /usr/local/bin/php-config [OPTION]
-Options:
-  --prefix            [...]
-  --includes          [...]
-  --ldflags           [...]
-  --libs              [...]
-  --extension-dir     [...]
-  --include-dir       [...]
-  --php-binary        [...]
-  --php-sapis         [...]
-  --configure-options [...]
-  --version           [...]
-  --vernum            [...]
-
-   CAPTION: Command line options
-
-   Option Description
-   --prefix Directory prefix where PHP is installed, e.g. /usr/local
-   --includes List of -I options with all include files
-   --ldflags LD Flags which PHP was compiled with
-   --libs Extra libraries which PHP was compiled with
-   --extension-dir Directory where extensions are searched by default
-   --include-dir Directory prefix where header files are installed by
-   default
-   --php-binary Full path to php CLI or CGI binary
-   --php-sapis Show all SAPI modules available
-   --configure-options  Configure  options  to  recreate  configuration of
-   current PHP installation
-   --version PHP version
-   --vernum PHP version as integer
-     __________________________________________________________________
-     __________________________________________________________________
-
 Compiling PECL extensions statically into PHP

   You  might find that you need to build a PECL extension statically into
@@ -1542,11 +1485,11 @@ Other problems
   If  you  are  still stuck, someone on the PHP installation mailing list
   may  be  able  to  help you. You should check out the archive first, in
   case  someone already answered someone else who had the same problem as
-   you.   The   archives   are   available   from   the  support  page  on
-   » http://www.php.net/support.php.  To subscribe to the PHP installation
-   mailing list, send an empty mail to
-   » php-install-subscribe@lists.php.net.  The  mailing  list  address  is
-   » php-install@lists.php.net.
+   you.   The   archives  are  available  from  the  support  page  on  »
+   http://www.php.net/support.php.  To  subscribe  to the PHP installation
+   mailing list, send an empty mail to »
+   php-install-subscribe@lists.php.net.  The  mailing  list  address is »
+   php-install@lists.php.net.

   If  you  want to get help on the mailing list, please try to be precise
   and  give the necessary details about your environment (which operating
@@ -1561,11 +1504,11 @@ Bug reports
   If  you  think  you  have found a bug in PHP, please report it. The PHP
   developers  probably  don't  know  about  it, and unless you report it,
   chances  are  it  won't  be  fixed.  You  can  report  bugs  using  the
-   bug-tracking  system  at » http://bugs.php.net/. Please do not send bug
+   bug-tracking  system at » http://bugs.php.net/. Please do not send bug
   reports  in  mailing  list  or personal letters. The bug system is also
   suitable to submit feature requests.

-   Read  the  » How  to  report  a  bug document before submitting any bug
+   Read  the  »  How  to  report a bug document before submitting any bug
   reports!
     __________________________________________________________________
     __________________________________________________________________
@@ -1585,14 +1528,14 @@ The configuration file

   The  configuration  file  (php.ini) is read when PHP starts up. For the
   server  module  versions  of  PHP,  this happens only once when the web
-   server  is  started.  For the CGI and CLI versions, it happens on every
+   server  is  started.  For  the CGI and CLI version, it happens on every
   invocation.

-   php.ini is searched for in these locations (in order):
+   php.ini is searched in these locations (in order):
     * SAPI  module specific location (PHPIniDir directive in Apache 2, -c
       command  line  option  in  CGI and CLI, php_ini parameter in NSAPI,
       PHP_INI_PATH environment variable in THTTPD)
-     * The  PHPRC environment variable. Before PHP 5.2.0, this was checked
+     * The  PHPRC  environment variable. Before PHP 5.2.0 this was checked
       after the registry key mentioned below.
     * As  of  PHP  5.2.0, the location of the php.ini file can be set for
       different versions of PHP. The following registry keys are examined
@@ -1600,33 +1543,33 @@ The configuration file
       [HKEY_LOCAL_MACHINE\SOFTWARE\PHP\x.y] and
       [HKEY_LOCAL_MACHINE\SOFTWARE\PHP\x],  where x, y and z mean the PHP
       major,  minor  and  release  versions.  If  there  is  a  value for
-       IniFilePath  in any of these keys, the first one found will be used
-       as the location of the php.ini (Windows only).
+       IniFilePath in these keys, then the first one found will be used as
+       the location of the php.ini (Windows only).
     * [HKEY_LOCAL_MACHINE\SOFTWARE\PHP],  value  of  IniFilePath (Windows
       only).
-     * Current working directory (except CLI).
+     * Current working directory (except CLI)
     * The  web server's directory (for SAPI modules), or directory of PHP
-       (otherwise in Windows).
+       (otherwise in Windows)
     * Windows  directory  (C:\windows  or  C:\winnt)  (for  Windows),  or
-       --with-config-file-path compile time option.
+       --with-config-file-path compile time option

-   If php-SAPI.ini exists (where SAPI is the SAPI in use, so, for example,
-   php-cli.ini or php-apache.ini), it is used instead of php.ini. The SAPI
-   name can be determined with php_sapi_name().
+   If  php-SAPI.ini  exists  (where  SAPI is used SAPI, so the filename is
+   e.g. php-cli.ini or php-apache.ini), it's used instead of php.ini. SAPI
+   name can be determined by php_sapi_name().

     Note:

-     The  Apache  web  server  changes  the directory to root at startup,
+     The  Apache  web  server  changes  the  directory to root at startup
     causing  PHP  to attempt to read php.ini from the root filesystem if
     it exists.

-   The  php.ini  directives  handled  by  extensions are documented on the
-   respective  pages  of  the  extensions  themselves.  A list of the core
-   directives  is  available  in  the appendix. Not all PHP directives are
-   necessarily   documented  in  this  manual:  for  a  complete  list  of
+   The   php.ini   directives   handled   by   extensions  are  documented
+   respectively on the pages of the extensions themselves. The list of the
+   core  directives  is  available  in  the appendix. Probably not all PHP
+   directives  are documented in the manual though. For a complete list of
   directives  available  in  your  PHP  version,  please  read  your well
-   commented  php.ini  file.  Alternatively,  you  may  find  » the latest
-   php.ini from Git helpful too.
+   commented  php.ini  file. Alternatively, you may find the » the latest
+   php.ini from SVN helpful too.

   Example #1 php.ini example
 ; any text on a line after an unquoted semicolon (;) is ignored
@@ -1692,13 +1635,12 @@ Where a configuration setting may be set

   CAPTION: Definition of PHP_INI_* modes

-   Mode Meaning
-   PHP_INI_USER Entry can be set in user scripts (like with ini_set()) or
-   in the Windows registry. Since PHP 5.3, entry can be set in .user.ini
-   PHP_INI_PERDIR  Entry  can  be set in php.ini, .htaccess, httpd.conf or
-   .user.ini (since PHP 5.3)
-   PHP_INI_SYSTEM Entry can be set in php.ini or httpd.conf
-   PHP_INI_ALL Entry can be set anywhere
+        Mode      Value                        Meaning
+   PHP_INI_USER   1     Entry can be set in user scripts (like with ini_set())
+                        or in the Windows registry
+   PHP_INI_PERDIR 6     Entry can be set in php.ini, .htaccess or httpd.conf
+   PHP_INI_SYSTEM 4     Entry can be set in php.ini or httpd.conf
+   PHP_INI_ALL    7     Entry can be set anywhere
     __________________________________________________________________
     __________________________________________________________________

@@ -1819,7 +1761,7 @@ Installation
       set of HTTP headers. The headers it did return are:
   10. Windows:  I've  followed  all the instructions, but still can't get
       PHP and IIS to work together!
-   11. When  running  PHP as CGI with IIS, OmniHTTPD or Xitami, I get
+   11. When  running  PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get
       the  following  error:  Security  Alert! PHP CGI cannot be accessed
       directly..
   12. How  do I know if my php.ini is being found and read? It seems like
@@ -1846,9 +1788,13 @@ Installation
          each  request to play in, further weaknesses are introduced into
          PHP's system.

-          If   you  want  to  use  a  threaded  MPM,  look  at  a  FastCGI
+          If  you  feel  you have to use a threaded MPM, look at a FastCGI
          configuration where PHP is running in its own memory space.

+          And finally, this warning against using a threaded MPM is not as
+          strong  for  Windows  systems  because  most  libraries  on that
+          platform tend to be threadsafe.
+
   Unix/Windows: Where should my php.ini file be located?
          By  default  on  Unix  it  should  be in /usr/local/lib which is
          <install-path>/lib.  Most  people  will  want  to change this at
@@ -2007,7 +1953,7 @@ cgi error:
          And  for  IIS4  you need to tell it that PHP is a script engine.
          Also, you will want to read this faq.

-   When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get the
+   When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get the
          following error: Security Alert! PHP CGI cannot be accessed
          directly..
          You  must set the cgi.force_redirect directive to 0. It defaults
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -7,7 +7,7 @@ $(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
 $(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h

 $(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)
+	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --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
@@ -18,6 +18,6 @@ $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 	@$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@

 $(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)
+	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)

 $(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
@@ -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 \*.c -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 $@"
@@ -10,11 +10,9 @@ all: $(all_targets)
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
 	@echo
-
+	
 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 +35,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)
@@ -83,10 +79,10 @@ PHP_TEST_SHARED_EXTENSIONS =  ` \
 			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
 		done; \
 	fi`
-PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
+PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|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 +98,7 @@ 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
@@ -115,19 +109,10 @@ clean:
 	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
-	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+	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 main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
-	rm -f php5.spec main/build-defs.h scripts/phpize
-	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/mysqlnd/php_mysqlnd_config.h
-	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
-	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
-	rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
-	rm -f ext/phar/phar.phar ext/phar/phar.php
-	if test "$(srcdir)" != "$(builddir)"; then \
-	  rm -f ext/phar/phar/phar.inc; \
-	fi
+	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
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f

 .PHONY: all clean install distclean test
@@ -30,7 +30,7 @@ zend_module_entry foo_module_entry = {
    PHP_RSHUTDOWN(foo),   /* per-request shutdown function */
    PHP_MINFO(foo),       /* information function */
 #if ZEND_MODULE_API_NO >= 20010901
-    PHP_FOO_VERSION,      /* extension version number (string) */
+    FOO_VERSION,          /* extension version number (string) */
 #endif
    STANDARD_MODULE_PROPERTIES
 };
@@ -31,11 +31,6 @@ HOW TO USE IT

    ./buildconf; ./configure --enable-module_name; make

-  The definition of PHP_MODULE_NAME_VERSION will be present in the
-  php_module_name.h and injected into the zend_module_entry definition. This
-  is required by the PECL website for the version string conformity checks
-  against package.xml
-
  But if you already have planned the overall scheme of your module, what
  functions it will contain, their return types and the arguments they take
  (a very good idea) and don't want to bother yourself with creating function
@@ -1,129 +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. This is a current
-            stable version and is open for bugfixes only.
-
-  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
-            stable version and is open for bugfixes only.
-
-  PHP-5.3   Is used to release the PHP 5.3.x series. This is currently 
-            in extended support and open forsecurity fixes only. Triaged
-            via security@php.net
-
-  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 *any
-      stable release* version with the given change. In other words,
-      news about a bug fix which went into PHP-5.4, PHP-5.5 and master
-      should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
-      not master, which is not a public released version yet.
-
-   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
@@ -1,142 +0,0 @@
-$Id: README.NEW-OUTPUT-API 219039 2006-08-30 07:39:09Z mike $
-
-
-API adjustment to the old output control code:
-
-	Everything now resides beneath the php_output namespace, 
-	and there's an API call for every output handler op.
-
-	Checking output control layers status:
-		// Using OG()
-		php_output_get_status(TSRMLS_C);
-
-	Starting the default output handler:
-		// php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
-		php_output_start_default(TSRMLS_C);
-
-	Starting an user handler by zval:
-		// php_start_ob_buffer(zhandler, chunk_size, erase TSRMLS_CC);
-		php_output_start_user(zhandler, chunk_size, flags TSRMLS_CC);
-
-	Starting an internal handler whithout context:
-		// php_ob_set_internal_handler(my_php_output_handler_func_t, buffer_size, "output handler name", erase TSRMLS_CC);
-		php_output_start_internal(handler_name, handler_name_len, my_php_output_handler_func_t, chunk_size, flags TSRMLS_CC);
-
-	Starting an internal handler with context:
-		// not possible with old API
-		php_output_handler *h;
-		h = php_output_handler_create_internal(handler_name, handler_name_len, my_php_output_handler_context_func_t, chunk_size, flags TSRMLS_CC);
-		php_output_handler_set_context(h, my_context, my_context_dtor);
-		php_output_handler_start(h TSRMLS_CC);
-
-	Testing whether a certain output handler has already been started:
-		// php_ob_handler_used("output handler name" TSRMLS_CC);
-		php_output_handler_started(handler_name, handler_name_len TSRMLS_CC);
-
-	Flushing one output buffer:
-		// php_ob_end_buffer(1, 1 TSRMLS_CC);
-		php_output_flush(TSRMLS_C);
-
-	Flushing all output buffers:
-		// not possible with old API
-		php_output_flush_all(TSRMLS_C);
-
-	Cleaning one output buffer:
-		// php_ob_end_buffer(0, 1 TSRMLS_CC);
-		php_output_clean(TSRMLS_C);
-
-	Cleaning all output buffers:
-		// not possible with old API
-		php_output_clean_all(TSRMLS_C);
-
-	Discarding one output buffer:
-		// php_ob_end_buffer(0, 0 TSRMLS_CC);
-		php_output_discard(TSRMLS_C);
-
-	Discarding all output buffers:
-		// php_ob_end_buffers(0 TSRMLS_CC);
-		php_output_discard_all(TSRMLS_C);
-
-	Stopping (and dropping) one output buffer:
-		// php_ob_end_buffer(1, 0 TSRMLS_CC)
-		php_output_end(TSRMLS_C);
-
-	Stopping (and dropping) all output buffers:
-		// php_ob_end_buffers(1, 0 TSRMLS_CC);
-		php_output_end_all(TSRMLS_C);
-
-	Retrieving output buffers contents:
-		// php_ob_get_buffer(zstring TSRMLS_CC);
-		php_output_get_contents(zstring TSRMLS_CC);
-
-	Retrieving output buffers length:
-		// php_ob_get_length(zlength TSRMLS_CC);
-		php_output_get_length(zlength TSRMLS_CC);
-
-	Retrieving output buffering level:
-		// OG(nesting_level);
-		php_output_get_level(TSRMLS_C);
-
-	Issue a warning because of an output handler conflict:
-		// php_ob_init_conflict("to be started handler name", "to be tested if already started handler name" TSRMLS_CC);
-		php_output_handler_conflict(new_handler_name, new_handler_name_len, set_handler_name, set_handler_name_len TSRMLS_CC);
-
-	Registering a conflict checking function, which will be checked prior starting the handler:
-		// not possible with old API, unless hardcoding into output.c
-		php_output_handler_conflict_register(handler_name, handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);
-
-	Registering a reverse conflict checking function, which will be checked prior starting the specified foreign handler:
-		// not possible with old API
-		php_output_handler_reverse_conflict_register(foreign_handler_name, foreign_handler_name_len, my_php_output_handler_conflict_check_t TSRMLS_CC);
-
-	Facilitating a context from within an output handler callable with ob_start():
-		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ, (void *) &custom_ctx_ptr_ptr TSRMLS_CC);
-
-	Disabling of the output handler by itself:
-		//not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_DISABLE, NULL TSRMLS_CC);
-
-	Marking an output handler immutable by itself because of irreversibility of its operation:
-		// not possible with old API
-		php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);
-
-	Restarting the output handler because of a CLEAN operation:
-		// not possible with old API
-		if (flags & PHP_OUTPUT_HANDLER_CLEAN) { ... }
-
-	Recognizing by the output handler itself if it gets discarded:
-		// not possible with old API
-		if ((flags & PHP_OUTPUT_HANDLER_CLEAN) && (flags & PHP_OUTPUT_HANDLER_FINAL)) { ... }
-
-
-Output handler hooks
-
-	The output handler can change its abilities at runtime. Eg. the gz handler can
-	remove the CLEANABLE and REMOVABLE bits when the first output has passed through it;
-	or handlers implemented in C to be used with ob_start() can contain a non-global
-	context:
-		PHP_OUTPUT_HANDLER_HOOK_GET_OPAQ
-			pass a void*** pointer as second arg to receive the address of a pointer
-			pointer to the opaque field of the output handler context
-		PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS
-			pass a int* pointer as second arg to receive the flags set for the output handler
-		PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL
-			pass a int* pointer as second arg to receive the level of this output handler
-			(starts with 0)
-		PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE
-			the second arg is ignored; marks the output handler to be neither cleanable
-			nor removable
-		PHP_OUTPUT_HANDLER_HOOK_DISABLE
-			the second arg is ignored; marks the output handler as disabled
-
-
-Open questions
-
-	Should the userland API be adjusted and unified?
-	
-	Many bits of the manual (and very first implementation) do not comply
-	with the behaviour of the current (to be obsoleted) code, thus should
-	the manual or the behaviour be adjusted?
-
-END
@@ -28,22 +28,11 @@ 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
 ---------------
 The following list shows the type specifier, its meaning and the parameter 
- types that need to be passed by address. All passed parameters are set
+ types that need to be passed by address. All passed paramaters are set
 if the PHP parameter is non optional and untouched if optional and the 
 parameter is not present. The only exception is O where the zend_class_entry*
 has to be provided on input and is used to verify the PHP parameter is an 
@@ -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
@@ -8,16 +8,15 @@ General notes and tips
 1. Do not release on Fridays, Saturdays or Sundays
 because the sysadmins can not upgrade stuff then.

-2. Package two days before a release. So if the release is to be on Thursday,
-package on Tuesday. Think about timezones as well.
+2. Package the day before a release. So if the release is to be on Thursday,
+package on Wednesday.

 3. Ensure that Windows builds will work before packaging

-4. Follow all steps to the letter. When unclear ask previous RM's (David/Julien/
-Johannes/Stas/Derick/Ilia) before proceeding. Ideally make sure that for the
-first releases one of the previous RM's is around to answer questions. For the
-steps related to the php/QA/bug websites try to have someone from the webmaster
-team (Bjori) on hand.
+4. Follow all steps to the letter. When unclear ask previous RM's (Derick/Ilia)
+before proceeding. Ideally make sure that for the first releases one of the
+previous RM's is around to answer questions. For the steps related to the
+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.

@@ -51,44 +50,38 @@ Rolling a non stable release (alpha/beta/RC)
 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) from the main branch.
+3. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+Do not use abbreviations for alpha and beta.

-4. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-Do not use abbreviations for alpha and beta. Do not use dashes, you should
-``#define PHP_VERSION "5.4.22RC1"`` and not ``#define PHP_VERSION "5.4.22-RC1"``
+4. Commit those changes and note the revision id.

-5. Compile and make test, with and without ZTS, using the right Bison version
-(for example, for 5.5, Bison 2.4.1 is used)
+5. tag the repository with the version. To do the tag in a fast way do a svn copy on the server using full URLs. You should use the revision id from the above commit to prevent mistakes in case there was a commit in between. f.e. "``svn cp https://svn.php.net/repository/php/php-src/branches/PHP_5_3@308399  https://svn.php.net/repository/php/php-src/tags/php_5_3_6RC1``"
+(of course, you need to change that to the version you're rolling an RC for). Mail php-internals to announce the tag so tests/validation/check can be done prior to package it. It is especially important for RCs.

-6. Check ./sapi/cli/php -v output for version matching.
+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.

-7. If all is right, commit the changes to the release branch with ``git commit -a``.
+7. Commit those changes

-8. Tag the repository release branch with the version, e.g.: 
-``git tag -u YOURKEYID php-5.4.2RC2``
+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. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and ``NEWS``
-in the *main* branch (PHP-5.4 for example) to prepare for the **next** version.
-F.e. if the RC is "5.4.1RC1" then the new one should be "5.4.2-dev" - regardless if we get
-a new RC or not. This is to make sure ``version_compare()`` can correctly work.
-Commit the changes to the main branch.
+9. You do not have to update the tree, but of course you can with "``svn up``".

-10. Push the changes to the main repo, the tag, the main branch and the release branch :
-``git push --tags origin HEAD``
-``git push origin {main branch}``
-``git push origin {release branch}``
+10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure
+and build two tarballs (one gz and one bz2).

-11. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
-and build three tarballs (gz, bz2 and xz).
-
-12. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
+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 or Dan.
+MD5 sums. If you do not have this directory, talk to Derick.

-13. 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/

-14. 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.

@@ -111,7 +104,7 @@ 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.
+3. Update ``web/qa/trunk/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.

@@ -120,77 +113,71 @@ Derick) run the following commands for you:

   Note: Remember to update the MD5 checksum information.

-4. Update ``web/php.git/include/version.inc`` (x=major version number)
+4. Update ``web/php/trunk/include/version.inc`` (x=major version number)

- a. ``$PHP_x_RC`` = "5.4.0RC1"  (should be set to "false" before)
+ a. ``$PHP_x_RC`` = "5.3.0RC1"

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

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

- a. ``git commit -a && git push origin master``
+ a. ``svn commit web/qa/trunk web/php-bugs/trunk web/php/trunk``

 6. 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
 ------------------------

-1. Checkout your release branch, you should have created when releasing previous RC
-and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)

-2. If a CVE commit needs to be merged to the release, then have it commited to
-the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3,
-merge to 5.4, 5.5 etc...). Then you can cherry-pick it in your release branch.
-Don't forget to update NEWS manually in an extra commit then.
+2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.

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

-4. run the "scripts/dev/credits" script in php-src and commit the changes in the
+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.

-5. Compile and make test, with and without ZTS, using the right Bison version
-(for example, for 5.5, Bison 2.4.1 is used)
+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!!

-6. Check ./sapi/cli/php -v output for version matching.
+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 "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.

-7. tag the repository with the version f.e. "``git tag -s php-5.4.1``"
+8. Commit those changes

-8. Push the tag f.e. "``git push origin php-5.4.1``"
+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).

-9. run: ``PHPROOT=. ./makedist php 5.4.1``, this will export the tag, create configure
-and build three tarballs (gz, bz2 and xz).
-Check if the pear files are updated (phar).
+10. You do not have to update the tree, but of course you can with "``cvs up -dP``".

-10. Generate the GPG signature files for the archives.
-  ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``
+11. run: ``./makedist php 4.4.1``, this will export the tree, create configure
+and build two tarballs (one gz and one bz2).

-11. Commit and push all the tarballs and signature files 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;``
-This is to fetch the last commit id from php-distributions.git and commit this
-last commit id to web/php.git, then, mirrors will now sync
+12. Commit those two tarballs to CVS (phpweb/distributions)

-12. Once the release has been tagged, contact the PHP Windows development team
-(internals-win@lists.php.net) so that Windows binaries can be created.
+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.
+
+14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4)
+
+15. When making a final release, also remind the PHP Windows development team
+(internals-win@lists.php.net) to prepare the installer packages for Win32.

 Getting the stable release announced
 ------------------------------------

 1. Run the bumpRelease script for phpweb on your local checkout

- a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
-    The release announcement file should list in detail security fixes and
-    changes in behavior (whether due to a bug fix or not).
-
- b. In case multiple PHP minor versions are in active development you have
-    to manually copy the old information to include/releases.inc
+ a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)

 2. Edit ``phpweb/include/version.inc`` and change (X=major release number):

@@ -207,14 +194,8 @@ Getting the stable release announced

 f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")

-3. Update phpweb/include/releases.php with the old release info
-  (updates the download archives)
-
-4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
-   (prepare for next RC)
-
-5. Update the ChangeLog file for the given major version
-f.e. ``ChangeLog-5.php`` from the NEWS file
+3. Update the ChangeLog file for the given major version
+f.e. ``ChangeLog-4.php`` from the NEWS file

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

@@ -233,10 +214,19 @@ f.e. ``ChangeLog-5.php`` from the NEWS file
  IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``

  V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
-  
-  e. You may want to try php-web/bin/news2html to automate this task

-6. Add a short notice to phpweb stating that there is a new release, and
+4. ``cp releases/4_4_0.php releases/4_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:
+
+ a. security fixes,
+
+ b. changes in behavior (whether due to a bug fix or not)
+
+7. Add a short notice to phpweb stating that there is a new release, and
 highlight the major important things (security fixes) and when it is important
 to upgrade.

@@ -244,16 +234,23 @@ to upgrade.

 b. Add the content for the news entry

-7. **Check mirrors have been synced before announcing or pushing news**
-  Try, f.e. http://www.php.net/get/php-5.5.1.tar.bz2/from/a/mirror
-  Try several mirrors, mirrors may update slowly (may take an hour)
-
-8. Commit all the changes to their respective git repos
+8. Commit all the changes.

 9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 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``
+
+ - Update $QA_RELEASES with the appropriate information, which means bumping
+   the version number to an upcoming version. 
+
+   Example: If PHP 5.3.7 is being released, then PHP 5.3.8 is the next QA version,
+   so replace 5.3.7 with 5.3.8 within $QA_RELEASES.
+
 Re-releasing the same version (or -pl)
 --------------------------------------

@@ -153,18 +153,3 @@ ADDING SHARED MODULE SUPPORT TO A MODULE
        #ifdef COMPILE_DL_FOO
        ZEND_GET_MODULE(foo)
        #endif
-
-PECL SITE CONFORMITY
-
-  If you plan to release an extension to the PECL website, there are several
-  points to be regarded.
-
- 1. Add LICENSE or COPYING to the package.xml
-
- 2. The following should be defined in one of the extension header files
-
-        #define PHP_FOO_VERSION "1.2.3"
-
-    This macros has to be used within your foo_module_entry to indicate the
-    extension version.
-
@@ -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 those 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
@@ -1,8 +1,8 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usually indicate a problem with your local system setup
+ Failed tests usualy indicate a problem with your local system setup
 and not within PHP itself (at least for official PHP release versions).
-You may decide to automatically submit a test summary to our QA workflow
+You may decide to automaticaly submit a test summary to our QA workflow
 at the end of a test run.
 Please do *not* submit a failed test as a bug or ask for help on why
 it failed on your system without providing substantial backup information
@@ -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'
@@ -19,7 +19,9 @@ A simple implementation might look like the following.  This stores the
 original raw user data and adds a my_get_raw() function while the normal
 $_POST, $_GET and $_COOKIE arrays are only populated with stripped
 data.  In this simple example all I am doing is calling strip_tags() on
-the data.
+the data.  If register_globals is turned on, the default globals that
+are created will be stripped ($foo) while a $RAW_foo is created with the
+original user input.

 ZEND_BEGIN_MODULE_GLOBALS(my_input_filter)
        zval *post_array;
@@ -86,7 +88,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();
 }

@@ -153,6 +155,8 @@ PHP_FUNCTION(my_get_raw)
    int var_len;
    zval **tmp;
    zval *array_ptr = NULL;
+    HashTable *hash_ptr;
+    char *raw_var;

    if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) {
        return;
@@ -170,15 +174,23 @@ PHP_FUNCTION(my_get_raw)
            break;
    }

-    if(!array_ptr) {
-        RETURN_FALSE;
-    }
+    if(!array_ptr) RETURN_FALSE;

-    if(zend_hash_find(HASH_OF(array_ptr), var, var_len+5, (void **)&tmp) == SUCCESS) {
+    /*
+     * I'm changing the variable name here because when running with register_globals on,
+     * the variable will end up in the global symbol table
+     */
+    raw_var = emalloc(var_len+5);  /* RAW_ and a \0 */
+    strcpy(raw_var, "RAW_");
+    strlcat(raw_var,var,var_len+5);
+    hash_ptr = HASH_OF(array_ptr);
+
+    if(zend_hash_find(hash_ptr, raw_var, var_len+5, (void **)&tmp) == SUCCESS) {
        *return_value = **tmp;
        zval_copy_ctor(return_value);
    } else {
        RETVAL_FALSE;
    }
+    efree(raw_var);
 }

@@ -1,39 +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 https://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.
-
-
-Guidelines for contributors
-===========================
- [CODING_STANDARDS](/CODING_STANDARDS)
- [README.GIT-RULES](/README.GIT-RULES)
- [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES)
- [README.RELEASE_PROCESS](/README.RELEASE_PROCESS)
-
@@ -0,0 +1,136 @@
+Things to do or at least think about doing in the future. Name in
+parenthesis means that person has taken on this project.
+
+Zend
+----
+    * Allow foreach ($array as $k => list($a, $b)) syntax for multi
+      dimensional arrays.
+    * Look at replacing c-lib call tolower().
+    * Make hash API functions work with HASH_OF() to save time.
+    * Native large number support (probably with GNU GMP)
+    * Const'ify APIs. Right now, many functions leave parameters untouched,
+      but don't declare those as const. This makes interaction with other
+      interfaces difficult which pass const parameters to us.
+
+
+global
+------
+    * Make sure that all ZTS globals get destructed. Most ts_allocate_id()
+      calls should have a dtor entry.
+    * on some platforms unimplemented function will just do nothing 
+      (e.g. symlink) they should print a warning or not even be defined!
+      (DONE ?)
+    * --enable-all in configure. (--enable-shared=max ...)
+    * make configure print out a summary when it's done (like XEmacs)
+    * replace standard functions which work on static data with 
+      reentrancy-safe functions (DONE?).
+    * make SAPI conform to CGI/1.1. Currently, all SAPI modules
+      define REMOTE_ADDR etc. themselves and reach only various level
+      of compliance.
+    * see what functions might need to be changed to use HashPosition, so
+      that the internal array pointer is not affected.
+    * Move most extensions and PEAR packages out of the PHP CVS tree,
+      include them again during release packaging.
+
+    Other
+    * use thread-safe resolver functions (either require BIND 8 or adns).
+    * implement javadoc based function docs template system.
+    * provide optional IPv6 support (seems to be done?).
+    * find a better way to implement script timeouts. SIGVTALRM is used
+      by some POSIX threads implementations (i.e. OpenBSD) and is not
+      available in ZTS mode.
+    * Implement flush feature suitable for nested output buffers.
+
+Streams
+-------
+    * Route filestat.c through the wrapper layer; isolate the statcache code
+      so that it is independent of php functions and can be applied to any
+      stream/path.
+    * Implement generalized connection pool for stated protocols such as
+      ftp and http/1.1 (using keep-alive) to avoid having to negotiate
+      new command/request stream for each subsequent call; Possibly store 
+      resources in contexts (creating a default context if necessary) to 
+      allow segmentation of connection pools.
+    * Add a method to take ownership of the memory buffer in memory streams so
+      that generating string values for zvals doesn't require an estrdup.
+    * bundle and use curl lib for fopen wrapper.
+
+documentation
+-------------
+    * Add remarks in the documentation which functions are not implemented 
+      on win32. 
+    * Add remarks in the documentation which functions are not binary-safe.
+    * Update curl documentation (DONE?)
+    * Add developer documentation.
+    * Add detailed documentation for Java extension.
+
+ext/curl
+--------
+    * Have a warning scheme for when people use unsupported features.
+
+ext/oci8
+--------
+    * All OCIFetch*() functions should return 0 for no more data and false on 
+      error.
+    * Have a flag that trims trailing spaces from CHAR fields on retrieval.
+    * Make allow_call_time_pass_reference=Off working.
+    * For additional todo information, see oci8.c, in ext/oci8
+
+ext/odbc
+--------
+    For PHP 4.3.0:
+    * update all php_error calls to php_error_docref where valid
+    * integrate EXPERIMENTAL ODBC update for use in PHP 5.0, use for
+      testing purposes only.
+
+    For PHP 5.0.0
+    * Activate EXPERIMENTAL ODBC codebase update
+
+ext/pcre
+--------
+    * Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time, maybe
+
+ext/pcntl
+---------
+    * Change internal callback handler to use TICKS
+    * Remove all zend_extension code
+    * Add object callback support to pcntl_signal()
+
+ext/session
+-----------
+    For PHP 4.3.0:
+    * session_abort() to abort session. ie: Do not save session data.
+    * Allow unset($_SESSION) or unset($HTTP_SESSION_VARS) to unset
+      session vars regardless of register_globals setting.
+
+    Other:
+    * Maybe implement finer-grained session variables that could be 
+      locked individually.
+    * Write a network-transparent storage back-end with fallover
+      facilities
+    * Provide a callback facility which is executed upon encountering
+      an unknown class name during deserialization
+
+ext/standard
+------------
+    * Add a version number to data serialized via serialize().
+    * Possibly modify parsing of GPC data to automatically create arrays if
+      variable name is seen more than once.
+    * Implement regex-cache for url-functions.
+    * Move socket related functions to fsock.c.
+
+ext/wddx
+--------
+    * See if we can support the remaining data types:
+        binary
+
+        http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm
+        (Andrei)
+
+    * implement wddx_packet_as_javascript(). (Andrei)
+
+other cool stuff
+----------------
+    * PVM extension
+
+vim:et:sw=4:ts=4
@@ -0,0 +1,4 @@
+Zend Engine
+-----------
+  - Look at making zend_constant value member be a zval* instead of zval. (Andi)
+  - Implement inheritance rules for type hints. (Marcus) 
@@ -0,0 +1,89 @@
+Component:      Zend Engine 2
+
+                Important stuff to finish: PPP members/PPP methods, 
+                support of overloaded extensions, possibly differentiate 
+                between class and namespace as discussed with Stig in 
+                Germany.
+Responsibility: Zeev, Andi, Stas
+Time frame:     Couple of months for first part and extensions will be
+                ongoing while PHP is being fixed.
+                Things to leave for later versions: Native aggregation
+                support, accessing static members via object and not class.
+
+
+Component:      Aggregation
+Responsibility: Andi, Stig?
+Time frame:     ?
+
+
+Component:      Redesign of API Versioning
+Responsibility: ?
+Time frame:     1 month
+
+
+Component:      Thread Safety
+                Identify the extensions that are not thread safe by design 
+                or due to dependant libraries and identify them as such. 
+                If possible try to resolve thread safety issue via code 
+                improvements (if php code or patches will be accepted by 
+                library maintainers).   For situations where thread safety 
+                cannot easily be acheived a flag in the extension API is 
+                set so PHP can identify non-thread safe extensions.  These 
+                extensions will not be loaded in a ZTS compiled binary 
+                (unless it is cli/cgi).
+
+Responsibility: ?
+Time frame:     ?
+
+
+Component:      SAPI
+                Environment variables defined in the CGI spec need to be 
+                verified in each SAPI module that they conform to the CGI 
+                spec correctly.  If they do not, the SAPI module needs to 
+                fix the variable prior to script execution.  Having this 
+                conformity will aid in having PHP scripts run correctly 
+                under different sapi modules.
+
+Responsibility: Shane Caraveo & each sapi module owner
+Timeframe:      ? (but shouldn't be much effort, most modules are probably ok)
+
+
+Component:      RPC Abstraction Layer
+                Porting java, com, dotnet, xmlrpc, corba, soap and python, srm
+                (are there more ?) to work with the new oo api and preferably
+                by using ext/rpc.
+Responsibility: Harald
+Time frame:     2 months (but i have to wait for a few engine features first)
+
+
+Component:      OO Extensions
+                Each OO extension has to be revised and rewritten to fit into
+                the new OO model. We should decide which extensions are a must
+                to have for the release and which can be ported by the maintainer
+                later as a separate pecl release.
+                A list of extensions to be extended that have to be investigated:
+                  * browscap
+                  * aggregate
+                  * all *sql extensions (*_fetch_object)
+                  * domxml (seems like christian is rewriting it anyways)
+                  * ming
+Responsibility: Harald (, extension maintainers)
+
+
+Component:      Abstract Data Types (ADT)
+Responsibility: Sterling, Harald
+Time frame:     ?
+
+
+Component:      Test Suite
+                Extending the test suite with atleast a test for every
+                function in an extension that doesn't require external
+                resources. Also developing an automated test thing which
+                cvs ups's, compiles and tests the build on a daily base on
+                as much platforms/extensions as possible.
+
+                The test suite will also be extended to support threaded
+                testing and testing for differing sapi modules (via http
+                calls or other methods).
+Reponsibility:  Derick (, extension maintainers)
+Time frame:     3 months
@@ -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)
 {
@@ -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,6 @@
 #define TSRM_CONFIG_W32_H

 #include <../main/config.w32.h>
-#include "Zend/zend_config.w32.h"

 #define HAVE_UTIME 1
 #define HAVE_ALLOCA 1
@@ -12,4 +11,12 @@
 #include <stdlib.h>
 #include <crtdbg.h>

+#undef inline
+#ifdef ZEND_WIN32_FORCE_INLINE
+# define inline __forceinline
+#else
+# define inline
+#endif
+
+
 #endif
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 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-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 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-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 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        |
@@ -40,10 +40,6 @@
 #  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
@@ -281,6 +277,18 @@ 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) /* {{{ */
+{
+	return php_sys_stat_ex(path, buf, 0);
+}
+/* }}} */
+
+CWD_API int php_sys_lstat(const char *path, struct stat *buf) /* {{{ */
+{
+	return php_sys_stat_ex(path, buf, 1);
+}
+/* }}} */
+
 CWD_API int php_sys_stat_ex(const char *path, struct stat *buf, int lstat) /* {{{ */
 {
 	WIN32_FILE_ATTRIBUTE_DATA data;
@@ -710,6 +718,7 @@ static inline realpath_cache_bucket* realpath_cache_find(const char *path, int p
 			} else {
 				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) {
@@ -764,9 +773,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 +789,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;
 			}
@@ -949,11 +951,6 @@ 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;
@@ -1148,7 +1145,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 +1155,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
@@ -1216,14 +1214,9 @@ 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 {
 #ifdef TSRM_WIN32
@@ -1358,7 +1351,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;
 }
 /* }}} */

@@ -1426,7 +1419,7 @@ CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC) /* {
 		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);
@@ -1448,7 +1441,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 +1466,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;
 	}
@@ -1491,13 +1484,13 @@ CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC) /* {{{ */
 	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
@@ -1564,7 +1557,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 +1580,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 +1599,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 +1626,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;
 	}
@@ -1661,7 +1654,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 +1673,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 +1709,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;
 	}
@@ -1734,7 +1727,7 @@ CWD_API int virtual_lstat(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_EXPAND TSRMLS_CC)) {
+	if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND)) {
 		CWD_STATE_FREE(&new_state);
 		return -1;
 	}
@@ -1752,7 +1745,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 +1763,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 +1784,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 +1806,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 +1821,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)
@@ -1951,7 +1944,7 @@ CWD_API char *tsrm_realpath(const char *path, char *real_path TSRMLS_DC) /* {{{
 		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-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 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        |
@@ -131,8 +131,8 @@ typedef unsigned short mode_t;

 #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_stat(const char *path, struct stat *buf);
+CWD_API int php_sys_lstat(const char *path, struct stat *buf);
 CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len);
 #else
 # define php_sys_stat stat
@@ -201,7 +201,7 @@ CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int li
 #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);

@@ -267,7 +267,7 @@ 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)
-# define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
+#define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
 #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 +310,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-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 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;
 	}
@@ -625,7 +624,7 @@ TSRM_API int shmget(int key, int size, int flags)
 	shm->info	 = info_handle;
 	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);

-	if (NULL != shm->descriptor && created) {
+	if (created) {
 		shm->descriptor->shm_perm.key	= key;
 		shm->descriptor->shm_segsz		= size;
 		shm->descriptor->shm_ctime		= time(NULL);
@@ -639,10 +638,8 @@ TSRM_API int shmget(int key, int size, int flags)
 		shm->descriptor->shm_perm.mode	= shm->descriptor->shm_perm.seq	= 0;
 	}

-	if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz)) {
-		if (NULL != shm->segment) {
-			CloseHandle(shm->segment);
-		}
+	if (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz ) {
+		CloseHandle(shm->segment);
 		UnmapViewOfFile(shm->descriptor);
 		CloseHandle(shm->info);
 		return -1;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2012 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,120 +1,23 @@
 $Id$

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

 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
+	a. stat/lstat support

- * 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.
+lstat is now available on all platforms. On unix-like platform
+php_sys_lstat is an alias to lstat (when avaible). On Windows it is now 
+available using php_sys_lstat. php_sys_stat and php_sys_lstat usage is recommended 
+instead of calling lstat directly, to ensure portability.

-	b. Streams pooling API
+	b. readlink support

-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.
-  
+readlink is now available on all platforms. On unix-like platform
+php_sys_readlink is an alias to readlink (when avaible). On Windows it is now 
+available using php_sys_readlink. php_sys_readlink usage is recommended 
+instead of calling readlink directly, to ensure portability.
@@ -10,15 +10,14 @@ libZend_la_SOURCES=\
 	zend_ini_parser.y zend_ini_scanner.l \
 	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
 	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
-	zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
 	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
 	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
 	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
 	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

 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
@@ -32,7 +31,7 @@ zend_ini_scanner.lo: zend_ini_parser.h
 # Language parser/scanner rules

 zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
+	$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l

 zend_language_parser.h: zend_language_parser.c
 zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -44,7 +43,7 @@ zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
 	$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c

 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
+	$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l

 zend_ini_parser.h: zend_ini_parser.c

@@ -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:
 ---------

@@ -6,7 +6,7 @@ fields and using different execution methods (call threading, switch threading
 and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
 code execution (with specialized executor and direct threading execution
 method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database calls are, your mileage with this patch
+factor but system calls and database callls are, your mileage with this patch
 will vary.

 Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
@@ -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
@@ -435,7 +435,7 @@ Changes in the Zend Engine 2.0
      that of other object-oriented languages, such as Java: When the
      last reference to an object is destroyed the object's
      destructor, which is a class method name __destruct() that
-      receives no parameters, is called before the object is freed
+      recieves no parameters, is called before the object is freed
      from memory.

      Example:
@@ -1136,7 +1136,7 @@ Changes in the Zend Engine 1.0
      (supports breakpoints, expression evaluation, step-in/over,
      function call backtrace, and more).

-  The Zend Engine claims 100% compatibility with the engine of PHP
+  The Zend Engine claims 100% compatability with the engine of PHP
  3.0, and is shamelessly lying about it. Here's why:

    * Static variable initializers only accept scalar values
@@ -1161,6 +1161,6 @@ Changes in the Zend Engine 1.0
      printed the letter { and the contents of the variable $somevar in
      PHP 3.0), it will result in a parse error with the Zend Engine.
      In this case, you would have to change the code to print
-      "\{$somevar"; This incompatibility is due to the full variable
+      "\{$somevar"; This incompatability is due to the full variable
      reference within quoted strings feature added in the Zend
      Engine.
@@ -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
@@ -247,10 +243,6 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_string.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.c
 # End Source File
 # Begin Source File
@@ -261,10 +253,6 @@ SOURCE=.\zend_ts_hash.c

 SOURCE=.\zend_variables.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\zend_vm_opcodes.c
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -327,6 +315,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
@@ -419,10 +411,6 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_string.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.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],[

@@ -425,11 +419,4 @@ if test -r "/dev/urandom" && test -c "/dev/urandom"; then
  AC_MSG_RESULT(yes) 
 else 
  AC_MSG_RESULT(no) 
-  AC_MSG_CHECKING(whether /dev/arandom exists) 
-  if test -r "/dev/arandom" && test -c "/dev/arandom"; then 
-    AC_DEFINE([HAVE_DEV_ARANDOM], 1, [Define if the target system has /dev/arandom device])
-    AC_MSG_RESULT(yes) 
-  else 
-    AC_MSG_RESULT(no) 
-  fi 
 fi 
@@ -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
@@ -277,10 +273,6 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File

-SOURCE=.\zend_string.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.c
 # End Source File
 # Begin Source File
@@ -291,10 +283,6 @@ SOURCE=.\zend_ts_hash.c

 SOURCE=.\zend_variables.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\zend_vm_opcodes.c
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -357,6 +345,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
@@ -453,10 +445,6 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File

-SOURCE=.\zend_string.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_strtod.h
 # End Source File
 # Begin Source File
@@ -0,0 +1,127 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2012 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:
+ */
@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.

 AC_DEFUN([LIBZEND_BISON_CHECK],[
  # we only support certain bison versions
-  bison_version_list="2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7"
+  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"

  # for standalone build of Zend Engine
  test -z "$SED" && SED=sed
@@ -12,7 +12,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
  bison_version=none
  if test "$YACC"; then
    AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-      bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /g' | tr -d a-z`
+      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
@@ -3,6 +3,7 @@ if (function_exists("date_default_timezone_set")) {
 	date_default_timezone_set("UTC");
 }

+date_default_timezone_set('UTC');
 function simple() {
  $a = 0;
  for ($i = 0; $i < 1000000; $i++) 
@@ -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

@@ -1,358 +0,0 @@
-<?php
-
-function hallo() {
-}
-
-function simpleucall($n) {
-  for ($i = 0; $i < $n; $i++) 
-    hallo();
-}
-
-function simpleudcall($n) {
-  for ($i = 0; $i < $n; $i++) 
-    hallo2();
-}
-
-function hallo2() {
-}
-
-function simpleicall($n) {
-  for ($i = 0; $i < $n; $i++) 
-    func_num_args();
-}
-
-class Foo {
-	static $a = 0;
-	public $b = 0;
-	const TEST = 0;
-
-	static function read_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = self::$a;
-		}
-	}
-
-	static function write_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			self::$a = 0;
-		}
-	}
-
-	static function isset_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = isset(self::$a);
-		}
-	}
-
-	static function empty_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = empty(self::$a);
-		}
-	}
-
-	static function f() {
-	}
-
-	static function call_static($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			self::f();
-		}
-	}
-
-	function read_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = $this->b;
-		}
-	}
-
-	function write_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b = 0;
-		}
-	}
-
-	function assign_add_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b += 2;
-		}
-	}
-
-	function pre_inc_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			++$this->b;
-		}
-	}
-
-	function pre_dec_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			--$this->b;
-		}
-	}
-
-	function post_inc_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b++;
-		}
-	}
-
-	function post_dec_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->b--;
-		}
-	}
-
-	function isset_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = isset($this->b);
-		}
-	}
-
-	function empty_prop($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = empty($this->b);
-		}
-	}
-
-	function g() {
-	}
-
-	function call($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$this->g();
-		}
-	}
-
-	function read_const($n) {
-		for ($i = 0; $i < $n; ++$i) {
-			$x = $this::TEST;
-		}
-	}
-
-}
-
-function read_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = Foo::$a;
-	}
-}
-
-function write_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		Foo::$a = 0;
-	}
-}
-
-function isset_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = isset(Foo::$a);
-	}
-}
-
-function empty_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = empty(Foo::$a);
-	}
-}
-
-function call_static($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		Foo::f();
-	}
-}
-
-function create_object($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = new Foo();
-	}
-}
-
-define('TEST', null);
-
-function read_const($n) {
-	for ($i = 0; $i < $n; ++$i) {
-		$x = TEST;
-	}
-}
-
-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) {
-	for ($i = 0; $i < $n; ++$i) {
-	}
-}
-
-function getmicrotime()
-{
-  $t = gettimeofday();
-  return ($t['sec'] + $t['usec'] / 1000000);
-}
-
-function start_test()
-{
-  ob_start();
-  return getmicrotime();
-}
-
-function end_test($start, $name, $overhead = null)
-{
-  global $total;
-  global $last_time;
-  $end = getmicrotime();
-  ob_end_clean();
-  $last_time = $end-$start;
-  $total += $last_time;
-  $num = number_format($last_time,3);
-  $pad = str_repeat(" ", 24-strlen($name)-strlen($num));
-  if (is_null($overhead)) {
-    echo $name.$pad.$num."\n";
-  } else {
-    $num2 = number_format($last_time - $overhead,3);
-    echo $name.$pad.$num."    ".$num2."\n";
-  }
-  ob_start();
-  return getmicrotime();
-}
-
-function total()
-{
-  global $total;
-  $pad = str_repeat("-", 24);
-  echo $pad."\n";
-  $num = number_format($total,3);
-  $pad = str_repeat(" ", 24-strlen("Total")-strlen($num));
-  echo "Total".$pad.$num."\n";
-}
-
-const N = 5000000;
-
-$t0 = $t = start_test();
-empty_loop(N);
-$t = end_test($t, 'empty_loop');
-$overhead = $last_time;
-simpleucall(N);
-$t = end_test($t, 'func()', $overhead);
-simpleudcall(N);
-$t = end_test($t, 'undef_func()', $overhead);
-simpleicall(N);
-$t = end_test($t, 'int_func()', $overhead);
-Foo::read_static(N);
-$t = end_test($t, '$x = self::$x', $overhead);
-Foo::write_static(N);
-$t = end_test($t, 'self::$x = 0', $overhead);
-Foo::isset_static(N);
-$t = end_test($t, 'isset(self::$x)', $overhead);
-Foo::empty_static(N);
-$t = end_test($t, 'empty(self::$x)', $overhead);
-read_static(N);
-$t = end_test($t, '$x = Foo::$x', $overhead);
-write_static(N);
-$t = end_test($t, 'Foo::$x = 0', $overhead);
-isset_static(N);
-$t = end_test($t, 'isset(Foo::$x)', $overhead);
-empty_static(N);
-$t = end_test($t, 'empty(Foo::$x)', $overhead);
-Foo::call_static(N);
-$t = end_test($t, 'self::f()', $overhead);
-call_static(N);
-$t = end_test($t, 'Foo::f()', $overhead);
-$x = new Foo();
-$x->read_prop(N);
-$t = end_test($t, '$x = $this->x', $overhead);
-$x->write_prop(N);
-$t = end_test($t, '$this->x = 0', $overhead);
-$x->assign_add_prop(N);
-$t = end_test($t, '$this->x += 2', $overhead);
-$x->pre_inc_prop(N);
-$t = end_test($t, '++$this->x', $overhead);
-$x->pre_dec_prop(N);
-$t = end_test($t, '--$this->x', $overhead);
-$x->post_inc_prop(N);
-$t = end_test($t, '$this->x++', $overhead);
-$x->post_dec_prop(N);
-$t = end_test($t, '$this->x--', $overhead);
-$x->isset_prop(N);
-$t = end_test($t, 'isset($this->x)', $overhead);
-$x->empty_prop(N);
-$t = end_test($t, 'empty($this->x)', $overhead);
-$x->call(N);
-$t = end_test($t, '$this->f()', $overhead);
-$x->read_const(N);
-$t = end_test($t, '$x = Foo::TEST', $overhead);
-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");
@@ -357,7 +357,7 @@ var_dump($global_var);
 test_unset3();
 var_dump($global_var);

-//Note: No error conditions relating to passing arguments can be tested
+//Note: No error conditions relating to passing arugments can be tested
 // because these are not functions but statements, it will result in syntax error.
 ?>
 ===DONE===
@@ -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
@@ -12,4 +12,4 @@ foo(123);
 --EXPECTF--
 3

-Catchable fatal error: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
+Catchable fatal error: Argument 1 passed to foo() must be an array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
@@ -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
Johannes Schlüter	be8864cc22	PHP 5.3.9 (re-tag after version no. fix)	2012-01-10 13:33:01 +00:00
Johannes Schlüter	d0cc4a1cfc	PHP 5.3.9	2012-01-10 11:25:30 +00:00