archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
99637 commits 526 branches 1434 tags 880 MiB
Commit graph

99637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joe Watkins
160832e311 fix user filter bug 2016-09-30 07:22:07 +01:00
Joe Watkins
a8d031fbd8 fix user filter bug 2016-09-30 07:21:01 +01:00
Xinchen Hui
1bc3e1b4c3 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Use smart branch
 2016-09-30 13:19:39 +08:00
Xinchen Hui
f211614ba7 Use smart branch 2016-09-30 13:19:11 +08:00
Dmitry Stogov
6a0f73902a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Special handling for $php_errormsg and $http_response_header.
 2016-09-30 02:42:05 +03:00
Dmitry Stogov
c218c4f01e Special handling for $php_errormsg and $http_response_header. 2016-09-30 02:41:08 +03:00
Christoph M. Becker
9f128ef5f4 Merge branch 'PHP-7.1' 2016-09-29 14:42:48 +02:00
Christoph M. Becker
0edb16e768 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-29 14:41:12 +02:00
Christoph M. Becker
81cbbb68af Merge branch 'pull-request/2128' into PHP-7.0 2016-09-29 14:39:39 +02:00
Anatol Belski
e017b940ab Merge branch 'PHP-7.1' 
* PHP-7.1:
  sync win32 makefile with makedist zendparse exports
 2016-09-29 13:02:54 +02:00
Anatol Belski
3828323290 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  sync win32 makefile with makedist zendparse exports
 2016-09-29 13:02:03 +02:00
Anatol Belski
62bed405da sync win32 makefile with makedist zendparse exports 
With a newer bison this part is relevant. Whil bison 2.4.1 is still
used, this changes cater for the forward compatibility.
 2016-09-29 12:56:49 +02:00
Dmitry Stogov
3e0e404173 Merge branch 'PHP-7.1' 
* PHP-7.1:
  zval_dtor_func_for_ptr() -> zval_dtor_func()
 2016-09-29 11:00:13 +03:00
Dmitry Stogov
53c0a04185 zval_dtor_func_for_ptr() -> zval_dtor_func() 2016-09-29 10:59:54 +03:00
Dmitry Stogov
02a6c3a343 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
 2016-09-29 10:57:39 +03:00
Dmitry Stogov
8863ca76e6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
 2016-09-29 10:57:09 +03:00
Dmitry Stogov
e7f4355d9b Better fix for bug #72854 (avoid extra copy and creating reference to stack variable) 2016-09-29 10:56:01 +03:00
Stanislav Malyshev
da7e89cde8 Fix bug #73189 - Memcpy negative size parameter php_resolve_path 2016-09-28 23:30:48 -07:00
Stanislav Malyshev
29e2a204fb Fixed bug #73174 - heap overflow in php_pcre_replace_impl 2016-09-28 22:29:59 -07:00
Ferenc Kovacs
c7f322181b Merge branch 'PHP-7.1' 2016-09-29 01:02:20 +02:00
Ferenc Kovacs
36d5bed262 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-29 00:59:50 +02:00
Ferenc Kovacs
581e890483 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	configure.in
	main/php_version.h
 2016-09-29 00:58:02 +02:00
Ferenc Kovacs
703c247c7d 5.6.28 is next 2016-09-29 00:55:36 +02:00
Derick Rethans
ccc75b4299 Updated to version 2016.7 (2016g) 2016-09-28 23:30:29 +01:00
Derick Rethans
5492d99b0e Empty merge 2016-09-28 23:30:29 +01:00
Derick Rethans
1350c6431a Updated to version 2016.7 (2016g) 2016-09-28 23:30:28 +01:00
Derick Rethans
9422de24d2 Empty merge 2016-09-28 23:30:28 +01:00
Derick Rethans
83780a6cd2 Updated to version 2016.7 (2016g) 2016-09-28 23:30:27 +01:00
Derick Rethans
03ac064b2e Empty merge 2016-09-28 23:30:27 +01:00
Derick Rethans
6a544f2d1e Updated to version 2016.7 (2016g) 2016-09-28 23:30:26 +01:00
Nikita Popov
6ec5816899 Merge branch 'PHP-7.1' 2016-09-28 23:23:01 +02:00
Nikita Popov
56a7646ab2 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-28 23:22:48 +02:00
Nikita Popov
e520b9e127 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-28 23:22:11 +02:00
Nikita Popov
1f5412982c Handle resource keys in constexpr arrays 2016-09-28 23:11:02 +02:00
Nikita Popov
40b8105cca Fix the constant array case as well 2016-09-28 23:05:21 +02:00
Nikita Popov
5bdd732d21 Merge branch 'PHP-7.1' 2016-09-28 22:39:17 +02:00
Nikita Popov
97066792b7 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-28 22:38:47 +02:00
Nikita Popov
437942d972 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-28 22:36:58 +02:00
Nikita Popov
99bf19c177 Check next_index_insert failure in ADD_ARRAY_ELEMENT 2016-09-28 22:35:27 +02:00
Davey Shafik
a61bc294db Prepare to Re-roll 7.1.0RC3 2016-09-28 13:02:02 -07:00
Nikita Popov
208fcee115 Merge branch 'PHP-7.1' 2016-09-28 21:43:58 +02:00
Nikita Popov
19f1ff5ad0 Combine code for keyed/unkeyed list() 2016-09-28 21:43:48 +02:00
Nikita Popov
6f9e5684a1 Fix segfault when empty entry in keyed array assignment 2016-09-28 21:43:48 +02:00
Anatol Belski
3e7739a2db Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix exports which are now referenced by phpdbg
  Update UPGRADING to reflect new reality
  Update NEWS for 7.1.0RC4
  Update NEWS
 2016-09-28 21:30:59 +02:00
Anatol Belski
22a3d55e9a fix exports which are now referenced by phpdbg 
(cherry picked from commit cd0f1c8a5e)
 2016-09-28 21:29:53 +02:00
Davey Shafik
94f7e4a5f4 Update UPGRADING to reflect new reality 2016-09-28 11:24:43 -07:00
Davey Shafik
a8c3174d51 Update NEWS for 7.1.0RC4 2016-09-28 18:07:19 +00:00
Anatol Belski
cd0f1c8a5e fix exports which are now referenced by phpdbg 2016-09-28 20:06:10 +02:00
Davey Shafik
bc4e09f497 Update NEWS 2016-09-28 10:31:22 -07:00
Nikita Popov
3d04b5c288 Merge branch 'PHP-7.1' 2016-09-28 19:23:09 +02:00