granicus.if.org Git

Putting whitespace back to the way it was.

Updating the `DateTime_verify` test to include the
new method in the reflected method list

Whoops! String length....

Adding a new test for the new method

Adding a new `createFromImmutable` method to the
`DateTime` class to mirror the current `DateTime::createFromMutable()`

Merge branch 'PHP-5.6'

* PHP-5.6:
hexadecimal is case*in*sensitive

Conflicts:
ext/openssl/xp_ssl.c

Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6

* 'PHP-5.6' of https://github.com/bjori/php-src:
hexadecimal is case*in*sensitive

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #68879 (IP Address fields in subjectAltNames not used)
Fix broken test

Conflicts:
ext/openssl/xp_ssl.c

Fixed bug #68879 (IP Address fields in subjectAltNames not used)

Fix broken test

Use strpprintf

Merge branch 'master' into HEAD

Use a deprecated function that still exists.

Remove unnecessary debug warning (that also broke tests).

Explicitly depend opcache on pcre.

Update UPGRADING.

Merge remote-tracking branch 'datibbaw/kill-ereg'

Conflicts:
ext/ereg/config.w32
ext/ereg/config0.m4
ext/ereg/ereg.c
ext/ereg/php_ereg.h
ext/ereg/php_regex.h
ext/ereg/regex/engine.c
ext/ereg/regex/main.c
ext/ereg/regex/regcomp.c
ext/ereg/regex/regerror.c
ext/ereg/tests/split_error_002.phpt
ext/ereg/tests/split_variation_003.phpt
ext/ereg/tests/spliti_error_002.phpt
ext/ereg/tests/spliti_variation_003.phpt
ext/pgsql/pgsql.c
sapi/apache/php_apache_http.h
sapi/apache_hooks/php_apache_http.h

Remove the deprecated MySQL extension.

Relevant RFC: https://wiki.php.net/rfc/remove_deprecated_functionality_in_php7

hexadecimal is case*in*sensitive

Improved method inhereitance code and cleanup

Merge branch 'tls-alpn'

* tls-alpn:
  Improve test to target specific issue
  Misc updates/cleanup
  Add TLS ALPN extension support in crypto client/server streams
  Add stream_socket_crypto_info() function
  Update for compatibility with newer openssl libs

Improved ineritance code

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #68920 (use strict peer_fingerprint input checks)

Conflicts:
ext/openssl/xp_ssl.c

Fixed bug #68920 (use strict peer_fingerprint input checks)

fix ini registry handling

Improve test to target specific issue

Merge commit 'refs/pull/1066/head' of git://github.com/php/php-src

* git://github.com/php/php-src:
  Add zend assert deleted by accident
  Let's keep it simple
  Improve internal function return types checking for parent

Merge commit 'refs/pull/1137/head' of git://github.com/php/php-src

* git://github.com/php/php-src:
Optimize class constant declare compilation

Merge branch 'pull-request/1128'

* pull-request/1128:
Fixed memleak in alloc_globals_ctor

Improved code for class property inheritance

Misc updates/cleanup

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

Add test for previously fixed segfault

ensure the mail() socket is not leaked after request

Fixed segfault

Merge branch 'PHP-5.6'

Fixed bug #69159 (Opcache causes problem when passing a variable variable to a function)

indent

Fixed memleak

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

Merge branch 'fix-compile-error' of https://github.com/zxcvdavid/php-src

Silence a empty while loop warning

Fixed wrong type used

Fixed build

Fix compile error

Remove the unused vars

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

fix thread safety for win32/sendmail

avoid this pointers play

use correct free api

Fixed bug #69154 Access violation in php7.dll!_emalloc

one more invalid free

ensure there is no connection

fix socket leaking and better connection err check

avoid skipif as this indeed should be tested

plus do expect regex .*

Merge branch 'PHP-5.6'

Merge branch 'PHP-5.5' into PHP-5.6

Make killing a locker an ERROR event

At least in apache, killing a locker with SIGKILL from inside opcache prevents
the child process from emitting a corresponding log event to the access or
error logs, therefore requests are termed with no record. This makes is
incredibly difficult to debug problems espically on systems with high counts
of cache restarts. Since INFO level is far too noisy for production use,
switch the killing to a higher level so we can see it easier.

Fix test

Microoptimization (avoid reloading from memory)

Removed deprecated paths. Changed "switch" into series of "if".

Optimize class constant declare compilation

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

* 'master' of git.php.net:php-src:
  Remove wrong commit committed by accident
  Fixed bug #69167 (call_user_func does not support references anymore)
  Fixed #69166 (Assigning array_values() to array does not reset key counter)

Add missing zend_parse_parameters_none() for flush()

Remove wrong commit committed by accident

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

