]> granicus.if.org Git - php/log
php
8 years agofix uninitialized value
Anatol Belski [Tue, 15 Mar 2016 05:43:29 +0000 (06:43 +0100)]
fix uninitialized value

8 years agofix pointer truncation on 64 bit
Anatol Belski [Mon, 14 Mar 2016 15:44:27 +0000 (16:44 +0100)]
fix pointer truncation on 64 bit

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 14 Mar 2016 14:58:05 +0000 (15:58 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix test

8 years agofix test
Anatol Belski [Mon, 14 Mar 2016 14:53:02 +0000 (15:53 +0100)]
fix test

Many warnings won't appear with libxml2 >= 2.9.3 because in many
cases libxml2 2.9.3 will just abort processing.

8 years agoUpdate NEWS
Yasuo Ohgaki [Fri, 11 Mar 2016 23:52:16 +0000 (08:52 +0900)]
Update NEWS

    Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
    Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
    Fixed Bug #71599 trans sid handling rework broke interaction with cookies

    All of these bugs are caused by git global change in PHP-7.0.

8 years agoFixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
Yasuo Ohgaki [Fri, 11 Mar 2016 23:39:51 +0000 (08:39 +0900)]
Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Fixed Bug #71599 trans sid handling rework broke interaction with cookies

All of these bug is caused by git global change in PHP-7.0.

8 years agoFixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Yasuo Ohgaki [Fri, 11 Mar 2016 23:15:47 +0000 (08:15 +0900)]
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket

8 years agoFixed bug #71806
Nikita Popov [Fri, 11 Mar 2016 21:45:38 +0000 (22:45 +0100)]
Fixed bug #71806

8 years agoFix bug #71767
Grigorii Sokolik [Fri, 11 Mar 2016 16:28:45 +0000 (19:28 +0300)]
Fix bug #71767

8 years agoupdate NEWS
Anatol Belski [Fri, 11 Mar 2016 13:23:34 +0000 (14:23 +0100)]
update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 11 Mar 2016 13:23:07 +0000 (14:23 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Fri, 11 Mar 2016 13:22:11 +0000 (14:22 +0100)]
update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 11 Mar 2016 13:12:54 +0000 (14:12 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix DatePeriod::getEndDate() segfault

8 years agoFix DatePeriod::getEndDate() segfault
Thomas Punt [Mon, 7 Mar 2016 09:40:22 +0000 (09:40 +0000)]
Fix DatePeriod::getEndDate() segfault

8 years agofix build with clang on Winodws
Anatol Belski [Thu, 10 Mar 2016 14:30:20 +0000 (15:30 +0100)]
fix build with clang on Winodws

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 10 Mar 2016 10:39:16 +0000 (11:39 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix error condition, part of bug #71753

8 years agofix error condition, part of bug #71753
Anatol Belski [Thu, 10 Mar 2016 10:35:50 +0000 (11:35 +0100)]
fix error condition, part of bug #71753

8 years agoMerge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Dmitry Stogov [Thu, 10 Mar 2016 10:34:41 +0000 (13:34 +0300)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:php-src:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

8 years agoMore effecient fix for bug #71756
Dmitry Stogov [Thu, 10 Mar 2016 10:33:36 +0000 (13:33 +0300)]
More effecient fix for bug #71756

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 10 Mar 2016 08:35:55 +0000 (09:35 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

8 years agotsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Xinchen Hui [Thu, 10 Mar 2016 06:24:13 +0000 (14:24 +0800)]
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

cherry-picked from 7d5f71b0b125c89211e5a2a6d925deba938abd41

8 years agofix invalid pointer on 64-bit
Anatol Belski [Thu, 10 Mar 2016 07:24:33 +0000 (08:24 +0100)]
fix invalid pointer on 64-bit

8 years agoUseless check (part of #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:43:22 +0000 (15:43 +0800)]
Useless check (part of #71753)

8 years agoobject->ce should not be NULL
Xinchen Hui [Thu, 10 Mar 2016 07:26:15 +0000 (15:26 +0800)]
object->ce should not be NULL

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Thu, 10 Mar 2016 07:23:40 +0000 (15:23 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed typo (partially fix for #71753)

Conflicts:
ext/standard/uuencode.c

8 years agoFixed typo (partially fix for #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:22:34 +0000 (15:22 +0800)]
Fixed typo (partially fix for #71753)

8 years agoemalloc never returns NULL (partially fix for #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:15:26 +0000 (15:15 +0800)]
emalloc never returns NULL (partially fix for #71753)

8 years agoImprove the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)
Xinchen Hui [Thu, 10 Mar 2016 07:09:51 +0000 (15:09 +0800)]
Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)

8 years agoFixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
Xinchen Hui [Thu, 10 Mar 2016 07:02:10 +0000 (15:02 +0800)]
Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)

8 years agoBug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
Xinchen Hui [Thu, 10 Mar 2016 06:58:10 +0000 (14:58 +0800)]
Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)

8 years agotsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Xinchen Hui [Thu, 10 Mar 2016 06:24:13 +0000 (14:24 +0800)]
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

8 years agoFix bug #71659
Nikita Popov [Wed, 9 Mar 2016 21:58:57 +0000 (22:58 +0100)]
Fix bug #71659

8 years agofix SKIPIF sections
Anatol Belski [Wed, 9 Mar 2016 13:28:38 +0000 (14:28 +0100)]
fix SKIPIF sections

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Wed, 9 Mar 2016 13:17:30 +0000 (14:17 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix directory separator

8 years agofix directory separator
Anatol Belski [Wed, 9 Mar 2016 13:16:29 +0000 (14:16 +0100)]
fix directory separator

8 years agoFixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)
Xinchen Hui [Wed, 9 Mar 2016 04:16:24 +0000 (12:16 +0800)]
Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 8 Mar 2016 12:16:08 +0000 (13:16 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix regression introduced in 5683b6fa39

8 years agofix regression introduced in 5683b6fa39
Anatol Belski [Tue, 8 Mar 2016 11:59:59 +0000 (12:59 +0100)]
fix regression introduced in 5683b6fa39

Test extended. Basically, both iterator type and next node have
to be checked.

8 years agofix incompatible pointers on 64-bit
Anatol Belski [Mon, 7 Mar 2016 21:01:44 +0000 (22:01 +0100)]
fix incompatible pointers on 64-bit

8 years agofix double free and move temps into local scope
Anatol Belski [Mon, 7 Mar 2016 15:38:47 +0000 (16:38 +0100)]
fix double free and move temps into local scope

8 years agoadd error check
Anatol Belski [Mon, 7 Mar 2016 15:26:01 +0000 (16:26 +0100)]
add error check

8 years agoFixed bug #71724
Nikita Popov [Sun, 6 Mar 2016 20:38:21 +0000 (21:38 +0100)]
Fixed bug #71724

8 years agofix ibase connection routine
Anatol Belski [Fri, 4 Mar 2016 11:26:25 +0000 (12:26 +0100)]
fix ibase connection routine

followup on a7028d96

8 years agoFix one zpp usage in interbase
Tjerk Meesters [Thu, 3 Mar 2016 22:48:45 +0000 (23:48 +0100)]
Fix one zpp usage in interbase

Also small tweak to zpp REAME

8 years agoEliminate usages of _PP macros
Nikita Popov [Thu, 3 Mar 2016 22:13:50 +0000 (23:13 +0100)]
Eliminate usages of _PP macros

These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).

One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.

There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Thu, 3 Mar 2016 18:26:22 +0000 (19:26 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFixed bug #69953
Christoph M. Becker [Tue, 14 Jul 2015 09:09:03 +0000 (11:09 +0200)]
Fixed bug #69953

Added support for MKCALENDAR request method in CLI web server.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Thu, 3 Mar 2016 16:29:58 +0000 (17:29 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoAdditional improvements to crypt() detection code
Anton Blanchard [Thu, 3 Mar 2016 16:28:34 +0000 (17:28 +0100)]
Additional improvements to crypt() detection code

Reformat to normalize tabs vs spaces, return 1 if crypt.h not
defined, fix C99 compliance.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Thu, 3 Mar 2016 16:14:18 +0000 (17:14 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoext/standard/config.m4: fix crypt() test segfaults in >=glibc-2.17.
Michael Orlitzky [Mon, 9 Nov 2015 15:49:10 +0000 (10:49 -0500)]
ext/standard/config.m4: fix crypt() test segfaults in >=glibc-2.17.

Starting with glibc-2.17, the crypt() function will report an EINVAL
and return NULL when the format of the "salt" parameter is
invalid. The current tests for crypt() pass its result to strcmp(),
causing segfaults when the value returned from crypt() is NULL.

This commit modifies the test programs to exit with failure when
crypt() returns NULL.

Reference: https://bugs.gentoo.org/show_bug.cgi?id=518964

8 years agoMove semicolon into TSRMLS_CACHE_EXTERN/DEFINE
Nikita Popov [Thu, 3 Mar 2016 15:46:04 +0000 (16:46 +0100)]
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE

Also re bug #71575.

8 years agoFix bug #71575 removing extra semicolons outside macros
James Titcumb [Tue, 16 Feb 2016 22:47:37 +0000 (22:47 +0000)]
Fix bug #71575 removing extra semicolons outside macros

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Thu, 3 Mar 2016 15:38:13 +0000 (16:38 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix intermixed SKIPIF and XFAIL sections in test
Nikita Popov [Tue, 1 Mar 2016 23:50:46 +0000 (00:50 +0100)]
Fix intermixed SKIPIF and XFAIL sections in test

8 years agoDisable upload_2G test on travis
Nikita Popov [Tue, 1 Mar 2016 23:29:01 +0000 (00:29 +0100)]
Disable upload_2G test on travis

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Wed, 2 Mar 2016 16:05:05 +0000 (17:05 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  show correct MINFO with libpq >= 9.5.x

8 years agoshow correct MINFO with libpq >= 9.5.x
Anatol Belski [Wed, 2 Mar 2016 16:03:20 +0000 (17:03 +0100)]
show correct MINFO with libpq >= 9.5.x

8 years agoPHP-7 zend_call_function() doesn't support symbol_table substitution
Dmitry Stogov [Wed, 2 Mar 2016 13:56:39 +0000 (16:56 +0300)]
PHP-7 zend_call_function() doesn't support symbol_table substitution

8 years agoBetter fix for IS_INDIRECT support in zend_hash_merge()
Dmitry Stogov [Wed, 2 Mar 2016 12:09:04 +0000 (15:09 +0300)]
Better fix for IS_INDIRECT support in zend_hash_merge()

8 years agoFixed test (sizeof(zend_string) is different on 32 and 64-bit systems)
Dmitry Stogov [Wed, 2 Mar 2016 10:01:42 +0000 (13:01 +0300)]
Fixed test (sizeof(zend_string) is different on 32 and 64-bit systems)

8 years agoIntroduce zend_symtable_exists_ind() for API consistency
Dmitry Stogov [Wed, 2 Mar 2016 08:53:47 +0000 (11:53 +0300)]
Introduce zend_symtable_exists_ind() for API consistency

8 years agofix wddx merge
Stanislav Malyshev [Wed, 2 Mar 2016 08:02:33 +0000 (00:02 -0800)]
fix wddx merge

8 years agoUpdate NEWS
Stanislav Malyshev [Wed, 2 Mar 2016 07:09:47 +0000 (23:09 -0800)]
Update NEWS

8 years agoMerge branch 'PHP-7.0.4' into PHP-7.0
Stanislav Malyshev [Wed, 2 Mar 2016 07:08:19 +0000 (23:08 -0800)]
Merge branch 'PHP-7.0.4' into PHP-7.0

* PHP-7.0.4: (21 commits)
  update NEWS
  fix test file
  Fix version
  update NEWS
  Update NEWS
  Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
  Fix bug #71637: Multiple Heap Overflow due to integer overflows
  extend check for add_flag
  Fixed another segfault with file_cache_only now
  set version
  fix nmake clean in phpize mode
  Fixed segfault with file_cache_only
  Fixed possible crash at PCRE on MSHUTDOWN
  Fixed more synchronisation issues during SHM reload
  Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string
  sync with improvements in NEWS
  Fixed process synchronisation problem, that may cause crashes after opcache restart
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  fix ts buld
  prep for 5.6.19RC1
  ...

Conflicts:
configure.in
main/php_version.h

8 years agoMerge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Stanislav Malyshev [Wed, 2 Mar 2016 07:07:49 +0000 (23:07 -0800)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:php-src:
  limit size of result set so unit test runs reliably

8 years agoupdate NEWS
Stanislav Malyshev [Wed, 2 Mar 2016 07:07:32 +0000 (23:07 -0800)]
update NEWS

8 years agoMerge branch 'PHP-5.6.19' into PHP-7.0.4
Stanislav Malyshev [Wed, 2 Mar 2016 07:01:48 +0000 (23:01 -0800)]
Merge branch 'PHP-5.6.19' into PHP-7.0.4

* PHP-5.6.19:
  fix test file
  Fix version
  update NEWS
  Update NEWS
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  fix ts buld
  prep for 5.6.19RC1
  5.6.20 is next
  Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize

Conflicts:
configure.in
ext/wddx/wddx.c
main/php_version.h

8 years agoMerge branch 'PHP-5.6.19' into PHP-5.6
Stanislav Malyshev [Wed, 2 Mar 2016 06:56:08 +0000 (22:56 -0800)]
Merge branch 'PHP-5.6.19' into PHP-5.6

* PHP-5.6.19:
  fix test file
  Fix version
  Update NEWS

8 years agoMerge branch 'PHP-5.5' into PHP-5.6.19
Stanislav Malyshev [Wed, 2 Mar 2016 06:55:49 +0000 (22:55 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6.19

* PHP-5.5:
  fix test file
  Fix version
  Update NEWS

8 years agofix test file
Stanislav Malyshev [Wed, 2 Mar 2016 06:55:02 +0000 (22:55 -0800)]
fix test file

8 years agoFix version
Stanislav Malyshev [Wed, 2 Mar 2016 06:47:27 +0000 (22:47 -0800)]
Fix version

8 years agoMerge branch 'PHP-5.6.19' into PHP-5.6
Stanislav Malyshev [Wed, 2 Mar 2016 06:41:29 +0000 (22:41 -0800)]
Merge branch 'PHP-5.6.19' into PHP-5.6

* PHP-5.6.19:
  update NEWS
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  fix ts buld
  prep for 5.6.19RC1
  Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize

8 years agoupdate NEWS
Stanislav Malyshev [Wed, 2 Mar 2016 06:41:10 +0000 (22:41 -0800)]
update NEWS

8 years agoMerge branch 'PHP-5.5.33' into PHP-5.6.19
Stanislav Malyshev [Wed, 2 Mar 2016 06:40:00 +0000 (22:40 -0800)]
Merge branch 'PHP-5.5.33' into PHP-5.6.19

* PHP-5.5.33:
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize

8 years agoUpdate NEWS
Stanislav Malyshev [Wed, 2 Mar 2016 06:37:23 +0000 (22:37 -0800)]
Update NEWS

8 years agoFix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
Stanislav Malyshev [Mon, 22 Feb 2016 07:45:57 +0000 (23:45 -0800)]
Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()

8 years agoFix bug #71637: Multiple Heap Overflow due to integer overflows
Stanislav Malyshev [Mon, 22 Feb 2016 07:14:29 +0000 (23:14 -0800)]
Fix bug #71637: Multiple Heap Overflow due to integer overflows

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Wed, 2 Mar 2016 06:27:09 +0000 (14:27 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  limit size of result set so unit test runs reliably

8 years agoMerge branch 'PHP-5.6-bug_69757' of https://github.com/wayfair/php-src into PHP-5.6
Xinchen Hui [Wed, 2 Mar 2016 06:26:34 +0000 (14:26 +0800)]
Merge branch 'PHP-5.6-bug_69757' of https://github.com/wayfair/php-src into PHP-5.6

* 'PHP-5.6-bug_69757' of https://github.com/wayfair/php-src:
  limit size of result set so unit test runs reliably

8 years agoMerge branch 'PHP-7.0.4' into PHP-7.0
Stanislav Malyshev [Wed, 2 Mar 2016 06:22:47 +0000 (22:22 -0800)]
Merge branch 'PHP-7.0.4' into PHP-7.0

* PHP-7.0.4:
  Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
  Fix bug #71637: Multiple Heap Overflow due to integer overflows
  set versions

Conflicts:
configure.in
main/php_version.h

8 years agoFixed test ext/readline/tests/readline_read_history_error_001.phpt
Xinchen Hui [Wed, 2 Mar 2016 04:29:15 +0000 (12:29 +0800)]
Fixed test ext/readline/tests/readline_read_history_error_001.phpt

This only pass with libedit

8 years agoUse hash_exists_ind in symbol table
Xinchen Hui [Wed, 2 Mar 2016 04:11:13 +0000 (12:11 +0800)]
Use hash_exists_ind in symbol table

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Tue, 1 Mar 2016 23:37:40 +0000 (00:37 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix intermittent failure of bug_68819_002.phpt
Nikita Popov [Tue, 1 Mar 2016 23:34:36 +0000 (00:34 +0100)]
Fix intermittent failure of bug_68819_002.phpt

The test used rand(32, 127) to select the character, however
chr(127) results in "data" instead of the expected result, so this
test would fail in something like 1% of the runs.

Replace rand() with fixed character "a".

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Tue, 1 Mar 2016 22:32:24 +0000 (23:32 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix bug #71694
mpyw [Tue, 1 Mar 2016 06:30:04 +0000 (15:30 +0900)]
Fix bug #71694

Exports contants CURLM_ADDED_ALREADY.

8 years agolimit size of result set so unit test runs reliably
Adam Baratz [Tue, 1 Mar 2016 22:15:07 +0000 (17:15 -0500)]
limit size of result set so unit test runs reliably

8 years agoMaybe we should introduce a symtable_exists_ind
Xinchen Hui [Tue, 1 Mar 2016 12:01:02 +0000 (20:01 +0800)]
Maybe we should introduce a symtable_exists_ind

8 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Tue, 1 Mar 2016 11:20:57 +0000 (19:20 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  remove unused vars
  fix possible pointer truncation on win64
  Updated NEWS
  extend check for add_flag
  LDAP - Added support to change the certificates verification

8 years agoFixed bug #71695 (Global variables are reserved before execution).
Xinchen Hui [Tue, 1 Mar 2016 11:19:07 +0000 (19:19 +0800)]
Fixed bug #71695 (Global variables are reserved before execution).

Instead of slow down hash_merge, we may also check the array(whether it
contains INDIRECT) outside of the loop, however, consisdering hash_merge
is not widly used, I prefer fix this in the current way to keep the
codes simple

8 years agoremove unused vars
Anatol Belski [Tue, 1 Mar 2016 09:52:49 +0000 (10:52 +0100)]
remove unused vars

8 years agofix possible pointer truncation on win64
Anatol Belski [Tue, 1 Mar 2016 09:51:55 +0000 (10:51 +0100)]
fix possible pointer truncation on win64

8 years agoUpdated NEWS
Côme Bernigaud [Tue, 1 Mar 2016 08:55:24 +0000 (09:55 +0100)]
Updated NEWS

8 years agoextend check for add_flag
Anatol Belski [Tue, 1 Mar 2016 08:35:00 +0000 (09:35 +0100)]
extend check for add_flag

8 years agoextend check for add_flag
Anatol Belski [Tue, 1 Mar 2016 08:35:00 +0000 (09:35 +0100)]
extend check for add_flag

8 years agoFixed another segfault with file_cache_only now
Xinchen Hui [Tue, 1 Mar 2016 02:50:56 +0000 (10:50 +0800)]
Fixed another segfault with file_cache_only now

8 years agoLDAP - Added support to change the certificates verification
Edwin Hoksberg [Tue, 16 Feb 2016 08:39:58 +0000 (09:39 +0100)]
LDAP - Added support to change the certificates verification

8 years agoFixed another segfault with file_cache_only now
Xinchen Hui [Tue, 1 Mar 2016 02:50:56 +0000 (10:50 +0800)]
Fixed another segfault with file_cache_only now

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Mon, 29 Feb 2016 21:44:06 +0000 (22:44 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/phar/tar.c