clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,002 Commits 493 Branches 1,366 Tags 848 MiB
8f9af36da3
Commit Graph

93002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
8f9af36da3 Fixed bug #71144 (Sementation fault when using cURL with ZTS) 2015-12-19 00:29:19 +08:00
Xinchen Hui
916f10ac31 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-12-19 00:20:18 +08:00
Xinchen Hui
512498d083 Fixed test skip 2015-12-19 00:19:21 +08:00
Xinchen Hui
b715845650 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
 2015-12-18 17:44:05 +08:00
Xinchen Hui
361b5814de Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:/php-src:
  Align news entry format: Implement FR -> Implemented FR
 2015-12-18 17:43:25 +08:00
Xinchen Hui
2f47e9872e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Improved fix for #71127

Conflicts:
	ext/opcache/Optimizer/pass1_5.c
 2015-12-18 17:41:42 +08:00
Xinchen Hui
40702799b5 Improved fix for #71127 2015-12-18 17:37:40 +08:00
Andrea Faulds
4e01269082 Fix tests broken by 'Fix bug #52355' 
a4648ded43 broke some tests
 2015-12-17 23:33:24 +00:00
Andrea Faulds
a4648ded43 Fix bug #52355 2015-12-17 22:39:29 +00:00
Nikita Popov
a917840f38 Fixed iter leak on by-ref foreach over const/tmp array 
FE_FREE does not unregister the iter for plain arrays. So always
wrap into a REF wrapper, even if not strictly necessary, in
RESET_RW. Alternatively we could use a flag to distinguish plain
positions and interators.

Also added a check for leaked iterators in shutdown_executor.
 2015-12-17 23:21:48 +01:00
Nikita Popov
6a4c02e107 Fixed bug #71154 2015-12-17 22:20:29 +01:00
George Wang
0a1a4dc033 Fixed a bug in apache_request_headers() that adds an extra \0 to header name. 2015-12-17 15:20:08 -05:00
Nikita Popov
a3e1952700 Fixed bug #71153 2015-12-17 20:59:57 +01:00
Dmitry Stogov
9e44b6a61e Fixed incorrect exception handling 2015-12-17 14:16:19 +03:00
Lior Kaplan
860ef0e2d7 Align NEWS entry format 2015-12-17 11:39:09 +02:00
Lior Kaplan
38e16154dd Align news entry format: Implement FR -> Implemented FR 2015-12-17 11:38:07 +02:00
Lior Kaplan
c537039fcb Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Align news entry format: Implement FR -> Implemented FR
 2015-12-17 11:29:47 +02:00
Lior Kaplan
e61bb3fbf9 Align news entry format: Implement FR -> Implemented FR 2015-12-17 11:27:41 +02:00
Xinchen Hui
1b4e224c98 Update NEWs 2015-12-17 14:30:41 +08:00
Xinchen Hui
9374977d21 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/opcache/Optimizer/pass1_5.c
 2015-12-17 14:30:00 +08:00
Xinchen Hui
940c68b55d Fixed bug #71127 (Define in auto_prepend_file is overwrite) 2015-12-17 14:27:33 +08:00
Dmitry Stogov
c7c3b967a5 Removed invalid efree() (arguments are allocated on VM stack and used without copying) 2015-12-16 15:25:49 +03:00
Lior Kaplan
96fe1dfe53 Add entry for session.lazy_write 2015-12-16 11:37:43 +02:00
Lior Kaplan
ef9ddd0d82 Remove sqlite extension leftover references (was removed in PHP 5.4) 2015-12-16 09:40:02 +02:00
Yasuo Ohgaki
57be57ac94 Fix ZTS build 2015-12-16 11:10:39 +09:00
Yasuo Ohgaki
707e1c4710 Fixed test 2015-12-16 09:35:45 +09:00
Yasuo Ohgaki
714f28d8e4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #71122 Session GC may not remove obsolete session data
 2015-12-16 09:34:41 +09:00
Yasuo Ohgaki
e8f1c29cc9 Fixed bug #71122 Session GC may not remove obsolete session data 2015-12-16 09:15:05 +09:00
Lior Kaplan
838e4039d7 Remove extra line 2015-12-15 11:15:30 +02:00
Lior Kaplan
66d1d10917 NEWS entry for #55651 2015-12-15 11:13:54 +02:00
Avi Brender
90a26a4844 Implement FR #55651 (Option to ignore the returned FTP PASV address) 2015-12-15 11:07:40 +02:00
Yasuo Ohgaki
071616026f Update NEWS 2015-12-15 10:40:07 +09:00
Yasuo Ohgaki
8161230505 Fixed Bug #71122 Session GC may not remove obsolete session data 2015-12-15 10:27:28 +09:00
Xinchen Hui
3d3782c328 Unused vars 2015-12-14 09:23:01 -08:00
Lior Kaplan
94f3887152 NEWS entry for #55651 2015-12-15 11:52:33 +02:00
Avi Brender
71e468e141 Implement FR #55651 (Option to ignore the returned FTP PASV address) 2015-12-15 11:51:32 +02:00
Yasuo Ohgaki
e048b3fc6b Update NEWS 2015-12-15 10:41:39 +09:00
Yasuo Ohgaki
1e042ae4a7 Fix merge conflict 2015-12-15 10:30:16 +09:00
Rasmus Lerdorf
56bf10f0bd Support uwsgi sapi in opcache 2015-12-14 06:10:26 -08:00
Rasmus Lerdorf
9a31d70845 Support uwsgi sapi in opcache 2015-12-14 06:09:17 -08:00
Anthony Ferrara
02e85045dc Refactor password_hash to use random_bytes internally to generate salts 2015-12-14 09:05:16 +01:00
Xinchen Hui
6a35e3b383 Added NEWS 2015-12-14 10:54:10 +08:00
Nikita Popov
7dc5bc5063 Do not swap operands in array addition 
As we support constant array operands nowadays, the original check
didn't work anymore.
 2015-12-14 00:29:05 +01:00
Xinchen Hui
07b33992a2 Fixed bug #71109 (ZEND_MOD_CONFLICTS("xdebug") doesn't work) 2015-12-13 05:06:08 -08:00
Xinchen Hui
4171a8f6c6 Internal function argumensts cleanup (strict_types) 2015-12-12 22:52:37 -08:00
Xinchen Hui
a9026070b6 Fixed test 2015-12-12 22:37:50 -08:00
Xinchen Hui
b101a6bbd4 Use format string 2015-12-12 18:45:11 -08:00
Christopher Jones
e0691d27d5 Merge branch 'PHP-5.6' into PHP-7.0 2015-12-13 08:22:14 +11:00
Christopher Jones
82d58e6cbc Update README 2015-12-13 08:21:41 +11:00
Reeze Xia
95ad414658 Unused value casting should be void 2015-12-12 23:25:30 +08:00