Fixed bug #69167 (call_user_func does not support references anymore)

Fixed #69166 (Assigning array_values() to array does not reset key counter)

Merge branch 'PHP-5.6'

* PHP-5.6:
Improve fix for bug 67741

Conflicts:
main/main.c

Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:/php-src:

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Improve fix for bug 67741
  Added type checks
  Added type checks

Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:/php-src:
Added type checks
Added type checks

Improve fix for bug 67741

Thanks to laruence.

Merge branch 'PHP-5.6'

* PHP-5.6:
Added type checks
Update NEWS

Conflicts:
NEWS
ext/soap/php_encoding.c
ext/soap/soap.c

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Added type checks

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Added type checks

Added type checks

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
Update NEWS

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
Update NEWS

Merge branch 'PHP-5.6'

* PHP-5.6:
  Added type checks
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)
  Check variable type before its usage as IS_ARRAY.
  Fixed a bug that header value is not terminated by '\0' when accessed through getenv().

Conflicts:
ext/soap/php_encoding.c
ext/soap/php_http.c
ext/soap/soap.c

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Added type checks
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)
  Check variable type before its usage as IS_ARRAY.
  Fixed a bug that header value is not terminated by '\0' when accessed through getenv().

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Added type checks

Conflicts:
ext/soap/soap.c

Added type checks

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update NEWS
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)
  Check variable type before its usage as IS_ARRAY.
  Fixed a bug that header value is not terminated by '\0' when accessed through getenv().

Conflicts:
NEWS

Update NEWS

pefree() -> efree()

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #67741 (auto_prepend_file messes up __LINE__)

Conflicts:
main/main.c

Fixed bug #67741 (auto_prepend_file messes up __LINE__)

This also fixes bug #54081

Don't inline helpers for ArrayAccess objects

Strength reduction

Add a XFAIL test, which I'd like to think more about a better fix

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Check variable type before its usage as IS_ARRAY.
Fixed a bug that header value is not terminated by '\0' when accessed through getenv().

Check variable type before its usage as IS_ARRAY.

Improved assert() according to expectations RFC.

See https://wiki.php.net/rfc/expectations

Squashed commit of the following:

commit 3f3651a7870738e35ec541e53b53069152135b24
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Mar 2 11:56:33 2015 +0300

    opcode 137 is used for ZEND_OP_DATA and con't be reused for ZEND_ASSERT_CHECK

commit ca8ecabf2a5f97f9116839c33396c9a7037e4368
Merge: 24328ac 9dac923
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Mar 2 10:49:23 2015 +0300

    Merge branch 'master' into assert

    * master:
      Update NEWS
      Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize)
      windows only test
      Align entries format
      Align entries format for 5.6.7
      Align entries format for 5.5.23
      Bump header year
      Fixed bug #69144 (strtr not replacing with partly matching replace pairs)
      Fixed test?
      Revert mktime()/gmmktime()'s arginfo
      Update NEWS
      Fixed bug #69141 Missing arguments in reflection info for some builtin functions
      Add NEWS entry
      Remove useless date warning
      Fix ARG_INFO for levenshtein
      Fix ARG_INFO for levenshtein
      fix dir separator in tests
      Update NEWS
      Fixed bug #69085 (SoapClient's __call() type confusion through unserialize()).

commit 24328ac03f79a0f3b19be7411bf9e173f392abda
Merge: 021fd94 1cdee9a
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Feb 27 15:57:13 2015 +0300

    Merge branch 'master' into assert

    * master:
      Fixed C++ support
      Fixed bug #69115 crash in mail
      Reorder
      Update NEWs
      Fixed bug #69121 (Segfault in get_current_user when script owner is not in passwd with ZTS build)
      Update News
      Fixed bug #69125 (Array numeric string as key)
      fix bug#68942's patch
      Fixed ability to build unspecialized executor
      Fixed bug #69124 (method name could not be used when by ref)
      Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
      Fixed a bug that header value is not terminated by '\0' when accessed through getenv().

commit 021fd94ed1d692d212e6e30c6c1a9767c3f16f7f
Merge: 49963eb ace1f82
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Feb 26 11:26:03 2015 +0300

    Merge branch 'master' into assert

    * master: (59 commits)
      Improved ASSIGN_DIM handler
      Don't inline slow path
      Revert a part committted by mistake
      Fixed compilation warnings
      Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
      better name
      Improve fix for #69038
      Update NEWs
      Fixed bug #69108 ("Segmentation fault" when (de)serializing SplObjectStorage)
      Added specialized versions of DO_FCALL handler:   DO_ICALL - for internal functions   DO_UCALL - for user functions   DO_FCALL_BY_NAME - plain, most probably user, funcstions (not methods)
      Use cache_slot offsets instead of indexes (simplify run-time instructions)
      Split INIT_FCALL_BY_NAME inti INIT_FCALL_BY_NAME(CONST+STRING) and INIT_DYNAMIC_CALL(CONST-STRING|TMPVAR|CV)
      Support list($a, $b) = $a
      Avoid unnecassary check
      Make zend_array_destroy() to free the corresponding zend_array
      Eliminate check on the fast path
      Make current() and key() receive argument by value.
      Use Firebird default home folder, replace Interbase with Firebird
      Updated NEWS
      updated NEWS
      ...

    Conflicts:
     Zend/zend_vm_execute.h
     Zend/zend_vm_opcodes.c
     Zend/zend_vm_opcodes.h

