php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,021 Commits 549 Branches 1,486 Tags
8333dcce68581b6ad1e1701a693c3687f694de82
Commit Graph

74021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui 8333dcce68 Merge branch 'PHP-5.5' 2013-04-03 19:52:56 +08:00
Xinchen Hui 42f94aa978 Fix test due to opcache 2013-04-03 19:52:09 +08:00
Xinchen Hui e15a97f924 Merge branch 'PHP-5.5' 2013-04-03 18:51:44 +08:00
Xinchen Hui bbb4a44f98 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-03 18:51:19 +08:00
ptarjan 99ad08f9a5 Fix #64572: Clean up after the test 
Lets not leave stuff lying around.
 2013-04-03 18:50:27 +08:00
ptarjan e8d80b770b Fix #64572: Clean up after the test 
Lets not leave stuff lying around.
 2013-04-03 18:50:18 +08:00
Xinchen Hui 4799c8370b Merge branch 'PHP-5.5' 2013-04-03 10:21:24 +08:00
Xinchen Hui f5f3ab1b3f format 2013-04-03 10:21:06 +08:00
Xinchen Hui 0495061a8f Merge branch 'PHP-5.4' into PHP-5.5 2013-04-03 10:20:52 +08:00
Xinchen Hui e34767d426 format 2013-04-03 10:20:33 +08:00
Xinchen Hui bd6a90dac7 Merge branch 'PHP-5.5' 2013-04-03 10:17:49 +08:00
Xinchen Hui bb70176328 Update NEWS & UPGRADING 2013-04-03 10:17:27 +08:00
Xinchen Hui 6ace9c646b Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/curl/interface.c
 2013-04-03 10:15:41 +08:00
Xinchen Hui 78a9489f6a Use new constant replace ugly trick 2013-04-03 10:12:49 +08:00
Xinchen Hui 37b20a1bc2 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-04-03 10:11:33 +08:00
Xinchen Hui d7f709a032 Add CURL_WRAPPERS_ENABLE constant 
see http://news.php.net/php.internals/66871
 2013-04-03 10:09:51 +08:00
Remi Collet 688f5fc889 NEW for #64565 2013-04-02 16:34:39 +02:00
Remi Collet c51e32860a NEW for #64565 2013-04-02 16:33:54 +02:00
Remi Collet db037caf18 Merge branch 'PHP-5.5' 
* PHP-5.5:
  keep previous test to avoid any behavior change
 2013-04-02 16:31:54 +02:00
Remi Collet 44dbe6a815 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  keep previous test to avoid any behavior change
 2013-04-02 16:31:45 +02:00
Remi Collet 731a5c5104 keep previous test to avoid any behavior change 2013-04-02 16:31:36 +02:00
Remi Collet 6cad4398a8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix comment
  Fixed Bug #64565 copy doesn't report failure on partial copy
 2013-04-02 16:24:33 +02:00
Remi Collet ce89bc8743 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix comment
  Fixed Bug #64565 copy doesn't report failure on partial copy
 2013-04-02 16:24:14 +02:00
Remi Collet 8e8a75444c fix comment 2013-04-02 16:24:00 +02:00
Remi Collet 6b4148bc97 Fixed Bug #64565 copy doesn't report failure on partial copy 
_php_stream_copy_to_stream_ex, when mmap is possible, doesn't check
if actually written bytes match read bytes.

Fix this (paranoid check) to be consistent with non mmap mode

Seems hard to add a unit test, as this rely on a full filesystem.
 2013-04-02 16:18:26 +02:00
Rasmus Lerdorf 91c514c49a Merge branch 'PHP-5.5' 2013-04-01 16:30:34 -07:00
Rasmus Lerdorf 608b195c59 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-01 16:30:10 -07:00
Rasmus Lerdorf 527ac404a1 The printf modifier for a double is just %f 2013-04-01 16:27:09 -07:00
Dmitry Stogov 11262fba8e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed ZTS build
 2013-04-01 21:17:26 +04:00
Dmitry Stogov 23b44e7f39 Fixed ZTS build 2013-04-01 21:16:33 +04:00
Xinchen Hui aa1c764e3e Merge branch 'PHP-5.5' 2013-04-01 19:16:44 +08:00
Xinchen Hui d8a5f41a60 Fixed bug parameter is casted to string of array_column 2013-04-01 19:11:45 +08:00
Xinchen Hui 79f68e285d Merge branch 'PHP-5.5' 2013-04-01 18:17:53 +08:00
Xinchen Hui 3b504a3717 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-01 18:17:28 +08:00
Xinchen Hui 7b07d05917 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-01 18:13:38 +08:00
Xinchen Hui 9456dac54e Fix test 2013-04-01 18:12:16 +08:00
Dmitry Stogov 71a45bec35 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed issue #79 (Optimization Problem/Bug)
  fix coverage data for the opcache optimizer
 2013-04-01 11:34:37 +04:00
Dmitry Stogov 74f158fb9d Fixed issue #79 (Optimization Problem/Bug) 2013-04-01 11:33:04 +04:00
Nuno Lopes 586dc07a8a fix coverage data for the opcache optimizer 2013-03-31 15:45:15 -04:00
Nuno Lopes ed54776960 fix coverage data for the opcache optimizer 2013-03-31 15:43:08 -04:00
Xinchen Hui 971676e859 Merge branch 'PHP-5.5' 2013-03-31 21:27:22 +08:00
Xinchen Hui ad7c0b1928 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-31 21:26:26 +08:00
Xinchen Hui 72426a446d Skip test when --with-curlwrappers enabled. 2013-03-31 21:22:48 +08:00
Xinchen Hui f4e16fe7ef Merge branch 'PHP-5.5' 2013-03-31 20:08:40 +08:00
Xinchen Hui 2f6b9b970c Fix typo (it's in DateTime::__wakeup) 2013-03-31 20:07:14 +08:00
Derick Rethans 6cdf379185 Merge branch 'PHP-5.5' 2013-03-31 11:07:49 +01:00
Derick Rethans 503760c913 Updated test case and added BFN to NEWS. 2013-03-31 11:07:24 +01:00
EC2 Default User b07ecb5501 Bug #60774 (DateInterval::format("%a") is always zero when an interval is 
created using the createFromDateString method)
 2013-03-31 10:59:21 +01:00
Derick Rethans 13004550a7 Merge branch 'PHP-5.5' 2013-03-31 10:56:23 +01:00
Derick Rethans 84208d9dc5 Added the new .c files as well as they are not automatically regenerated. 2013-03-31 10:55:45 +01:00