]>
granicus.if.org Git - php/log
Dmitry Stogov [Wed, 3 Jun 2015 10:43:05 +0000 (13:43 +0300)]
micro-optimization
Dmitry Stogov [Wed, 3 Jun 2015 08:15:28 +0000 (11:15 +0300)]
CONCAT optimization
Bob Weinand [Wed, 3 Jun 2015 00:57:16 +0000 (02:57 +0200)]
Use CG(one_char_string) if possible in bitwise string operations
emalloc() is not cheap... Also, a good part of bitwise string ops out there are on single bytes.
Anatol Belski [Mon, 1 Jun 2015 19:52:35 +0000 (21:52 +0200)]
introduced DllMain for the main php DLL
The particular need on this is because of the current situation
with determining the background functionality for the
gettimeofday. DllMain allows to initialize stuff before the DLL
can be actually used. Thus, we use different time API on win7
and win8 and later, so the function pointer needs to be
initialized before anything in the DLL could even demand it.
The change also opens the door for the further optimizations,
as now we're able to do the very basic initializations for the
whole DLL before it could ever start to live. Fe on this way the
TLS initialization could be done, when utilizing the
DLL_THREAD_ATTACH/DETACH case. Whether it's really usable in
portable way should be synced with other platforms.
Be aware that it's dangerous as it possibly causes dead locks.
So to use with care. One willing to add items to DllMain should
better read the documentation twice and even then try to defer
the necessary action.
Anatol Belski [Sun, 31 May 2015 21:50:29 +0000 (23:50 +0200)]
a bit more clearness fir --with-mp
Dmitry Stogov [Tue, 2 Jun 2015 09:03:34 +0000 (12:03 +0300)]
Call zend_array_dup() instead of zval_copy_ctor().
Dmitry Stogov [Tue, 2 Jun 2015 09:01:34 +0000 (12:01 +0300)]
Avoid useless duplication. Constant values have to be duplicated only for internal constants in ZTS build, to prevent simultaneous modification of reference counters from different threads.
Stanislav Malyshev [Tue, 2 Jun 2015 06:58:19 +0000 (23:58 -0700)]
fix test
Stanislav Malyshev [Tue, 2 Jun 2015 05:57:05 +0000 (22:57 -0700)]
Merge branch 'pull-request/1310'
* pull-request/1310:
Fix GD tests #69698
Stanislav Malyshev [Tue, 2 Jun 2015 05:55:16 +0000 (22:55 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error
Conflicts:
ext/spl/spl_heap.c
Stanislav Malyshev [Tue, 2 Jun 2015 05:53:08 +0000 (22:53 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error
Stanislav Malyshev [Tue, 2 Jun 2015 05:06:16 +0000 (22:06 -0700)]
Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error
Dmitry Stogov [Mon, 1 Jun 2015 14:22:04 +0000 (17:22 +0300)]
Reorder conditions to check for fast paths first.
Dmitry Stogov [Mon, 1 Jun 2015 09:21:48 +0000 (12:21 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #69732 (can induce segmentation fault with basic php code).
Dmitry Stogov [Mon, 1 Jun 2015 09:17:32 +0000 (12:17 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69732 (can induce segmentation fault with basic php code).
Conflicts:
Zend/zend_vm_execute.h
Dmitry Stogov [Mon, 1 Jun 2015 08:40:14 +0000 (11:40 +0300)]
Fixed bug #69732 (can induce segmentation fault with basic php code).
Dmitry Stogov [Mon, 1 Jun 2015 07:51:06 +0000 (10:51 +0300)]
Fixed integer overflow during HashTable size calculation
Stanislav Malyshev [Mon, 1 Jun 2015 02:40:31 +0000 (19:40 -0700)]
Merge branch 'pull-request/1314'
* pull-request/1314:
Fixed typos in UPGRADING.INTERNALS
Stanislav Malyshev [Mon, 1 Jun 2015 02:37:56 +0000 (19:37 -0700)]
set initialized flag after actual initialization happened
Andrew Murray [Mon, 1 Jun 2015 01:13:09 +0000 (11:13 +1000)]
Fixed typos in UPGRADING.INTERNALS
Stanislav Malyshev [Mon, 1 Jun 2015 00:30:41 +0000 (17:30 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
improve fix for Bug #69545
Stanislav Malyshev [Mon, 1 Jun 2015 00:30:29 +0000 (17:30 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
improve fix for Bug #69545
Stanislav Malyshev [Mon, 1 Jun 2015 00:29:53 +0000 (17:29 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
improve fix for Bug #69545
Stanislav Malyshev [Mon, 1 Jun 2015 00:23:06 +0000 (17:23 -0700)]
improve fix for Bug #69545
Stanislav Malyshev [Sun, 31 May 2015 21:52:08 +0000 (14:52 -0700)]
FIx darwin build
Anatol Belski [Sun, 31 May 2015 21:04:11 +0000 (23:04 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix phpize mode for manifest embedding
Anatol Belski [Sun, 31 May 2015 21:03:47 +0000 (23:03 +0200)]
fix phpize mode for manifest embedding
Anatol Belski [Sun, 31 May 2015 21:02:01 +0000 (23:02 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix phpize mode for manifest embedding
Anatol Belski [Sun, 31 May 2015 21:01:21 +0000 (23:01 +0200)]
fix phpize mode for manifest embedding
Christoph M. Becker [Sun, 31 May 2015 19:35:21 +0000 (21:35 +0200)]
split simplexml tests for 7
Anatol Belski [Sun, 31 May 2015 19:32:04 +0000 (21:32 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
split the original test to check behaviour diff on 32- and 64-bit
recovered original meaning of SXE xpath test
Anatol Belski [Sun, 31 May 2015 19:30:46 +0000 (21:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
split the original test to check behaviour diff on 32- and 64-bit
recovered original meaning of SXE xpath test
Christoph M. Becker [Sun, 31 May 2015 19:28:44 +0000 (21:28 +0200)]
split the original test to check behaviour diff on 32- and 64-bit
Christoph M. Becker [Sat, 30 May 2015 16:09:51 +0000 (18:09 +0200)]
recovered original meaning of SXE xpath test
Anatol Belski [Sun, 31 May 2015 17:33:34 +0000 (19:33 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
backport the basic code to properly recognize win 8.1 and 10
backport the manifest changes for makefile
backport the manifest changes in js
add default manifest
add test
Anatol Belski [Sun, 31 May 2015 17:32:21 +0000 (19:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backport the basic code to properly recognize win 8.1 and 10
backport the manifest changes for makefile
backport the manifest changes in js
add default manifest
add test
Anatol Belski [Sun, 31 May 2015 17:01:58 +0000 (19:01 +0200)]
backport the basic code to properly recognize win 8.1 and 10
Anatol Belski [Sun, 31 May 2015 16:59:00 +0000 (18:59 +0200)]
backport the manifest changes for makefile
Anatol Belski [Sun, 31 May 2015 16:53:51 +0000 (18:53 +0200)]
backport the manifest changes in js
Anatol Belski [Sun, 31 May 2015 16:17:58 +0000 (18:17 +0200)]
add default manifest
Anatol Belski [Sun, 31 May 2015 16:13:33 +0000 (18:13 +0200)]
add test
Xinchen Hui [Sun, 31 May 2015 05:35:01 +0000 (13:35 +0800)]
Fixed Bug #69733 (PHP fails to build with --enable-phpdbg-debug)
Stanislav Malyshev [Sun, 31 May 2015 04:19:05 +0000 (21:19 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update PCRE version (bug #69689)
move test
NEWS 5.4
fix new test
Fixed Bug #69667 segfault in php_pgsql_meta_data
5.4.42 next
Stanislav Malyshev [Sun, 31 May 2015 04:18:50 +0000 (21:18 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update PCRE version (bug #69689)
move test
NEWS 5.4
fix new test
Fixed Bug #69667 segfault in php_pgsql_meta_data
5.4.42 next
Stanislav Malyshev [Sun, 31 May 2015 04:18:28 +0000 (21:18 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update PCRE version (bug #69689)
move test
NEWS 5.4
fix new test
Fixed Bug #69667 segfault in php_pgsql_meta_data
5.4.42 next
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Sun, 31 May 2015 04:17:16 +0000 (21:17 -0700)]
Update PCRE version (bug #69689)
Anatol Belski [Sat, 30 May 2015 07:43:10 +0000 (09:43 +0200)]
run credits script
Anatol Belski [Sat, 30 May 2015 07:37:08 +0000 (09:37 +0200)]
updated UPGRADING
Anatol Belski [Sat, 30 May 2015 07:26:40 +0000 (09:26 +0200)]
removed sapi/nsapi
Anatol Belski [Fri, 29 May 2015 19:19:31 +0000 (21:19 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Refactored the fix for bug #66084, by cmb@php.net
Merge the fix for #69703 to 5.5 per request from Julien
Anatol Belski [Fri, 29 May 2015 19:18:37 +0000 (21:18 +0200)]
updated NEWS
Anatol Belski [Fri, 29 May 2015 19:18:04 +0000 (21:18 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Refactored the fix for bug #66084, by cmb@php.net
Merge the fix for #69703 to 5.5 per request from Julien
Anatol Belski [Fri, 29 May 2015 19:16:56 +0000 (21:16 +0200)]
Refactored the fix for bug #66084, by cmb@php.net
Hannes Magnusson [Fri, 29 May 2015 19:04:53 +0000 (19:04 +0000)]
Fix typos and add link to the phpng upgrading wiki page
Christoph M. Becker [Wed, 27 May 2015 00:34:44 +0000 (02:34 +0200)]
removed test for unrelated bug #68946
Christoph M. Becker [Tue, 26 May 2015 20:46:23 +0000 (22:46 +0200)]
fixed whitespace dependend behavior of casting SimpleXMLElements to boolean
Christoph M. Becker [Tue, 26 May 2015 20:34:46 +0000 (22:34 +0200)]
added tests for bug #61335, bug #67572 and bug #68946 (the latter already passing, but better safe than sorry)
Christoph M. Becker [Tue, 26 May 2015 16:35:09 +0000 (18:35 +0200)]
fixed whitespace depending (mis)behavior of var_dump'ing and print_r'ing SimpleXMLElements
Christoph M. Becker [Tue, 26 May 2015 16:32:08 +0000 (18:32 +0200)]
added failing tests for bug #62639, bug #67116, bug #69169 and bug #69491
Metalaka [Fri, 29 May 2015 17:18:53 +0000 (19:18 +0200)]
Fix GD tests #69698
May be take a look to [travis/compile.sh](https://github.com/php/php-src/blob/
4b9299d155316e4e49d87d3941eab1ca95b2462a /travis/compile.sh#L60)
Antony Dovgal [Fri, 29 May 2015 15:16:07 +0000 (18:16 +0300)]
NEWS and UPGRADING entries for PR #1309
Antony Dovgal [Thu, 18 Dec 2014 13:02:49 +0000 (16:02 +0300)]
add tests for proc_open() and pipes
Antony Dovgal [Thu, 18 Dec 2014 12:28:01 +0000 (15:28 +0300)]
remove hardcoded limit on number of pipes in proc_open()
Anatol Belski [Fri, 29 May 2015 09:45:20 +0000 (11:45 +0200)]
add test
Anatol Belski [Fri, 29 May 2015 09:44:46 +0000 (11:44 +0200)]
fix windows version constants initialization with nts
Nikita Popov [Fri, 29 May 2015 09:11:02 +0000 (11:11 +0200)]
Merge branch 'PHP-5.6'
Preserving HAS_RETURN_TYPE for __invoke() here as well.
Conflicts:
Zend/zend_alloc.c
Nikita Popov [Sun, 24 May 2015 19:56:49 +0000 (21:56 +0200)]
Remove zend_init_list
No longer used - zend_add_to_list already covers this.
Also marked zend_add_to_list as static and dropped it from the header.
Nikita Popov [Sun, 24 May 2015 19:50:46 +0000 (21:50 +0200)]
Drop unnecessary checks for op_array->filename
We always require a filename.
Nikita Popov [Fri, 29 May 2015 09:06:28 +0000 (11:06 +0200)]
Preserve VARIADIC flag for Closure::__invoke()
The 13 arguments are for the benefit of PHP 7, where the first
twelve use the bitmask.
Kalle Sommer Nielsen [Fri, 29 May 2015 07:18:36 +0000 (09:18 +0200)]
Remove T1Lib support (see #69698)
# Also removes imagepscopyfont() which was never available (commented out)
Kalle Sommer Nielsen [Fri, 29 May 2015 07:12:25 +0000 (09:12 +0200)]
Note getrusage() for Windows in UPGRADING
Xinchen Hui [Fri, 29 May 2015 05:51:02 +0000 (13:51 +0800)]
Merge branch 'master' of git.php.net:php-src
Xinchen Hui [Fri, 29 May 2015 05:50:44 +0000 (13:50 +0800)]
Fixed bug #69723 (Passing parameters by reference and array_column)
Anatol Belski [Thu, 28 May 2015 22:29:25 +0000 (00:29 +0200)]
manifest for the main php dll needs to be copied manually
Anatol Belski [Thu, 28 May 2015 20:21:54 +0000 (22:21 +0200)]
pack the default manifest for devel
Anatol Belski [Thu, 28 May 2015 20:17:21 +0000 (22:17 +0200)]
add *.manifest to cleanup
Anatol Belski [Thu, 28 May 2015 17:58:39 +0000 (19:58 +0200)]
correct manifest
Anatol Belski [Thu, 28 May 2015 01:11:51 +0000 (03:11 +0200)]
using correct manifest, GetVersionEx can recognise versions
Anatol Belski [Thu, 28 May 2015 00:41:10 +0000 (02:41 +0200)]
take the default manifest
yet to be reworked for the case some custom manifest were supplied
Anatol Belski [Thu, 28 May 2015 00:05:14 +0000 (02:05 +0200)]
add default manifest
Anatol Belski [Wed, 27 May 2015 23:44:02 +0000 (01:44 +0200)]
fixup default versions, just for the case
Kalle Sommer Nielsen [Thu, 28 May 2015 21:06:49 +0000 (23:06 +0200)]
Fix deplister with VC14, noticed by Jan Ehrhardt
Xinchen Hui [Thu, 28 May 2015 16:03:19 +0000 (00:03 +0800)]
Attempt to fix #69643
Kalle Sommer Nielsen [Thu, 28 May 2015 14:54:02 +0000 (16:54 +0200)]
Merge the fix for #69703 to 5.5 per request from Julien
Kalle Sommer Nielsen [Thu, 28 May 2015 12:37:52 +0000 (14:37 +0200)]
Shouldn't have been committed, so revert
Kalle Sommer Nielsen [Thu, 28 May 2015 12:30:18 +0000 (14:30 +0200)]
Fixed bug #69703 (Use __builtin_clzl on PowerPC) -- Patch by dja at axtens dot net
# Julien, even though 5.5 is still non security mode I don't think we should merge this patch but I leave the choice with you
Remi Collet [Thu, 28 May 2015 08:37:52 +0000 (10:37 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Relax a little this test, because random is not reliable
Remi Collet [Thu, 28 May 2015 08:37:39 +0000 (10:37 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Relax a little this test, because random is not reliable
Remi Collet [Thu, 28 May 2015 08:35:19 +0000 (10:35 +0200)]
Relax a little this test, because random is not reliable
Usual values are 3500-3950, but >4000 can happen.
Ferenc Kovacs [Thu, 28 May 2015 00:09:46 +0000 (02:09 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
empty commit to trigger a github mirror
Ferenc Kovacs [Thu, 28 May 2015 00:09:12 +0000 (02:09 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
empty commit to trigger a github mirror
Ferenc Kovacs [Thu, 28 May 2015 00:08:48 +0000 (02:08 +0200)]
empty commit to trigger a github mirror
Ferenc Kovacs [Thu, 28 May 2015 00:06:43 +0000 (02:06 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
move to 5.6.11-dev
Ferenc Kovacs [Thu, 28 May 2015 00:05:50 +0000 (02:05 +0200)]
move to 5.6.11-dev
Anatol Belski [Tue, 26 May 2015 15:17:46 +0000 (17:17 +0200)]
update lib versions info
Kalle Sommer Nielsen [Wed, 27 May 2015 14:50:01 +0000 (16:50 +0200)]
[16:45] <@bjori> salathe: http://git.php.net/?p=php-src.git;a=commit;h=
d4324a5e4ba3ae668cf1a3c2426241fd6ac385a5 && http://git.php.net/?p=php-src.git;a=commit;h=
9de8833bea9fe39556066e7ff77b136697652d02
[16:45] <@bjori> you should probably move philip to authors, and yourself out of the author list
Peter Cowburn [Wed, 27 May 2015 10:20:21 +0000 (11:20 +0100)]
updated manual editor
Xinchen Hui [Wed, 27 May 2015 09:41:38 +0000 (17:41 +0800)]
Remove debug codes
Xinchen Hui [Wed, 27 May 2015 09:37:34 +0000 (17:37 +0800)]
Fixed sapi/tests (maybe needs some run-test.php people's reviewing)
Xinchen Hui [Wed, 27 May 2015 08:54:32 +0000 (16:54 +0800)]
Seems useless now