]>
granicus.if.org Git - php/log
Côme Bernigaud [Tue, 1 Mar 2016 04:00:16 +0000 (05:00 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
LDAP - 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
Xinchen Hui [Tue, 1 Mar 2016 02:51:52 +0000 (10:51 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Xinchen Hui [Tue, 1 Mar 2016 02:51:36 +0000 (10:51 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed another segfault with file_cache_only now
Fixed bugs #71317 and #71504
add test for bug #68957
update NEWS
update NEWS
Fixed #54648 PDO::MSSQL forces format of datetime fields
remove unneeded free parts
fix leaks and add one more NULL check
add NULL check
fix C89 compat
fix arg type
fix nmake clean in phpize mode
Xinchen Hui [Tue, 1 Mar 2016 02:50:56 +0000 (10:50 +0800)]
Fixed another segfault with file_cache_only now
Nikita Popov [Mon, 29 Feb 2016 21:44:58 +0000 (22:44 +0100)]
Merge branch '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
Jos Elstgeest [Tue, 2 Feb 2016 23:24:06 +0000 (00:24 +0100)]
Fixed bugs #71317 and #71504
If there are duplicate filenames in tar, the last one wins.
Anatol Belski [Mon, 29 Feb 2016 17:44:36 +0000 (18:44 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
add test for bug #68957
Anatol Belski [Mon, 29 Feb 2016 17:44:15 +0000 (18:44 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
add test for bug #68957
Anatol Belski [Mon, 29 Feb 2016 17:43:03 +0000 (18:43 +0100)]
add test for bug #68957
Anatol Belski [Mon, 29 Feb 2016 17:27:08 +0000 (18:27 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
update NEWS
Anatol Belski [Mon, 29 Feb 2016 17:26:48 +0000 (18:26 +0100)]
update NEWS
Anatol Belski [Mon, 29 Feb 2016 17:26:08 +0000 (18:26 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Mon, 29 Feb 2016 17:25:16 +0000 (18:25 +0100)]
update NEWS
Anatol Belski [Mon, 29 Feb 2016 16:08:13 +0000 (17:08 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed #54648 PDO::MSSQL forces format of datetime fields
Anatol Belski [Mon, 29 Feb 2016 16:07:05 +0000 (17:07 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed #54648 PDO::MSSQL forces format of datetime fields
Anatol Belski [Mon, 29 Feb 2016 16:04:49 +0000 (17:04 +0100)]
Fixed #54648 PDO::MSSQL forces format of datetime fields
adopted patch by steven dot lambeth at gmx dot de
Anatol Belski [Mon, 29 Feb 2016 15:31:00 +0000 (16:31 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
remove unneeded free parts
Anatol Belski [Mon, 29 Feb 2016 15:30:33 +0000 (16:30 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
remove unneeded free parts
Anatol Belski [Mon, 29 Feb 2016 15:26:46 +0000 (16:26 +0100)]
remove unneeded free parts
See bug #71667, free_statement already does the job
Anatol Belski [Mon, 29 Feb 2016 14:49:28 +0000 (15:49 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix leaks and add one more NULL check
add NULL check
fix C89 compat
fix arg type
Anatol Belski [Mon, 29 Feb 2016 14:48:51 +0000 (15:48 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leaks and add one more NULL check
add NULL check
fix C89 compat
fix arg type
Anatol Belski [Mon, 29 Feb 2016 14:38:42 +0000 (15:38 +0100)]
fix leaks and add one more NULL check
Anatol Belski [Mon, 29 Feb 2016 14:26:57 +0000 (15:26 +0100)]
add NULL check
Anatol Belski [Mon, 29 Feb 2016 14:24:31 +0000 (15:24 +0100)]
fix C89 compat
Anatol Belski [Mon, 29 Feb 2016 14:23:53 +0000 (15:23 +0100)]
fix arg type
Anatol Belski [Mon, 29 Feb 2016 13:48:28 +0000 (14:48 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix nmake clean in phpize mode
Anatol Belski [Mon, 29 Feb 2016 09:58:56 +0000 (10:58 +0100)]
fix nmake clean in phpize mode
Xinchen Hui [Mon, 29 Feb 2016 07:19:46 +0000 (15:19 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
The test self should be fixed(maybe relates to env?)
Xinchen Hui [Mon, 29 Feb 2016 07:19:18 +0000 (15:19 +0800)]
The test self should be fixed(maybe relates to env?)
Revert "Fixed test ext/readline/tests/readline_read_history_error_001.phpt"
This reverts commit
69e26f9f8fb444fab29bba0fc99fab0cf6f80dd4 .
Xinchen Hui [Mon, 29 Feb 2016 07:10:23 +0000 (15:10 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Revert "Fixed test ext/readline/tests/readline_read_history_error_001.phpt"
Xinchen Hui [Mon, 29 Feb 2016 07:10:17 +0000 (15:10 +0800)]
Revert "Fixed test ext/readline/tests/readline_read_history_error_001.phpt"
This reverts commit
69e26f9f8fb444fab29bba0fc99fab0cf6f80dd4 .
Xinchen Hui [Mon, 29 Feb 2016 07:08:11 +0000 (15:08 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test ext/readline/tests/readline_read_history_error_001.phpt
Xinchen Hui [Mon, 29 Feb 2016 07:07:38 +0000 (15: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:
test fixes
update NEWS
Fix bug #71536 Access Violation crashes php-cgi.exe
Xinchen Hui [Mon, 29 Feb 2016 07:07:19 +0000 (15:07 +0800)]
Fixed test ext/readline/tests/readline_read_history_error_001.phpt
Nikita Popov [Sat, 27 Feb 2016 17:51:53 +0000 (18:51 +0100)]
Various SSA-related tweaks
* Add FETCH_LIST to inference
* Restrict JMP_SET/COALESCE result type
* Fix typos in range inference
* Add const annotations in zend_ssa.h
* For pi statements dump the associated predecessor block
* If type can be both true and false, dump bool instead
Anatol Belski [Sun, 28 Feb 2016 10:53:55 +0000 (11:53 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
test fixes
Anatol Belski [Sun, 28 Feb 2016 10:53:21 +0000 (11:53 +0100)]
test fixes
Anatol Belski [Sun, 28 Feb 2016 10:07:32 +0000 (11:07 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Fix bug #71536 Access Violation crashes php-cgi.exe
Anatol Belski [Sun, 28 Feb 2016 10:06:55 +0000 (11:06 +0100)]
update NEWS
Anatol Belski [Sun, 28 Feb 2016 10:01:00 +0000 (11:01 +0100)]
Fix bug #71536 Access Violation crashes php-cgi.exe
Xinchen Hui [Sun, 28 Feb 2016 03:50:28 +0000 (11:50 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed segfault with file_cache_only
Xinchen Hui [Sun, 28 Feb 2016 03:50:06 +0000 (11:50 +0800)]
Fixed segfault with file_cache_only
Nikita Popov [Sat, 27 Feb 2016 14:30:18 +0000 (15:30 +0100)]
Support dropping rc1/rcn from dumps
For non-JIT we're not interested in rc inference.
Nikita Popov [Sat, 27 Feb 2016 14:02:48 +0000 (15:02 +0100)]
Fix dominator tree construction
The used dominator intersection algorithm assumes a postorder
numbering of the CFG. The reversal of our natural numbering is
quite similar to postorder, but not the same.
In the future we should precompute both preorder/postorder
numberings and orderings, as these are useful in many places.
Dmitry Stogov [Fri, 26 Feb 2016 18:44:28 +0000 (21:44 +0300)]
Use quick check for first arguments
Dmitry Stogov [Fri, 26 Feb 2016 18:02:41 +0000 (21:02 +0300)]
Use more general optimisation patterns
Xinchen Hui [Thu, 25 Feb 2016 08:07:38 +0000 (16:07 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71660 (array_column behaves incorrectly after foreach by reference)
Xinchen Hui [Thu, 25 Feb 2016 08:07:22 +0000 (16:07 +0800)]
Fixed bug #71660 (array_column behaves incorrectly after foreach by reference)
Nikita Popov [Wed, 24 Feb 2016 21:35:14 +0000 (22:35 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Wed, 24 Feb 2016 21:31:17 +0000 (22:31 +0100)]
Fix construction of AO with overloaded object error
a) Fix uses of zend_string in error message
b) Don't assign the overloaded object as the backing storage, that
sort of defeats the point. Instead leave the previous value.
Nikita Popov [Wed, 24 Feb 2016 18:08:18 +0000 (19:08 +0100)]
Fix AO object properties separation
Nikita Popov [Wed, 24 Feb 2016 17:27:56 +0000 (18:27 +0100)]
Forbid exchangeArray() during sorting
Previously this would leak.
Nikita Popov [Wed, 24 Feb 2016 17:23:42 +0000 (18:23 +0100)]
Fix typo in foreach_017.phpt
Dmitry Stogov [Wed, 24 Feb 2016 20:47:05 +0000 (23:47 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed possible crash at PCRE on MSHUTDOWN
Dmitry Stogov [Wed, 24 Feb 2016 20:46:11 +0000 (23:46 +0300)]
Fixed possible crash at PCRE on MSHUTDOWN
Dmitry Stogov [Wed, 24 Feb 2016 18:16:35 +0000 (21:16 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed more synchronisation issues during SHM reload
Dmitry Stogov [Wed, 24 Feb 2016 18:15:53 +0000 (21:15 +0300)]
Fixed more synchronisation issues during SHM reload
Nikita Popov [Wed, 24 Feb 2016 16:44:33 +0000 (17:44 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Wed, 24 Feb 2016 16:39:16 +0000 (17:39 +0100)]
Fix leak on assignment to illegal AO offset
Nikita Popov [Wed, 24 Feb 2016 16:18:07 +0000 (17:18 +0100)]
Don't use ht applyCount for AO sorting protection
Instead use the AOs own applyCount that just got freed up. Using the
apply count of the HashTable has various side effects, e.g. preventing
the ArrayObject from being dumped.
Nikita Popov [Wed, 24 Feb 2016 16:10:28 +0000 (17:10 +0100)]
Remove recursion checks from AO get_properties
These are pointless, there is no recursion (of that kind) happening
there.
Nikita Popov [Wed, 24 Feb 2016 16:00:04 +0000 (17:00 +0100)]
Fix "Call to member function on unknown"
Should be "on null".
Nikita Popov [Wed, 24 Feb 2016 13:09:14 +0000 (14:09 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Wed, 24 Feb 2016 13:07:06 +0000 (14:07 +0100)]
Fixed bug #71470
Don't report hashtable iterator leaks on unclean shutdown, those
are expected.
Anatol Belski [Wed, 24 Feb 2016 11:30:00 +0000 (12:30 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix NEWS
Anatol Belski [Wed, 24 Feb 2016 11:29:23 +0000 (12:29 +0100)]
fix NEWS
Remi Collet [Wed, 24 Feb 2016 11:26:37 +0000 (12:26 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix NEWS
Remi Collet [Wed, 24 Feb 2016 11:26:25 +0000 (12:26 +0100)]
fix NEWS
Anatol Belski [Wed, 24 Feb 2016 11:07:06 +0000 (12:07 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Port patch and test for bug #47803 to 7.0
Anatol Belski [Wed, 24 Feb 2016 11:06:35 +0000 (12:06 +0100)]
update NEWS
Anatol Belski [Wed, 24 Feb 2016 11:00:26 +0000 (12:00 +0100)]
Port patch and test for bug #47803 to 7.0
See
ff115e285ab5192f9e12a43d5dc202d88b01f1ea
Anatol Belski [Wed, 24 Feb 2016 10:57:46 +0000 (11:57 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
add test for bug #47803
Fixed bug #47803
Anatol Belski [Wed, 24 Feb 2016 10:57:15 +0000 (11:57 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
add test for bug #47803
Fixed bug #47803
Anatol Belski [Wed, 24 Feb 2016 10:56:12 +0000 (11:56 +0100)]
update NEWS
Anatol Belski [Wed, 24 Feb 2016 10:49:02 +0000 (11:49 +0100)]
add test for bug #47803
Anatol Belski [Wed, 24 Feb 2016 10:40:35 +0000 (11:40 +0100)]
Fixed bug #47803
Executing prepared statements is succesfull only for the first two statements
The reworked patch descends to the bug #69526 which is fixed by
this as well. The broken logic in the current code was, that
SQLDescribeParam was executed in odbc_execute every time. This piece
is now moved into odbc_prepare and the results are carried on in an
additional structure.
Since the ext/odbc headers are not being currently installed and the
corresponding structs like odbc_result are not used outside ext/odbc,
the binary compatibility persists. Executing SQLDescribeParam only once
in odbc_prepare is also an optimization as the filds usually won't
change that fast and thus requestind the descriptions on every
execution is not required.
Dmitry Stogov [Wed, 24 Feb 2016 08:05:58 +0000 (11:05 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap())
Dmitry Stogov [Wed, 24 Feb 2016 08:04:48 +0000 (11:04 +0300)]
Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap())
Anatol Belski [Tue, 23 Feb 2016 17:18:34 +0000 (18:18 +0100)]
fix callback signature compat
Anatol Belski [Tue, 23 Feb 2016 13:39:49 +0000 (14:39 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
add test for bug #71171
Anatol Belski [Tue, 23 Feb 2016 13:39:17 +0000 (14:39 +0100)]
add test for bug #71171
Anatol Belski [Tue, 23 Feb 2016 13:22:39 +0000 (14:22 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
make ext/odbc test credentials configurable
Anatol Belski [Tue, 23 Feb 2016 13:22:06 +0000 (14:22 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
make ext/odbc test credentials configurable
Anatol Belski [Tue, 23 Feb 2016 13:21:04 +0000 (14:21 +0100)]
make ext/odbc test credentials configurable
Nikita Popov [Mon, 22 Feb 2016 17:40:45 +0000 (18:40 +0100)]
Move free_chunk and resize_chunk into memory pool
Drops 24 bytes from each chunk. For the example in bug #71468 it
reduces memory usage by 30%.
Nikita Popov [Mon, 22 Feb 2016 16:33:41 +0000 (17:33 +0100)]
Drop mysqlnd mempool refcount
This member was no longer used.
Also fix handling of from_pool in resize_chunk. It was setting
pool to NULL instead of from_pool to FALSE.
Remi Collet [Mon, 22 Feb 2016 17:45:30 +0000 (18:45 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
missing include
Remi Collet [Mon, 22 Feb 2016 17:45:18 +0000 (18:45 +0100)]
missing include
Remi Collet [Mon, 22 Feb 2016 17:18:43 +0000 (18:18 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update bundled libzip to 1.1.2
Remi Collet [Mon, 22 Feb 2016 17:18:30 +0000 (18:18 +0100)]
update bundled libzip to 1.1.2
Nikita Popov [Mon, 22 Feb 2016 12:11:24 +0000 (13:11 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Mon, 22 Feb 2016 12:09:54 +0000 (13:09 +0100)]
Remove check_std_props arg from get_hash_table
get_properties() is the only place using it, so handle it only
there.
Nikita Popov [Mon, 22 Feb 2016 12:04:19 +0000 (13:04 +0100)]
Don't recurse into USE_OTHER checking STD_PROP_LIST
If STD_PROP_LIST is explicitly disabled in the constructor, it
should really be disabled.
Nikita Popov [Mon, 22 Feb 2016 11:40:30 +0000 (12:40 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Mon, 22 Feb 2016 11:39:07 +0000 (12:39 +0100)]
Fix typo in previous commit
Happened to be correct because array is the first member, but
definitely not what I wanted...
Nikita Popov [Mon, 22 Feb 2016 11:35:09 +0000 (12:35 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Mon, 22 Feb 2016 11:33:41 +0000 (12:33 +0100)]
Fix ArrayObject clone for certain USE_OTHER cases
We can't simply use HASH_OF, need to use the usual hash table
getter.
Nikita Popov [Mon, 22 Feb 2016 11:19:03 +0000 (12:19 +0100)]
Use USE_OTHER for ArrayIterator cloning
intern->array should never be an array with refcount 2.