archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
110438 commits 526 branches 1434 tags 883 MiB
Commit graph

49866 commits

Author SHA1 Message Date
Frank Denis
542d0bce50 ext/sodium: Correct base64 decoding with unpadded variants 
Backports 0eee0b957a3b75f8175cdd30b306c15e372685e8 from the PECL extension
 2018-11-24 17:53:08 +01:00
Christoph M. Becker
c005c67ee7 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fix test case
 2018-11-24 13:41:40 +01:00
Christoph M. Becker
aab9aa7661 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix test case
 2018-11-24 13:38:09 +01:00
Christoph M. Becker
5af5f56fc9 Fix test case 2018-11-24 13:36:42 +01:00
Christoph M. Becker
2e4b6624cb Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fix #77195: Incorrect error handling of imagecreatefromjpeg()
 2018-11-24 12:58:57 +01:00
Christoph M. Becker
caabf3a1bb Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77195: Incorrect error handling of imagecreatefromjpeg()
 2018-11-24 12:57:44 +01:00
Christoph M. Becker
60a9f7a3a3 Fix #77195: Incorrect error handling of imagecreatefromjpeg() 
The broken JPEG image triggers a notice, two warnings and outputs a
message to stderr directly.  The additional notice is pretty useless,
and the direct output to stderr is bad.  Therefore, we port the
relevant differences from upstream to our bundled libgd.  This leaves
us with two warnings; the first one is triggered by libjpeg and shows
the actual problem, the second one is triggered by our libgd wrapper
whenever an image can't be read, what may not have necessarily
triggered a warning before.
 2018-11-24 12:52:08 +01:00
Christoph M. Becker
a4093d0531 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fix #77177: Serializing or unserializing COM objects crashes
 2018-11-23 16:36:48 +01:00
Christoph M. Becker
b0a86566dc Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77177: Serializing or unserializing COM objects crashes
 2018-11-23 16:36:00 +01:00
Christoph M. Becker
115ee49b0b Fix #77177: Serializing or unserializing COM objects crashes 
Firstly, we avoid returning NULL from the get_property handler, but
instead return an empty HashTable, which already prevents the crashes.
Secondly, since (de-)serialization obviously makes no sense for COM,
DOTNET and VARIANT objects (at least with the current implementation),
we prohibit it right away.
 2018-11-23 16:32:33 +01:00
Dmitry Stogov
48b9594227 Don't preload functions and classes declared outside of preloaded scripts (e.g. by eval code). 2018-11-23 03:59:47 +03:00
Dmitry Stogov
b076a91c50 Refactored script creation and classes/functions copying. 2018-11-23 03:19:16 +03:00
Nikita Popov
c6009dae34 Remove unused do_free parameter from ADD_INTERNED_STRING 2018-11-22 16:23:03 +01:00
Nikita Popov
4f06e67ad2 Re-commit MySQL 8 cached SHA auth support 
With changes to (hopefully) correctly fall back if OpenSSL support
is missing. Furthermore the hard-coded dependency on ext/hash is
no longer an issue, as this extension is required in master.

This reverts commit 63072e9c0e, reversing
changes made to 4cbabb6852.
 2018-11-21 20:16:44 +01:00
Gabriel Caruso
35be0590ed
Remove unecessaries SKIPIF sections for necessary extensions 2018-11-21 08:08:09 -02:00
Xinchen Hui
1f74300138 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fixed bug #77088 (Segfault when using SoapClient with null options)
  Fixed proto & folder mark
 2018-11-21 11:30:42 +08:00
Xinchen Hui
aaafd793e6 Fixed bug #77088 (Segfault when using SoapClient with null options) 
SoapClient constructor has its own error handler
 2018-11-21 11:30:32 +08:00
Xinchen Hui
efeb810a3d Fixed proto & folder mark 2018-11-21 11:18:48 +08:00
Sara Golemon
534df87c9e
Implement password mechanism registry 
RFC: https://wiki.php.net/rfc/password_registry
 2018-11-20 17:26:55 -05:00
