5.4.23

besides the two "if" checks, this fixes static analyze which is sometimes
broken because of this

.travis.yml

@@ -1,10 +1,9 @@
 language: php
 
-php:
-    # We only specify one version so we only get one worker
-    - 5.4
+branches:
+    except:
+        - /^PHP-5\.3.*/
+        - /^PHP-5\.4.*/
 
 notifications:
     email: false
-
-script: exit 0

CODING_STANDARDS

@@ -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 (CampelCaps starting with a capital letter).
+    without underscore delimiters (CamelCaps 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)::
 

Makefile.global

@@ -10,7 +10,7 @@ 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)
@@ -116,7 +116,7 @@ clean:
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+	rm -f Makefile 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 Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
 
 .PHONY: all clean install distclean test

README.EXTENSIONS

@@ -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
-    FOO_VERSION,          /* extension version number (string) */
+    PHP_FOO_VERSION,      /* extension version number (string) */
 #endif
     STANDARD_MODULE_PROPERTIES
 };

README.EXT_SKEL

@@ -31,6 +31,11 @@ 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

README.GIT-RULES

@@ -45,14 +45,17 @@ Currently we have the following branches in use::
 
   master    The active development branch. 
 
-  PHP-5.4   Is used to release the PHP 5.4.x series. It still allows for
-            larger enhancements.
-
-  PHP-5.3   Is used to release the PHP 5.3.x series. This is current 
+  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.2   Is used to release the PHP 5.2.x series. It is closed for 
-            changes now.
+  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.
 

README.PARAMETER_PARSING_API

@@ -32,7 +32,7 @@ resources cannot be auto-converted.
 Type specifiers
 ---------------
  The following list shows the type specifier, its meaning and the parameter 
- types that need to be passed by address. All passed paramaters are set
+ types that need to be passed by address. All passed parameters 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 

README.RELEASE_PROCESS

@@ -154,7 +154,15 @@ origin <branch>``".
 11. run: ``./makedist php 5.4.1``, this will export the tree, create configure
 and build two tarballs (one gz and one bz2).
 
-12. Commit those two tarballs to Git (php-distributions.git)
+12. Commit those two tarballs to web/php-distributions.git, then update the git
+    submodule reference in web/php.git: 
+    git submodule init;
+    git submodule update;
+    cd distributions;
+    git pull origin master;
+    cd ..;
+    git commit distributions;
+    git push;
 
 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

README.SELF-CONTAINED-EXTENSIONS

@@ -153,3 +153,18 @@ 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.
+

README.TESTING

@@ -1,6 +1,6 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usualy indicate a problem with your local system setup
+ Failed tests usually indicate a problem with your local system setup
 and not within PHP itself (at least for official PHP release versions).
 You may decide to automaticaly submit a test summary to our QA workflow
 at the end of a test run.

TSRM/tsrm_nw.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2013 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        |

TSRM/tsrm_nw.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2013 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        |

TSRM/tsrm_virtual_cwd.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2013 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,6 +40,10 @@
 #  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
@@ -945,6 +949,11 @@ 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;

TSRM/tsrm_virtual_cwd.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2013 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        |

TSRM/tsrm_win32.c

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2013 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        |
@@ -193,7 +193,7 @@ Finished:
 TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 {
 	time_t t;
-	HANDLE thread_token;
+	HANDLE thread_token = NULL;
 	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 };
@@ -363,6 +363,9 @@ Finished_Impersonate:
 		}
 
 Finished:
+		if(thread_token != NULL) {
+			CloseHandle(thread_token);
+		}
 		if(real_path != NULL) {
 			free(real_path);
 			real_path = NULL;
@@ -622,7 +625,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 (created) {
+	if (NULL != shm->descriptor && created) {
 		shm->descriptor->shm_perm.key	= key;
 		shm->descriptor->shm_segsz		= size;
 		shm->descriptor->shm_ctime		= time(NULL);
@@ -636,8 +639,10 @@ TSRM_API int shmget(int key, int size, int flags)
 		shm->descriptor->shm_perm.mode	= shm->descriptor->shm_perm.seq	= 0;
 	}
 
-	if (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz ) {
-		CloseHandle(shm->segment);
+	if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz)) {
+		if (NULL != shm->segment) {
+			CloseHandle(shm->segment);
+		}
 		UnmapViewOfFile(shm->descriptor);
 		CloseHandle(shm->info);
 		return -1;

TSRM/tsrm_win32.h

@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2013 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        |

UPGRADING

@@ -525,6 +525,8 @@ b. Extensions with changed behavior
   must be activated manually with the "extension = php_com_dotnet.dll" directive
   in php.ini.
 
+- Apache 2.4 handler is supported as of PHP 5.4.9
+
 ==================
 12. New in PHP 5.4
 ==================
@@ -638,6 +640,9 @@ c. New functions
   - SPL
     - class_uses()
 
+  - SplFixedArray
+    - SplFixedArray::__wakeup() (5.4.18)
+
 d. New global constants
 
   - CURLOPT_MAX_RECV_SPEED_LARGE

Zend/README.ZEND_VM

@@ -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 callls are, your mileage with this patch
+factor but system calls and database calls 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

Zend/ZEND_CHANGES

@@ -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
-      recieves no parameters, is called before the object is freed
+      receives 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% compatability with the engine of PHP
+  The Zend Engine claims 100% compatibility 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 incompatability is due to the full variable
+      "\{$somevar"; This incompatibility is due to the full variable
       reference within quoted strings feature added in the Zend
       Engine.

Zend/acinclude.m4

@@ -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="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4"
 
   # 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=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
+      bison_version_vars=`$YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /g' | tr -d a-z`
       php_cv_bison_version=invalid
       if test -n "$bison_version_vars"; then
         set $bison_version_vars

Zend/tests/019.phpt

@@ -357,7 +357,7 @@ var_dump($global_var);
 test_unset3();
 var_dump($global_var);
 
-//Note: No error conditions relating to passing arugments can be tested
+//Note: No error conditions relating to passing arguments can be tested
 // because these are not functions but statements, it will result in syntax error.
 ?>
 ===DONE===

Zend/tests/bug30998.phpt

@@ -15,7 +15,7 @@ $f = fopen("/tmp/blah", "r");
 ?>
 ===DONE===
 --EXPECTF--
-fopen(/tmp/blah): failed to open stream: No such file or directory (2) in %s:%d
+fopen(/tmp/blah): failed to open stream: %s (2) in %s:%d
 
-Warning: fopen(/tmp/blah): failed to open stream: No such file or directory in %s on line %d
+Warning: fopen(/tmp/blah): failed to open stream: %s in %s on line %d
 ===DONE===

Zend/tests/bug32428.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #32428 (The @ warning error supression operator is broken)
+Bug #32428 (The @ warning error suppression operator is broken)
 --FILE--
 <?php 
   $data = @$not_exists;