Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (304 commits)
  OCI8 build change: Fix source variable definition for C89 compatibility
  bump version, empty NEWS, UPGRADING and UPGRADING.INTERNALS
  bump API versions
  configure output alignment
  Add a couple more test cases to parse_url() tests
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
  Cleanup temp test file
  Revert "Fixed issue #115 (path issue when using phar)."
  Update LiteSpeed SAPI code to V6.4
  Fixed typo in Makefile.frag
  updated NEWS
  Remove outdate codes, make it clearer, although just a bit..
  Update NEWS
  Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
  NEWS + UPGRADING
  Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
  Fixed coredump due to abnormal implemention of phar
  Fix English here
  limit virtual_cwd_activate() duplicated call to ZTS only
  ...

Author: rlerdorf

.travis.yml

@@ -29,4 +29,4 @@ before_script:
     - . ./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
+script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120

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

NEWS

@@ -1,51 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 201?, PHP 5.6.0
-
-- Core:
-  . Improved IS_VAR operands fetching. (Laruence, Dmitry)
-  . Implemented internal operator overloading
-    (RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita)
-  . Made calls from incompatible context issue an E_DEPRECATED warning instead
-    of E_STRICT (phase 1 of RFC: https://wiki.php.net/rfc/incompat_ctx).
-	(Gustavo)
-
-- cURL:
-  . Implemented FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir
-    or safe_mode). (Adam)
-
-- GMP:
-  . Moved GMP to use object as the underlying structure and implemented various
-    improvements based on this.
-    (RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita)
-
-- mysqlnd:
-  . Disabled flag for SP OUT variables for 5.5+ servers as they are not natively
-    supported by the overlying APIs. (Andrey)
-
-- OPcache:
-  . Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
-    (Laruence, Dmitry)
-  . Added an optimization pass to merged identical constants (and related
-    cache_slots) in op_array->literals table. (Laruence, Dmitry)
-  . Added script level constant replacement optimization pass. (Dmitry)
-
-- PDO_pgsql:
-  . Fixed Bug #42614 (PDO_pgsql: add pg_get_notify support). (Matteo)
-  . Fixed Bug #63657 (pgsqlCopyFromFile, pgsqlCopyToArray use Postgres < 7.3
-    syntax). (Matteo)
-
-- Session:
-  . Fixed Bug #65315 (session.hash_function silently fallback to default md5)
-    (Yasuo)
-  . Implemented Request #54649 (Create session_serializer_name()). (Yasuo)
-  . Implemented Request #17860 (Session write short circuit). (Yasuo)
-  . Implemented Request #20421 (session_abort() and session_reset() function).
-    (Yasuo)
-  . Implemented Request #11100 (session_gc() function). (Yasuo)
-
-- Standard:
-  . Implemented FR #65634 (HTTP wrapper is very slow with protocol_version
-    1.1). (Adam)
+?? ??? 20??, PHP 5.7.0 
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

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

@@ -17,7 +17,7 @@ See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more
 information on the process.
 
 Bug fixes **do not** require an RFC, but require a bugtracker ticket. Always
-open a ticket at http://bugs.php.net and reference the bug id using #NNNNNN.
+open a ticket at https://bugs.php.net and reference the bug id using #NNNNNN.
 
     Fix #55371: get_magic_quotes_gpc() throws deprecation warning
 
@@ -28,3 +28,12 @@ open a ticket at http://bugs.php.net and reference the bug id using #NNNNNN.
 
 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)
+

TSRM/Makefile.am

@@ -1,6 +1,6 @@
 ## process this file with automake to produce Makefile.am
 AUTOMAKE_OPTIONS=foreign
 noinst_LTLIBRARIES=libtsrm.la
-libtsrm_la_SOURCES = TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c
+libtsrm_la_SOURCES = TSRM.c tsrm_strtok_r.c
 
 depend:

TSRM/TSRM.dsp

@@ -1,5 +1,5 @@
 // vim:ft=javascript
 // $Id$
 
-ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c");
+ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_win32.c");
 

TSRM/config.w32

@@ -32,7 +32,7 @@
 #ifdef TSRM_WIN32
 #include <Sddl.h>
 #include "tsrm_win32.h"
-#include "tsrm_virtual_cwd.h"
+#include "zend_virtual_cwd.h"
 
 #ifdef ZTS
 static ts_rsrc_id win32_globals_id;