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
Nikita Popov
9e2df3b6b2 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-17 22:56:36 +02:00
Nikita Popov
01759c4346 Add test for bug #72489 2016-09-17 22:54:25 +02:00
Nikita Popov
896814e139 Make zval_ptr_dtor / _zval_dtor_func more robust 
In particular, allow arrays with refcount>1, like we already allow
for all other types. _zval_dtor_func is now the same as
_zval_dtor_func_for_ptr with an extra refcount decrement check at
the start. At this point we might as well drop it...

Cherry-pick of ded69ee6e6 from
PHP-7.1.
 2016-09-17 22:33:41 +02:00
Anatol Belski
f3032fe359 fix argon2 lib names 2016-09-17 13:10:01 +02:00
Christoph M. Becker
e1a3541ef8 Merge branch 'PHP-7.1' 2016-09-17 00:02:30 +02:00
Christoph M. Becker
eac277ed83 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-16 23:50:00 +02:00
Christoph M. Becker
48cf8dd9c3 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-16 23:43:18 +02:00
Christoph M. Becker
6682673070 Fix #73100: session_destroy null dereference in ps_files_path_create 2016-09-16 23:41:10 +02:00
Nikita Popov
1a94b24ca5 Use zend_string_free instead of efree 
Fingers crossed I didn't break the build.
 2016-09-16 21:30:26 +02:00
Nikita Popov
dd7affa9ff Merge branch 'PHP-7.1' 2016-09-16 21:06:52 +02:00
Nikita Popov
cab7bc7e07 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-16 21:06:11 +02:00
Michael Orlitzky
0e76cafaf1 Disable add/sub asm for gcc 4.9 pic/pie builds 2016-09-16 21:06:02 +02:00
Xinchen Hui
bc61ba1133 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Updte NEWS
  Fixed bug #72505 (readfile() mangles files larger than 2G)
 2016-09-16 20:56:55 +08:00
Xinchen Hui
12755437cb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Updte NEWS
  Fixed bug #72505 (readfile() mangles files larger than 2G)
 2016-09-16 20:56:29 +08:00
Xinchen Hui
0ad82e41f2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updte NEWS
  Fixed bug #72505 (readfile() mangles files larger than 2G)
 2016-09-16 20:55:54 +08:00
Xinchen Hui
01c7c6b152 Updte NEWS 2016-09-16 20:55:37 +08:00
Xinchen Hui
ac07008bb7 Fixed bug #72505 (readfile() mangles files larger than 2G) 2016-09-16 20:53:51 +08:00
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
Christoph M. Becker
44968927d7 Add CURLE_SSL_PINNEDPUBKEYNOTMATCH 
This error constant is returned on key mismatch when CURLOPT_PINNEDPUBLICKEY
is used. As the option had been introduced in PHP 7.0.7, it makes sense to
also add the related error constant to PHP 7.0+.

Cf. <https://curl.haxx.se/libcurl/c/CURLOPT_PINNEDPUBLICKEY.html>.
 2016-09-15 12:20:19 +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