commit 49963ebf9d2bcd6d2670203dd72884f6ba6c8a4b
Merge: 07b1f92 6b77959
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Feb 19 11:13:08 2015 +0300

    Merge branch 'master' into assert

    * master:
      Implemented AST pretty-printer
      update NEWS to match the actual stuff in 5.6.6
      update NEWS to match the actual stuff in 5.5.22
      update NEWS(add missing entry for the enchant fix, and reorder the entries a bit)
      fix typo in bug#
      update NEWS
      fix email format
      update NEWS
      update 5.6.6 release date in NEWS
      Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
      BFN
      fix test
      fix test
      fix test
      Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
      Updated NEWS
      add CVE
      5.4.39 next
      Fix associativity to match Perl
      Blast off to space.

    Conflicts:
     Zend/zend_ast.c

commit 07b1f92ed662f6fa9309e679b83aff328362c98b
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Feb 18 23:06:32 2015 +0300

    fixed pretty-printer (support for "elseif")

commit 5a976c8d85078502b48379996ab066e57533a0c3
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Feb 18 19:50:08 2015 +0300

    Fixed vaeious ptetty-printer issues

commit 69491e8e8e692030b0585aab485146906c0fedaf
Merge: 8473157 3ddc246
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Feb 18 10:18:32 2015 +0300

    Merge branch 'master' into assert

    * master:
      Set PHP_JSON_VERSION to 1.4.0
      Remove unnecessary resource checks in openssl ext
      JSON is now maintained

commit 8473157fbb12d03fff8d5b602865a4b667522a4d
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Feb 18 10:17:26 2015 +0300

    Fixed typo and white spaces

commit 96de5ffc8d604df9797d0141ae5ad9c15e1d6c32
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Feb 18 00:28:39 2015 +0300

    Fixed assert() in namesapaces

commit 5eba069c28e7b6590618707e0b21cdb2dd62a192
Merge: 4a2d9c0 d428bf2
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Feb 17 22:45:55 2015 +0300

    Merge branch 'master' into assert

    * master: (25 commits)
      improve debugability in TS debug builds
      More UPGRADING, in particular on foreach
      Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) for master
      Replace var is introduced
      abstain from using xmlCleanupParser
      fix TS build
      Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
      update news
      Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
      Port for for bug #68552
      Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
      Update NEWS
      Fixed bug #69038 (switch(SOMECONSTANT) misbehaves)
      - BFN
      Don't read the local php.ini when Generating Phar When building phar shared, you can end up loading a previous phar.so that isn't compatible with the php cli being used to generate Phar here.
      - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
      Delete json outdated package.xml
      made ZEND_TSRMLS_CACHE_* macros look like function calls
      - Fix merge
      - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
      ...

commit 4a2d9c0953dccd9e78ebee9291e1213419eb9136
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Feb 17 22:45:10 2015 +0300

    Implemented AST pretty-printer to capture expression passed to assert()

commit 7a059b66d51a65159801bd826346721325b89fec
Merge: 9973df7 3892eba
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Feb 16 18:42:28 2015 +0300

    Merge branch 'expect' of github.com:krakjoe/php-src into assert

    * 'expect' of github.com:krakjoe/php-src:
      import expect

    Conflicts:
     Zend/zend_compile.c
     Zend/zend_execute_API.c
     Zend/zend_globals.h
     Zend/zend_vm_def.h
     Zend/zend_vm_execute.h
     Zend/zend_vm_opcodes.c
     Zend/zend_vm_opcodes.h
     ext/opcache/Optimizer/block_pass.c
     ext/opcache/Optimizer/pass1_5.c
     ext/standard/assert.c
     ext/standard/tests/assert/assert_error3.phpt

commit 3892eba2bf56a7699453855c995404106322718d
Author: krakjoe <joe.watkins@live.co.uk>
Date:   Sun Feb 2 12:49:35 2014 +0000

    import expect

Merge branch 'PHP-5.6'

Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re

Update NEWS

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
ext/standard/var_unserializer.c

Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize)

windows only test

Align entries format