]>
granicus.if.org Git - php/log
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
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
Xinchen Hui [Wed, 27 May 2015 08:47:15 +0000 (16:47 +0800)]
Xinchen Hui [Wed, 27 May 2015 08:36:15 +0000 (16:36 +0800)]
Merge branch 'master' into merge-fastcgi
Conflicts:
sapi/fpm/fpm/fpm_main.c
Reeze Xia [Wed, 27 May 2015 02:45:19 +0000 (10:45 +0800)]
Remove useless cast
Xinchen Hui [Wed, 27 May 2015 02:37:48 +0000 (10:37 +0800)]
Merge pull request #2 from weltling/merge-fastcgi
Simplify the windows side
Bob Weinand [Tue, 26 May 2015 23:37:00 +0000 (01:37 +0200)]
Add test for memory leak with wrong return type
Bob Weinand [Tue, 26 May 2015 23:18:06 +0000 (01:18 +0200)]
Fix memory leak with return types upon failure
TMP/VAR wasn't being freed in VERIFY_RETURN
Bob Weinand [Tue, 26 May 2015 22:55:15 +0000 (00:55 +0200)]
Fix phpdbg class fetch / method opcodes
Dmitry Stogov [Tue, 26 May 2015 14:33:25 +0000 (17:33 +0300)]
Add targets to simplify building PHP with FDO (Feedback Directed Optimisation)
PHP should be built with the folowing steps:
make clean
make -j4 prof-gen
; now php should be trained with some scripts
; for example `sapi/cgi/php -T 1000 /var/www/http/wordpress/index.php > /dev/null`
make prof-clean
make -j4 prof-use
The "properly" trained build may give up to 10% real performance boost!
"Improprly" trained PHP might be even slower.
Reeze Xia [Tue, 26 May 2015 14:04:50 +0000 (22:04 +0800)]
Fixed phpdbg exit unexpected after signal SIGCONT on OS X
Anatol Belski [Tue, 26 May 2015 11:09:01 +0000 (13:09 +0200)]
fix dir sep in test
Xinchen Hui [Tue, 26 May 2015 10:11:07 +0000 (18:11 +0800)]
Even fake token better to be in upper case
Xinchen Hui [Tue, 26 May 2015 08:26:12 +0000 (16:26 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Tue, 26 May 2015 08:24:39 +0000 (16:24 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 26 May 2015 08:24:18 +0000 (16:24 +0800)]
Fixed C89
Anatol Belski [Tue, 26 May 2015 07:44:41 +0000 (09:44 +0200)]
added the shared fcgi imp to sapi/cgi
This is yet a workaround, if another part of the source would need
the same object file, it'll end up producing duplicated nmake target.
Some additional implementation is needed so same object files can be
shared between different modules, to handle this situation better.
Anatol Belski [Tue, 26 May 2015 07:03:52 +0000 (09:03 +0200)]
remove fastcgi.c from the dll target
Anatol Belski [Tue, 26 May 2015 07:02:19 +0000 (09:02 +0200)]
reverted
0512b38 and
1411ca5
Xinchen Hui [Tue, 26 May 2015 06:17:21 +0000 (14:17 +0800)]
Merge branch 'master' into merge-fastcgi
Xinchen Hui [Tue, 26 May 2015 05:54:20 +0000 (13:54 +0800)]
Only link fastcgi into fpm and cgi
Xinchen Hui [Tue, 26 May 2015 03:47:01 +0000 (11:47 +0800)]
Micro optimizations
Xinchen Hui [Tue, 26 May 2015 02:36:52 +0000 (10:36 +0800)]
implicit declaration of function ‘zend_multibyte_yyinput_again’
Bob Weinand [Mon, 25 May 2015 23:43:56 +0000 (01:43 +0200)]
Ran wrong tests, fixed bug in impl; simplified
Bob Weinand [Mon, 25 May 2015 23:12:23 +0000 (01:12 +0200)]
Speed up implod()'ing between 5% and 30% (by time)
Significantly speed up implode()'ing on integers now...
Previously I accidentally committed the first part of the patch in
69b54ba926b714dff0f8b54bea385e9a278c5849
Bob Weinand [Mon, 25 May 2015 22:17:27 +0000 (00:17 +0200)]
Fix tokenizer test due to recent changes
Bob Weinand [Mon, 25 May 2015 21:07:37 +0000 (23:07 +0200)]
Add class to semi_reserved tests
Márcio Almada [Mon, 25 May 2015 18:56:24 +0000 (15:56 -0300)]
updates grammar tests with class members named as method modifiers \cc @bwoebi
Bob Weinand [Mon, 25 May 2015 20:58:30 +0000 (22:58 +0200)]
Also unreserve T_CLASS
Bob Weinand [Mon, 25 May 2015 18:26:57 +0000 (20:26 +0200)]
Set %expect to 0 in parser (Using %prec)
Bob Weinand [Mon, 25 May 2015 17:00:53 +0000 (19:00 +0200)]
Merge branch 'master' of https://github.com/php/php-src
Bob Weinand [Mon, 25 May 2015 17:00:08 +0000 (19:00 +0200)]
Rebuild scanner, add NEWS/UPGRADING
Dmitry Stogov [Mon, 25 May 2015 16:59:25 +0000 (19:59 +0300)]
Prevent op_array->this_var setting when method uses auto globals
Bob Weinand [Mon, 25 May 2015 16:38:40 +0000 (18:38 +0200)]
Merge context sensitive lexer RFC
Dmitry Stogov [Mon, 25 May 2015 16:20:52 +0000 (19:20 +0300)]
Fixed typo
Anatol Belski [Mon, 25 May 2015 16:07:47 +0000 (18:07 +0200)]
move S_IFLNK define into header
Anatol Belski [Mon, 25 May 2015 11:47:31 +0000 (13:47 +0200)]
further cleanups with S_IF* macros generalized declarations
Anatol Belski [Mon, 25 May 2015 11:28:18 +0000 (13:28 +0200)]
cleanup more redundant S_IS* declarations
Anatol Belski [Mon, 25 May 2015 11:22:54 +0000 (13:22 +0200)]
cleanup redundant S_IFDIR declaration
Anatol Belski [Mon, 25 May 2015 11:21:01 +0000 (13:21 +0200)]
cleanup duplicated stat declarations in ext/phar
Anatol Belski [Mon, 25 May 2015 11:17:35 +0000 (13:17 +0200)]
move some stat declarations into zend_virtual_cwd.h
more cleanup to go
Dmitry Stogov [Mon, 25 May 2015 15:29:31 +0000 (18:29 +0300)]
Fixed bug #69700 (tests/lang/this_assignment.phpt memory errors)
Xinchen Hui [Mon, 25 May 2015 07:40:32 +0000 (15:40 +0800)]
Fixed va_list double used
Anatol Belski [Sun, 24 May 2015 13:38:39 +0000 (15:38 +0200)]
pick up sasl auth plugins if there was any in the deps
Anatol Belski [Fri, 22 May 2015 11:39:25 +0000 (13:39 +0200)]
remove non-applicable comment
Anatol Belski [Fri, 22 May 2015 07:51:54 +0000 (09:51 +0200)]
fix datetime tests with vc14
VC14 RC seems to support more format extensions, however some
difrerences do still persist.
Anatol Belski [Fri, 22 May 2015 06:01:48 +0000 (08:01 +0200)]
make the test more reliable
Nikita Popov [Sun, 24 May 2015 18:27:30 +0000 (20:27 +0200)]
Improve phpdbg opcode dump
Don't show <unused>, just don't display anything instead.
Dump nums used in op1/op2/result, e.g. for SEND, RECV etc.
Split the switch into three parts, one for each operand.
Remi Collet [Sun, 24 May 2015 07:40:08 +0000 (09:40 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fixed Bug #69479 GD fails to build with newer libvpx
Remi Collet [Sun, 24 May 2015 07:39:44 +0000 (09:39 +0200)]
NEWS
Remi Collet [Sun, 24 May 2015 07:39:20 +0000 (09:39 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed Bug #69479 GD fails to build with newer libvpx
Remi Collet [Sun, 24 May 2015 07:39:03 +0000 (09:39 +0200)]
NEWS
Remi Collet [Sun, 24 May 2015 07:37:12 +0000 (09:37 +0200)]
Fixed Bug #69479 GD fails to build with newer libvpx
From upstream https://github.com/libgd/libgd/commit/
d41eb72cd4545c394578332e5c102dee69e02ee8
Fix build with latest libvpx 1.4.0
These new constants exist at least since 1.0.0
Compatibility ones have been droped in 1.4.0
Xinchen Hui [Sun, 24 May 2015 06:23:34 +0000 (14:23 +0800)]
Merge branch 'master' into merge-fastcgi
Xinchen Hui [Sun, 24 May 2015 06:21:04 +0000 (14:21 +0800)]
fcgi_is_allowed should not log error
Xinchen Hui [Sun, 24 May 2015 02:09:59 +0000 (10:09 +0800)]
Merge pull request #1 from weltling/merge-fastcgi
Missing symbols to get it worky on Windows
Anatol Belski [Sat, 23 May 2015 21:02:47 +0000 (23:02 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Anatol Belski [Sat, 23 May 2015 21:02:09 +0000 (23:02 +0200)]
updated NEWS
Nikita Popov [Sat, 23 May 2015 19:15:11 +0000 (21:15 +0200)]
Fixes for x32 ABI
I'm assuming that we want to have 64bit zend_longs on x32 here.
This fixes two typos in __x86_64__ macros and adds sign-extension
when assigning STREAM_COPY_ALL to zend_long.
Anatol Belski [Sat, 23 May 2015 19:00:47 +0000 (21:00 +0200)]
add the remaining useful symbols to the export
Anatol Belski [Sat, 23 May 2015 18:55:20 +0000 (20:55 +0200)]
implement necessary symbol exports
Xinchen Hui [Sat, 23 May 2015 17:07:36 +0000 (01:07 +0800)]
Avoid multipy allocating of request env
Anatol Belski [Sat, 23 May 2015 16:47:26 +0000 (18:47 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
increase the internal post data buffer
Anatol Belski [Sat, 23 May 2015 16:44:39 +0000 (18:44 +0200)]
increase the internal post data buffer
This brings speedup and fixes issues with var parsing. Default BUFSIZ
on Windows is 512 bytes which causes too much reallocation work.
Xinchen Hui [Sat, 23 May 2015 11:19:48 +0000 (19:19 +0800)]
Use weak function for fcgi_log
Xinchen Hui [Sat, 23 May 2015 02:31:50 +0000 (10:31 +0800)]
Fixed fpm-side (tests passes)
Levi Morrison [Thu, 21 May 2015 01:54:11 +0000 (19:54 -0600)]
Inline zend_find_builtin_type
This function was used only inside of zend_find_builtin_type_by_name,
which is also used only one time.
Levi Morrison [Thu, 21 May 2015 01:50:20 +0000 (19:50 -0600)]
Remove duplication
Levi Morrison [Thu, 21 May 2015 01:39:31 +0000 (19:39 -0600)]
Rename some variables and functions
The way these are used have little to do with them being scalars;
they are just tuples with names, lengths and IS_* constants. We
will probably reuse these in the future with other types.
Radu Brănișcan [Wed, 20 May 2015 00:08:50 +0000 (03:08 +0300)]
Corrected line comment 5256
From the text "dectupt" to "decrypt"
Nikita Popov [Fri, 22 May 2015 20:31:02 +0000 (22:31 +0200)]
Remove ZEND_BRK/ZEND_CONT from VM
These are no longer used at run-time now, only temporarily during
compilation.
Nikita Popov [Fri, 22 May 2015 20:17:40 +0000 (22:17 +0200)]
Use ZEND_JMP instead of ZEND_BRK/ZEND_CONT
Emit necessary FREEs during compilation, convert to JMP during
pass_two (we may not know target opline beforehand).
Nikita Popov [Fri, 22 May 2015 20:08:44 +0000 (22:08 +0200)]
Embed break/continue depth into opline
Previously a separate lval literal was used - this is probably a
leftover from the time where the break level could still be
specified dynamically.
Nikita Popov [Fri, 22 May 2015 19:35:33 +0000 (21:35 +0200)]
Move loop var stack management into begin/end loop
Also set start to -1 in begin_loop already, so the info that a
loop variable is not used is already available at compile-time.