php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
98,807 Commits 549 Branches 1,485 Tags
a05cdd03ff2dd6b9080da06dcb5fe576887c3c32
Commit Graph

98807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov a05cdd03ff Merge branch 'PHP-7.1' 
* PHP-7.1:
  Prevent optimization of huge functions.
 2016-09-16 14:03:56 +03:00
Dmitry Stogov 846441ab4b Prevent optimization of huge functions. 2016-09-16 14:03:05 +03:00
Christoph M. Becker 3c2de0a534 Merge branch 'PHP-7.1' 2016-09-16 11:54:18 +02:00
Christoph M. Becker a8a123e36c Merge branch 'PHP-7.0' into PHP-7.1 2016-09-16 11:48:53 +02:00
Christoph M. Becker c18263e0e0 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-16 11:41:42 +02:00
Christoph M. Becker 46df064261 Fix #73003: Integer Overflow in gdImageWebpCtx of gd_webp.c 
We add the missing integer overflow check to avoid potential buffer overflows.
 2016-09-16 11:37:18 +02:00
Remi Collet 22127b7502 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test (32bits)
 2016-09-15 15:36:47 +02:00
Remi Collet db795d4c02 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test (32bits)
 2016-09-15 15:36:39 +02:00
Remi Collet d2d77c028d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix test (32bits)
 2016-09-15 15:36:26 +02:00
Remi Collet 3c117d4136 fix test (32bits) 2016-09-15 15:32:39 +02:00
Remi Collet 4cc2b7efa0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix ZTS build
 2016-09-15 13:30:08 +02:00
Remi Collet f5abe9ff57 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix ZTS build
 2016-09-15 13:29:44 +02:00
Remi Collet 19e04784ac Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix ZTS build
 2016-09-15 13:29:26 +02:00
Remi Collet 55237fe153 fix ZTS build 2016-09-15 13:27:20 +02:00
Christoph M. Becker ba2b50d097 Port optimization from external libgd 
The functionality is identical, but we save two function calls for partially
transparent pixels.
 2016-09-15 13:24:43 +02:00
Christoph M. Becker 04b166a6c5 Removed unused function 
The earlier gdAlphaBlend() has been replaced with commit 1286d9e2, and has
been renamed to gdAlphaBlendOld(). The old function is, however, not used,
and after more than 9 years we're pretty sure we won't need it anymore.
 2016-09-15 13:04:30 +02:00
Ferenc Kovacs d6f9c49e89 Merge branch 'PHP-7.1' 2016-09-15 11:40:22 +02:00
Ferenc Kovacs 4b9ec20b0e Merge branch 'PHP-7.0' into PHP-7.1 2016-09-15 11:38:49 +02:00
Ferenc Kovacs 30b7f72300 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-15 11:37:30 +02:00
Ferenc Kovacs 1d7484077a update NEWS 2016-09-15 11:35:46 +02:00
Dmitry Stogov 902e9ad014 Special handling for $php_errormsg and $http_response_header. 2016-09-15 03:07:31 +03:00
Christoph M. Becker fca15a6b75 Merge branch 'PHP-7.1' 2016-09-15 01:08:29 +02:00
Christoph M. Becker 41001f8bb5 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-15 00:55:41 +02:00
Christoph M. Becker cf9e2fbbf6 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-15 00:50:49 +02:00
Christoph M. Becker 7bfb7b62b1 Fix and reactivate regression test for bug #50194 
Apparently, different FreeType versions render the string differently, so
we have to cater to these slight differences. Unfortunately, the testing
framework doesn't yet offer a clean API for this, so we work around the
limitations by parsing and checking the output of test_image_equals_file().
 2016-09-15 00:46:00 +02:00
Yasuo Ohgaki 838eb6398e Fix bug number in NEWS 2016-09-15 06:57:29 +09:00
Adam Baratz b424d9f270 Mark change with relevant bug number 2016-09-14 17:44:56 -04:00
Yasuo Ohgaki 6e530502d2 Implemented Bug #68776 mail() does not have mail header injection prevention for additional headers 
(PR 2060)
 2016-09-15 06:43:57 +09:00
Christoph M. Becker dbdc7cb057 Remove unnecessary #ifdef 
The bundled libgd also defines gdImageAlphaBlending(), and this is the
preferred way to set the alphaBlendingFlag member anyway.
 2016-09-14 23:38:02 +02:00
Christoph M. Becker 10fe6afc35 Merge branch 'PHP-7.1' 2016-09-14 20:03:42 +02: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 0c7f62a37b Merge branch 'PHP-7.1' 
* PHP-7.1:
  Skip test for early TDS versions
 2016-09-14 11:07:57 -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 f81f40fbd3 Remove unused code which is also not there in external libgd 2016-09-14 17:01:41 +02:00
Christoph M. Becker aad54b7c5f Merge branch 'PHP-7.1' 2016-09-14 16:11:04 +02: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 7d71a0a608 Merge branch 'PHP-7.1' 2016-09-14 12:35:53 +01: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 6053987bc2 Merge branch 'PHP-7.1' 2016-09-14 12:43:59 +02:00
Christoph M. Becker 219d8599b0 Fix #72430: [] operator not supported for strings 2016-09-14 12:43:22 +02:00
Anatol Belski e3ba3d703b Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix erroneous resource destruction
  Sync NEWS
 2016-09-14 12:09:58 +02:00
Anatol Belski 001fbbb94f fix erroneous resource destruction 2016-09-14 12:07:38 +02:00