clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
90,310 Commits 494 Branches 1,367 Tags 801 MiB
042ecad749
Commit Graph

90310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
042ecad749 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
 2015-05-29 21:19:31 +02:00
Anatol Belski
ff30d0319a updated NEWS 2015-05-29 21:18:37 +02:00
Anatol Belski
8e02be16d7 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
 2015-05-29 21:18:04 +02:00
Anatol Belski
5683b6fa39 Refactored the fix for bug #66084, by cmb@php.net 2015-05-29 21:16:56 +02:00
Hannes Magnusson
8eea193470 Fix typos and add link to the phpng upgrading wiki page 2015-05-29 19:07:14 +00:00
Christoph M. Becker
36eb66692c removed test for unrelated bug #68946 2015-05-29 20:43:40 +02:00
Christoph M. Becker
f27b9ead6b fixed whitespace dependend behavior of casting SimpleXMLElements to boolean 2015-05-29 20:43:38 +02:00
Christoph M. Becker
8e5b906459 added tests for bug #61335, bug #67572 and bug #68946 (the latter already passing, but better safe than sorry) 2015-05-29 20:43:36 +02:00
Christoph M. Becker
db4a6def47 fixed whitespace depending (mis)behavior of var_dump'ing and print_r'ing SimpleXMLElements 2015-05-29 20:43:34 +02:00
Christoph M. Becker
1a3a674ee6 added failing tests for bug #62639, bug #67116, bug #69169 and bug #69491 2015-05-29 20:43:33 +02:00
Antony Dovgal
bcd5853a0b NEWS and UPGRADING entries for PR #1309 2015-05-29 18:16:07 +03:00
Antony Dovgal
110a146b88 add tests for proc_open() and pipes 2015-05-29 17:35:12 +03:00
Antony Dovgal
ad60549958 remove hardcoded limit on number of pipes in proc_open() 2015-05-29 15:30:06 +03:00
Anatol Belski
6f46fa376b add test 2015-05-29 11:48:00 +02:00
Anatol Belski
e76cf8432d fix windows version constants initialization with nts 2015-05-29 11:47:58 +02:00
Nikita Popov
39753fa222 Merge branch 'PHP-5.6' 
Preserving HAS_RETURN_TYPE for __invoke() here as well.

Conflicts:
	Zend/zend_alloc.c
 2015-05-29 11:11:02 +02:00
Nikita Popov
402f697068 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.
 2015-05-29 11:07:51 +02:00
Nikita Popov
21a29b4be3 Drop unnecessary checks for op_array->filename 
We always require a filename.
 2015-05-29 11:07:51 +02:00
Nikita Popov
e7d0ca39e5 Preserve VARIADIC flag for Closure::__invoke() 
The 13 arguments are for the benefit of PHP 7, where the first
twelve use the bitmask.
 2015-05-29 11:07:23 +02:00
Kalle Sommer Nielsen
7dcfdbbee4 Remove T1Lib support (see #69698) 
# Also removes imagepscopyfont() which was never available (commented out)
 2015-05-29 09:18:36 +02:00
Kalle Sommer Nielsen
0e079f9358 Note getrusage() for Windows in UPGRADING 2015-05-29 09:12:25 +02:00
Xinchen Hui
d844e96464 Merge branch 'master' of git.php.net:php-src 2015-05-29 13:51:02 +08:00
Xinchen Hui
ed8d1ba7dd Fixed bug #69723 (Passing parameters by reference and array_column) 2015-05-29 13:50:44 +08:00
Anatol Belski
7ab99ed4b0 manifest for the main php dll needs to be copied manually 2015-05-29 00:29:25 +02:00
Anatol Belski
66d57be2b0 pack the default manifest for devel 2015-05-28 23:23:36 +02:00
Anatol Belski
29ca3fad62 add *.manifest to cleanup 2015-05-28 23:23:33 +02:00
Anatol Belski
247fd93de9 correct manifest 2015-05-28 23:23:30 +02:00
Anatol Belski
e4ca770f95 using correct manifest, GetVersionEx can recognise versions 2015-05-28 23:23:27 +02:00
Anatol Belski
4bbfa2469e take the default manifest 
yet to be reworked for the case some custom manifest were supplied
 2015-05-28 23:23:23 +02:00
Anatol Belski
f17b732694 add default manifest 2015-05-28 23:23:21 +02:00
Anatol Belski
2802fdaf0c fixup default versions, just for the case 2015-05-28 23:23:17 +02:00
Kalle Sommer Nielsen
0a173501c8 Fix deplister with VC14, noticed by Jan Ehrhardt 2015-05-28 23:06:49 +02:00
Xinchen Hui
50e08d60b6 Attempt to fix #69643 2015-05-29 00:03:19 +08:00
Kalle Sommer Nielsen
c4e9651b58 Merge the fix for #69703 to 5.5 per request from Julien 2015-05-28 16:54:02 +02:00
Kalle Sommer Nielsen
424005a301 Shouldn't have been committed, so revert 2015-05-28 14:37:52 +02:00
Kalle Sommer Nielsen
de696d851f 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
 2015-05-28 14:30:18 +02: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