Commit Graph

90276 Commits

Author SHA1 Message Date
Xinchen Hui
ed8d1ba7dd Fixed bug #69723 (Passing parameters by reference and array_column) 2015-05-29 13:50:44 +08:00
Xinchen Hui
50e08d60b6 Attempt to fix #69643 2015-05-29 00:03:19 +08:00
Remi Collet
0437aa2abf Merge branch 'PHP-5.6'
* PHP-5.6:
  Relax a little this test, because random is not reliable
2015-05-28 10:37:52 +02:00
Remi Collet
7611d1c41b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Relax a little this test, because random is not reliable
2015-05-28 10:37:39 +02:00
Remi Collet
09b92a3a54 Relax a little this test, because random is not reliable
Usual values are 3500-3950, but >4000 can happen.
2015-05-28 10:35:19 +02:00
Ferenc Kovacs
864c171899 Merge branch 'PHP-5.6'
* PHP-5.6:
  empty commit to trigger a github mirror
2015-05-28 02:09:46 +02:00
Ferenc Kovacs
482c69bf63 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  empty commit to trigger a github mirror
2015-05-28 02:09:12 +02:00
Ferenc Kovacs
00d8e26d71 empty commit to trigger a github mirror 2015-05-28 02:08:48 +02:00
Ferenc Kovacs
db3092d460 Merge branch 'PHP-5.6'
* PHP-5.6:
  move to 5.6.11-dev
2015-05-28 02:06:43 +02:00
Ferenc Kovacs
4d8ae36695 move to 5.6.11-dev 2015-05-28 02:05:50 +02:00
Anatol Belski
58ed12b1a2 update lib versions info 2015-05-27 18:15:43 +02:00
Kalle Sommer Nielsen
0a7f792b6f [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
2015-05-27 16:50:01 +02:00
Peter Cowburn
d47815d5ee updated manual editor 2015-05-27 11:20:21 +01:00
Xinchen Hui
0e438a2783 Remove debug codes 2015-05-27 17:41:38 +08:00
Xinchen Hui
c17029315f Fixed sapi/tests (maybe needs some run-test.php people's reviewing) 2015-05-27 17:37:34 +08:00
Xinchen Hui
2b41c04124 Seems useless now 2015-05-27 16:54:32 +08:00
Xinchen Hui
151e52f6eb Fixed the fix in f68dc94aa7 2015-05-27 16:47:15 +08:00
Xinchen Hui
90df7e75e6 Merge branch 'master' into merge-fastcgi
Conflicts:
	sapi/fpm/fpm/fpm_main.c
2015-05-27 16:36:15 +08:00
Reeze Xia
f68dc94aa7 Remove useless cast 2015-05-27 10:45:19 +08:00
Xinchen Hui
f972e219e4 Merge pull request #2 from weltling/merge-fastcgi
Simplify the windows side
2015-05-27 10:37:48 +08:00
Bob Weinand
b73f87b1e4 Add test for memory leak with wrong return type 2015-05-27 01:37:00 +02:00
Bob Weinand
f7f7d6e385 Fix memory leak with return types upon failure
TMP/VAR wasn't being freed in VERIFY_RETURN
2015-05-27 01:18:06 +02:00
Bob Weinand
5bec1490f9 Fix phpdbg class fetch / method opcodes 2015-05-27 00:55:26 +02:00
Dmitry Stogov
7dac4d449f 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.
2015-05-26 17:33:25 +03:00
Reeze Xia
ca31711625 Fixed phpdbg exit unexpected after signal SIGCONT on OS X 2015-05-26 22:04:50 +08:00
Anatol Belski
4faf7476f9 fix dir sep in test 2015-05-26 13:09:56 +02:00
Xinchen Hui
438d17e74e Even fake token better to be in upper case 2015-05-26 18:11:07 +08:00
Xinchen Hui
4a728227fc Merge branch 'PHP-5.6' 2015-05-26 16:26:23 +08:00
Xinchen Hui
1f077cc4f4 Merge branch 'PHP-5.5' into PHP-5.6 2015-05-26 16:24:39 +08:00
Xinchen Hui
76a290d0be Fixed C89 2015-05-26 16:24:18 +08:00
Anatol Belski
6d582c6a24 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.
2015-05-26 09:44:41 +02:00
Anatol Belski
fd256be671 remove fastcgi.c from the dll target 2015-05-26 09:03:52 +02:00
Anatol Belski
cf0397ef06 reverted 0512b38 and 1411ca5 2015-05-26 09:02:19 +02:00
Xinchen Hui
49b10ee264 Merge branch 'master' into merge-fastcgi 2015-05-26 14:17:21 +08:00
Xinchen Hui
9f1788f00d Only link fastcgi into fpm and cgi 2015-05-26 13:55:39 +08:00
Xinchen Hui
5f753f9e2e Micro optimizations 2015-05-26 11:47:01 +08:00
Xinchen Hui
770a462943 implicit declaration of function ‘zend_multibyte_yyinput_again’ 2015-05-26 10:36:52 +08:00
Bob Weinand
1a7bf16dd6 Ran wrong tests, fixed bug in impl; simplified 2015-05-26 01:43:56 +02:00
Bob Weinand
bb552908a0 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 69b54ba926
2015-05-26 01:12:23 +02:00
Bob Weinand
31f3eeb0c5 Fix tokenizer test due to recent changes 2015-05-26 00:17:27 +02:00
Bob Weinand
8cd62071ab Add class to semi_reserved tests 2015-05-25 23:07:37 +02:00
Márcio Almada
e67a129ea6 updates grammar tests with class members named as method modifiers \cc @bwoebi 2015-05-25 23:00:39 +02:00
Bob Weinand
69b54ba926 Also unreserve T_CLASS 2015-05-25 22:58:30 +02:00
Bob Weinand
36c3c47434 Set %expect to 0 in parser (Using %prec) 2015-05-25 20:26:57 +02:00
Bob Weinand
306a0f28d0 Merge branch 'master' of https://github.com/php/php-src 2015-05-25 19:00:53 +02:00
Bob Weinand
21ccdf6304 Rebuild scanner, add NEWS/UPGRADING 2015-05-25 19:00:08 +02:00
Dmitry Stogov
03f41f9b4d Prevent op_array->this_var setting when method uses auto globals 2015-05-25 19:59:25 +03:00
Bob Weinand
886cbea94f Merge context sensitive lexer RFC 2015-05-25 18:38:40 +02:00
Dmitry Stogov
18cd4b17cc Fixed typo 2015-05-25 19:20:52 +03:00
Anatol Belski
cf50748f2b move S_IFLNK define into header 2015-05-25 18:07:47 +02:00