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

99637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anatol Belski
d3e08187e0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  update NEWS
 2016-09-22 12:06:44 +02:00
Anatol Belski
220b88c541 update NEWS 2016-09-22 12:06:25 +02:00
Anatol Belski
adaf68c3b1 update NEWS 2016-09-22 12:04:37 +02:00
Anatol Belski
b8ae0f7cb2 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73126 Cannot pass parameter 1 by reference
 2016-09-22 11:51:53 +02:00
Anatol Belski
b370c2b87a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73126 Cannot pass parameter 1 by reference
 2016-09-22 11:51:39 +02:00
Anatol Belski
579c8669c8 Fixed bug #73126 Cannot pass parameter 1 by reference 2016-09-22 11:49:35 +02:00
Adam Baratz
923d69590f Merge branch 'PHP-7.1' 
* PHP-7.1:
  Limit size of result set for test query
 2016-09-21 16:24:15 -04:00
Adam Baratz
e14636f4bd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Limit size of result set for test query
 2016-09-21 16:23:58 -04:00
Adam Baratz
d334d319f0 Limit size of result set for test query 
This result set can be very large, depending on the database. This change
ensures this test won't be slow.
 2016-09-21 16:21:33 -04:00
Adam Baratz
7f7cff9f02 Merge branch 'PHP-7.1' 
* PHP-7.1:
  update NEWS
  PHP bug 67130: nextRowset should work with unfetched rows
 2016-09-21 15:15:54 -04:00
Adam Baratz
5ab064caed Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  PHP bug 67130: nextRowset should work with unfetched rows
 2016-09-21 15:15:18 -04:00
Adam Baratz
4b9810b9bb update NEWS 2016-09-21 14:29:42 -04:00
Peter LeBrun
dfd6baee0c PHP bug 67130: nextRowset should work with unfetched rows 2016-09-21 14:27:23 -04:00
Adam Baratz
ddab94040b Merge branch 'PHP-7.1' 
* PHP-7.1:
  Move dtor before memory freed to avoid invalid read
 2016-09-21 12:02:42 -04:00
Adam Baratz
7726151aa8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Move dtor before memory freed to avoid invalid read
 2016-09-21 12:02:17 -04:00
Adam Baratz
b29ad29b91 Move dtor before memory freed to avoid invalid read 2016-09-21 12:00:19 -04:00
Xinchen Hui
474c38efda Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed skip
 2016-09-21 17:20:48 +08:00
Xinchen Hui
6617e87700 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed skip
 2016-09-21 17:20:35 +08:00
Xinchen Hui
56e3ec93a9 Fixed skip 2016-09-21 17:20:02 +08:00
Stanislav Malyshev
33a8af0510 Fix bug #73073 - CachingIterator null dereference when convert to string 2016-09-20 22:59:12 -07:00
Christoph M. Becker
ea52b84635 Merge branch 'PHP-7.1' 2016-09-20 12:18:55 +02:00
Christoph M. Becker
7e21cb0c99 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-20 12:18:13 +02:00
Christoph M. Becker
eeb9113b6c Skip failing FreeType tests for now 2016-09-20 12:16:16 +02:00
Dmitry Stogov
6860ce3ce9 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
 2016-09-20 12:35:14 +03:00
Dmitry Stogov
64a8048c53 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
 2016-09-20 12:34:58 +03:00
Dmitry Stogov
3c16384ea2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
 2016-09-20 12:34:40 +03:00
Dmitry Stogov
4dd70b6e2f Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply() 2016-09-20 12:29:57 +03:00
Christoph M. Becker
dc59aafa77 Merge branch 'PHP-7.1' 2016-09-20 01:38:28 +02:00
Christoph M. Becker
474428943f Merge branch 'PHP-7.0' into PHP-7.1 2016-09-20 01:32:32 +02:00
Christoph M. Becker
ba2d9e1ff1 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-20 01:25:08 +02:00
Christoph M. Becker
fc2cadca2d Merge branch 'pull-request/1845' into PHP-5.6 2016-09-20 01:05:57 +02:00
Christoph M. Becker
be30c34fb8 Sync with libgd wrt. compilation units 
* integrate gd_arc.c into gd.c (as of gd-2.1.0-alpha1)
 * rename gd_color.c to gd_color_match.c (as of gd-2.1.0-alpha1)
 * remove mathmake.c (as of GD_2_0_34RC1)
 * rename xbm.c to gd_xbm.c (as of gd-2.1.0-alpha1)
 2016-09-20 00:34:19 +02:00
Christoph M. Becker
a14c220fd9 Remove unused compilation unit 
gd_arc_f_buggy.c has already been removed in GD 2.0.34RC, so we're also
getting rid of the file.
 2016-09-19 23:48:23 +02:00
Christoph M. Becker
932c20fb8d Port variable image resolution support from libgd 2.1.0 
The PHP binding for this feature will be submitted as a separate PR.
 2016-09-19 19:00:58 +02:00
Christoph M. Becker
77ba2483d9 Port gdImageSetStyle() overflow check from libgd 2.0.29 2016-09-19 16:56:07 +02:00
George Wang
6f7479251b Merge branch 'PHP-7.1' 2016-09-19 10:52:58 -04:00
George Wang
248ef30abe Merge branch 'PHP-7.0' into PHP-7.1 2016-09-19 10:50:21 -04:00
George Wang
ca24c58e65 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-19 10:49:26 -04:00
George Wang
56fa36b0a8 Fix wrong year in previous commit. 2016-09-19 10:46:46 -04:00
Julien Pauli
f1f3544419 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Do not wrap user exception in case of custom JSON serialization
 2016-09-19 16:43:17 +02:00
Julien Pauli
7c7dc62c11 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Do not wrap user exception in case of custom JSON serialization

Conflicts:
	ext/json/json_encoder.c
 2016-09-19 16:42:53 +02:00
Julien Pauli
c4f3ea10e4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Do not wrap user exception in case of custom JSON serialization

Conflicts:
	ext/json/json.c
 2016-09-19 16:11:17 +02:00
Julien Pauli
1ed4b13fb6 Do not wrap user exception in case of custom JSON serialization 2016-09-19 16:06:12 +02:00
Julien Pauli
502dad39ba Merge branch 'PHP-7.1' 
* PHP-7.1:
  Updated NEWS
  Fix 73113 - Segfault with throwing JsonSerializable
 2016-09-19 15:25:47 +02:00
Julien Pauli
d8d4091357 Updated NEWS 2016-09-19 15:20:22 +02:00
Julien Pauli
b41abf7496 Fix 73113 - Segfault with throwing JsonSerializable 2016-09-19 15:16:14 +02:00
Xinchen Hui
fa5dda4db0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  when needle is short, Sunday algorithm is slower than glibc memchr()
 2016-09-18 16:37:20 +08:00
TAKEKOSHI Akishige
2efb131210 when needle is short, Sunday algorithm is slower than glibc memchr() 2016-09-18 16:35:09 +08:00
TAKEKOSHI Akishige
15735678c3 when needle is short, Sunday algorithm is slower than glibc memchr() 2016-09-18 15:46:40 +09:00
Nikita Popov
925c251c7b Merge branch 'PHP-7.1' 2016-09-17 22:57:07 +02:00