Rijnard van Tonder
8881c3c82f Remove redundant continue in for loops 2018-11-20 21:23:24 +01:00
Nikita Popov
ef8fbd6fc9 Merge branch 'PHP-7.3' 2018-11-20 21:16:36 +01:00
Nikita Popov
7a0d3406f6 Merge branch 'PHP-7.2' into PHP-7.3 2018-11-20 21:16:28 +01:00
Mizunashi Mana
e672cd4385 Define __APPLE_USE_RFC_3542 for new ipv6 constants 2018-11-20 21:16:03 +01:00
Mizunashi Mana
10ae8b685f Fix opcache blacklist test on macOS 2018-11-20 21:11:56 +01:00
Stanislav Malyshev
d4797f836e Disable rsh/ssh functionality in imap by default (bug #77153) 2018-11-20 11:21:29 -08:00
Stanislav Malyshev
44b08a9802 Disable rsh/ssh functionality in imap by default (bug #77153) 2018-11-20 11:19:45 -08:00
Stanislav Malyshev
336d2086a9 Disable rsh/ssh functionality in imap by default (bug #77153) 2018-11-20 11:18:53 -08:00
Stanislav Malyshev
05782f01f5 Disable rsh/ssh functionality in imap by default (bug #77153) 2018-11-20 11:16:08 -08:00
Stanislav Malyshev
628df47e79 Disable rsh/ssh functionality in imap by default (bug #77153) 2018-11-20 11:14:07 -08:00
Dmitry Stogov
05875bcfc6 Improved error messages 2018-11-20 17:50:22 +03:00
Remi Collet
ad6060601a Merge branch 'PHP-7.3' 
* PHP-7.3:
  NEWS
  NEWS
  NEWS
  Fix #77151 ftp_close(): SSL_read on shutdown
 2018-11-20 11:20:57 +01:00
Remi Collet
928d7fc8df Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  NEWS
  NEWS
  Fix #77151 ftp_close(): SSL_read on shutdown
 2018-11-20 11:20:26 +01:00
Remi Collet
6ce4be1762 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  NEWS
  Fix #77151 ftp_close(): SSL_read on shutdown
 2018-11-20 11:19:52 +01:00
Remi Collet
d9afc2f662 Fix #77151 ftp_close(): SSL_read on shutdown 
Regression introduced in fix for #76972

only display the error message when sslerror
or if errno is set (for SSL_ERROR_SYSCALL case)
 2018-11-20 11:18:34 +01:00
Stanislav Malyshev
e5bfea64c8 Disable rsh/ssh functionality in imap by default (bug #77153) 2018-11-20 00:13:50 -08:00
Fabien Villepinte
2b9ceffb41 Fix typo in tests 2018-11-19 22:17:58 +01:00
Anatol Belski
fb06cca6cb Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
 2018-11-18 12:32:47 +01:00
Anatol Belski
0434141ce9 Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type 
Backport 369c991d and 282a63da to 7.1, closes #3634
 2018-11-18 12:29:34 +01:00
Anatol Belski
8b05bbdd0a Merge branch 'PHP-7.3' 
* PHP-7.3:
  Add test for bug #77047
  FIX #77047: fixes regex for "time" data type
 2018-11-18 11:52:33 +01:00
Anatol Belski
282a63dace Add test for bug #77047 2018-11-18 11:52:00 +01:00
andy
369c991d5c FIX #77047: fixes regex for "time" data type 2018-11-18 11:50:32 +01:00
Nikita Popov
2fac9d9ec1 Remove some mentions of RECOVERABLE_ERROR in tests 
Mostly drop error handlers that are no longer necessary.
 2018-11-15 22:13:46 +01:00
Nikita Popov
2766a8e66b Fix leaks 
For some reason I'm no longer getting memory leak errors for my
local build :/
 2018-11-15 21:34:46 +01:00
Nikita Popov
022eea8be1 Check for zero SplPriorityQueue extract flags earlier 
Generate an exception during the SplPriorityQueue::setExtracFlags()
call instead of generating E_RECOVERABLE_FATAL all over the place
later.
 2018-11-15 21:05:05 +01:00
Nikita Popov
e965fee904 Optimize SplPriorityQueue implementation 
Do not create an array with two keys for every element. That's a
huge waste of memory. Instead we allocate a two-element structure.
This reduces memory usage and avoids having to perform hashtable
lookups to get at the data and priority.

The only thing this might impact negatively is the non-default
EXTR_BOTH mode, in which case the array has to be created anyway.
 2018-11-15 20:52:01 +01:00
Dmitry Stogov
0f7f1498be Use ZEND_THIS macro to hide implementation details in extensions code. 2018-11-15 19:54:19 +03:00
Nikita Popov
8f2f80668e Merge branch 'PHP-7.3' 2018-11-15 17:17:06 +01:00
Nikita Popov
dee5a450d9 Fixed bug #77165 
Also add some helper macros for PROTECT/UNPROTECT that check for
IMMUTABLE. These checks are needed for nearly any use of
PROTECT/UNPROTECT.
 2018-11-15 17:16:39 +01:00
Gabriel Caruso
5ae1524dc3
Remove unused variables 2018-11-15 12:32:00 -02:00
Gabriel Caruso
74f26ba816
Remove missing SKIPIF sections for mbstring tests 2018-11-15 12:21:55 -02:00