php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 15:12:39 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,045 Commits 547 Branches 1,481 Tags
cb54fada51adfa9d19ee21740efe09bf3b2befe1
Commit Graph

74045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rasmus Lerdorf
cb54fada51 Fixed bugs #47675 and #64577 (fd leak on Solaris) 2013-04-04 19:24:12 -07:00
Johannes Schlüter
e9cc55a803 Merge branch 'PHP-5.5' 2013-04-04 15:38:35 +02:00
Johannes Schlüter
9587cf385e Improve warning when trying to load zend ext as PHP module 2013-04-04 15:36:46 +02:00
Xinchen Hui
2794d455ea Merge branch 'PHP-5.5' 2013-04-04 19:31:21 +08:00
Xinchen Hui
01ca2bf8c3 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/curl/interface.c
 2013-04-04 19:31:14 +08:00
Xinchen Hui
185e5e15ae s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED, 2013-04-04 19:28:17 +08:00
Xinchen Hui
4788a961f1 Merge branch 'PHP-5.5' 2013-04-04 14:56:10 +08:00
Xinchen Hui
aac43c9ee8 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-04 14:56:00 +08:00
Xinchen Hui
4f2acd8cde Update test script to make sure the error occurred 2013-04-04 14:55:17 +08:00
Xinchen Hui
4d66b3b589 no tab here 2013-04-04 14:53:30 +08:00
Xinchen Hui
5f969c1d46 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-04 14:53:17 +08:00
Xinchen Hui
846d298f9b Merge branch 'PHP-5.3' into PHP-5.4 2013-04-04 14:53:06 +08:00
Xinchen Hui
9883d8d3e5 no tab here 2013-04-04 14:52:59 +08:00
Xinchen Hui
934dfae4e1 no tab here 2013-04-04 14:52:27 +08:00
Xinchen Hui
cf0ee2d332 Merge branch 'PHP-5.5' 2013-04-04 14:49:58 +08:00
Xinchen Hui
34c5b80595 Update NEWs 2013-04-04 14:49:22 +08:00
Xinchen Hui
65e368debd Merge branch 'PHP-5.4' into PHP-5.5 2013-04-04 14:48:53 +08:00
Xinchen Hui
82ac3106e0 Use 5.4 specifical warnnig & Update NEWs 2013-04-04 14:47:49 +08:00
Xinchen Hui
f4f8b5a94b Merge branch 'PHP-5.3' into PHP-5.4 2013-04-04 14:44:28 +08:00
Xinchen Hui
c96a5bc6be Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault) 2013-04-04 14:34:11 +08:00
Xinchen Hui
db3d629f05 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-04 13:40:46 +08:00
Xinchen Hui
7fc8077e4c Fixed Bug #64578 2013-04-04 13:40:21 +08:00
Nikita Popov
d1ee0349d6 Merge branch 'PHP-5.5' 2013-04-03 20:30:31 +02:00
Nikita Popov
1f34ccbe34 Fix bug #64555: foreach no longer copies keys if they are interned 2013-04-03 20:29:19 +02:00
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