Commit Graph

98367 Commits

Author SHA1 Message Date
Adam Baratz
b424d9f270 Mark change with relevant bug number 2016-09-14 17:44:56 -04:00
Christoph M. Becker
1c8c61f142 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-14 20:03:00 +02:00
Christoph M. Becker
7a923c3afe Merge branch 'PHP-5.6' into PHP-7.0 2016-09-14 20:02:05 +02:00
Christoph M. Becker
36df4f8419 Skip ext/gd/tests/bug50194.phpt for now
There are apparently issues with the font rendering with different freetype
version; I'll have a look at this issue ASAP.
2016-09-14 20:00:30 +02:00
Adam Baratz
744d1b3c76 Add pdo_dblib changes 2016-09-14 11:19:31 -04:00
Adam Baratz
2f99f702b7 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Skip test for early TDS versions
2016-09-14 11:07:26 -04:00
Adam Baratz
f559fb7556 Skip test for early TDS versions 2016-09-14 11:06:54 -04:00
Christoph M. Becker
b1a65452a1 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-14 16:01:02 +02:00
Christoph M. Becker
bc27ce98ee Merge branch 'PHP-5.6' into PHP-7.0 2016-09-14 15:50:09 +02:00
Christoph M. Becker
09eb6ed35e Fix #50194: imagettftext broken on transparent background w/o alphablending
We must not draw the background pixels of the character glyphs, what has
already been fixed in GD 2.0.26.
2016-09-14 15:47:32 +02:00
Davey Shafik
ad8e7747bf Update NEWS for 7.1.0RC3 2016-09-14 12:26:18 +00:00
Jakub Zelenka
25b4bd1606 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-14 12:34:39 +01:00
Jakub Zelenka
cfc8522238 Sync NEWS for bug #73072 2016-09-14 12:31:45 +01:00
Christoph M. Becker
219d8599b0 Fix #72430: [] operator not supported for strings 2016-09-14 12:43:22 +02:00
Anatol Belski
001fbbb94f fix erroneous resource destruction 2016-09-14 12:07:38 +02:00
Davey Shafik
acc574d76b Sync NEWS 2016-09-13 19:38:39 -07:00
Adam Baratz
f6b6e97b29 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Add special case for earlier versions of TDS
  Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib
  Free error and message strings when cleaning up PDO instances that use pdo_dblib
  Add common suite
2016-09-13 17:02:53 -04:00
Adam Baratz
bcee34c649 Add special case for earlier versions of TDS 2016-09-13 17:01:51 -04:00
Adam Baratz
0de333bd62 Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib 2016-09-13 16:43:33 -04:00
Adam Baratz
69eef8c361 Free error and message strings when cleaning up PDO instances that use pdo_dblib 2016-09-13 16:43:30 -04:00
Adam Baratz
efadcb0390 Add common suite 2016-09-13 16:43:25 -04:00
Adam Baratz
45850213bd Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Explicitly allow NULL values for dblib compatibility
  Add dblib-specific query
  Remove test cases don't test distinct behavior
2016-09-13 16:38:56 -04:00
Adam Baratz
9fb94f03e7 Explicitly allow NULL values for dblib compatibility
MSSQL won't necessarily default columns to NULL, see:
https://msdn.microsoft.com/en-us/library/ms174979.aspx
2016-09-13 16:36:23 -04:00
Adam Baratz
69013f6b26 Add dblib-specific query 2016-09-13 16:36:23 -04:00
Adam Baratz
f0a12af65b Remove test cases don't test distinct behavior
These cases are also incompatible with pdo_dblib. Removing is easier.
2016-09-13 16:36:23 -04:00
Adam Baratz
c02ff02953 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Handle SQLDECIMAL/SQLNUMERIC types, which are used by later TDS versions
2016-09-13 16:33:18 -04:00
Adam Baratz
91c49c4ab0 Handle SQLDECIMAL/SQLNUMERIC types, which are used by later TDS versions 2016-09-13 16:32:37 -04:00
Adam Baratz
421f654874 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Allow \PDO::setAttribute() to set pdo_dblib query timeouts
2016-09-13 16:14:55 -04:00
Adam Baratz
9cdf2042bd Allow \PDO::setAttribute() to set pdo_dblib query timeouts 2016-09-13 16:13:26 -04:00
Jakub Zelenka
1b1b7f8809 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-13 18:27:55 +01:00
Jakub Zelenka
3a739c9f9f Merge branch 'PHP-5.6' into PHP-7.0 2016-09-13 18:19:20 +01:00
Jakub Zelenka
05baa92727 Fix bug #73072 (Invalid path SNI_server_certs causes segfault) 2016-09-13 18:15:34 +01:00
Christoph M. Becker
db95bd5807 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-13 16:00:01 +02:00
Christoph M. Becker
c8a9ad1527 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-13 15:59:12 +02:00
Christoph M. Becker
c43ecfd798 Merge branch 'pull-request/2126' into PHP-5.6 2016-09-13 15:57:39 +02:00
Anatol Belski
0492a05f97 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
2016-09-13 15:56:16 +02:00
Anatol Belski
667d8d3522 update NEWS 2016-09-13 15:55:31 +02:00
Anatol Belski
252b28dbb6 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
  upgrade bundled sqlite to 3.14.2
2016-09-13 15:46:55 +02:00
Anatol Belski
598ed66f82 update NEWS 2016-09-13 15:45:18 +02:00
Anatol Belski
1382e88ac1 upgrade bundled sqlite to 3.14.2 2016-09-13 15:44:21 +02:00
Anatol Belski
86d6f29e8f Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  add test for bug #73068
2016-09-13 15:30:35 +02:00
Anatol Belski
5163925796 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  add test for bug #73068
2016-09-13 15:29:46 +02:00
Anatol Belski
248f8c3a91 add test for bug #73068 2016-09-13 15:28:28 +02:00
Christoph M. Becker
07aab07ce5 Update to SQLite 3.14.2 2016-09-13 13:40:18 +02:00
Anatol Belski
128043babe Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
2016-09-13 12:34:55 +02:00
Anatol Belski
941b56dd4a update NEWS 2016-09-13 12:34:03 +02:00
Anatol Belski
2820adcc7e Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix test portability
2016-09-13 12:09:50 +02:00
Anatol Belski
855b8e4f79 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix test portability
2016-09-13 12:02:05 +02:00
Anatol Belski
fc31d6fed4 fix test portability 2016-09-13 12:00:29 +02:00
Anatol Belski
2088e3eb45 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  pick up the safe alloc pieces from 19866fb76c
2016-09-13 11:51:17 +02:00