php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 03:22:58 +02:00
Code Issues Packages Projects Releases Wiki Activity
108,936 Commits 547 Branches 1,483 Tags
e614b127124eaadfe0160e679262b51cd7e97076
Commit Graph

49047 Commits

Author SHA1 Message Date
Stanislav Malyshev
e614b12712 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
 2018-12-01 21:48:44 -08:00
Stanislav Malyshev
c5869fd1c8 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
 2018-12-01 21:48:40 -08:00
Stanislav Malyshev
09885f78c6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
 2018-12-01 21:48:35 -08:00
Stanislav Malyshev
cea277048d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #77022 - use file mode or umask for new files
 2018-12-01 21:48:27 -08:00
Stanislav Malyshev
cc84d893c7 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77022 - use file mode or umask for new files
 2018-12-01 21:47:49 -08:00
Stanislav Malyshev
8136d130b6 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77022 - use file mode or umask for new files
 2018-12-01 21:47:44 -08:00
Stanislav Malyshev
1aec05defd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #77022 - use file mode or umask for new files
 2018-12-01 21:47:37 -08:00
Stanislav Malyshev
67f3615102 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #77022 - use file mode or umask for new files
 2018-12-01 21:08:38 -08:00
Stanislav Malyshev
69f5e7992b Fix bug #77022 - use file mode or umask for new files 2018-12-01 21:06:45 -08:00
Anatol Belski
ef1269d5c1 Fixed bug #77193 Infinite loop in preg_replace_callback 
Don't return preallocated match data more than once in nested calls.
 2018-12-01 10:24:06 +01:00
Christoph M. Becker
471eb0dd95 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77051: Issue with re-binding on SQLite3
 2018-11-29 02:18:56 +01:00
BohwaZ
94ec262fca Fix #77051: Issue with re-binding on SQLite3 
We have to call `sqlite3_reset()` before re-binding the parameters.
 2018-11-29 02:16:57 +01:00
Stanislav Malyshev
3f165e8ca3 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Add DISPLAY_INI_ENTRIES for imap
  Disable rsh/ssh functionality in imap by default (bug #77153)
  Disable rsh/ssh functionality in imap by default (bug #77153)
 2018-11-28 15:47:07 -08:00
Stanislav Malyshev
4ac764e8bb Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add DISPLAY_INI_ENTRIES for imap
  Disable rsh/ssh functionality in imap by default (bug #77153)
  Disable rsh/ssh functionality in imap by default (bug #77153)
 2018-11-28 15:47:00 -08:00
Stanislav Malyshev
223b8c15a8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add DISPLAY_INI_ENTRIES for imap
  Disable rsh/ssh functionality in imap by default (bug #77153)
  Disable rsh/ssh functionality in imap by default (bug #77153)
 2018-11-28 15:46:53 -08:00
Stanislav Malyshev
87bf84c8c7 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add DISPLAY_INI_ENTRIES for imap
 2018-11-28 15:46:39 -08:00
Stanislav Malyshev
d8765852e0 Add DISPLAY_INI_ENTRIES for imap 2018-11-28 15:45:51 -08:00
Derick Rethans
dd48f0899d Merge branch 'PHP-7.2' into PHP-7.3 2018-11-28 20:35:16 +00:00
Derick Rethans
a3f2871b8e Fixed bug #77097 (DateTime::diff gives wrong diff when the actual diff is less than 1 second) by upgrading to timelib 2017.09 2018-11-28 20:34:21 +00:00
Nikita Popov
f4eec70260 Merge branch 'PHP-7.2' into PHP-7.3 2018-11-28 20:10:17 +01:00
Nikita Popov
17f8b9fb36 Fixed bug #77215 
Remove invalid assertion: A block can have multiple switch frees,
so if we don't do live range block splitting, it is not necessarily
true that the free is located at the start of a block.
 2018-11-28 20:08:39 +01:00
Nikita Popov
fb18b8bdf6 Merge branch 'PHP-7.2' into PHP-7.3 2018-11-26 22:49:18 +01:00
Colin Basnett
9ec519e094 Fixed bug #77184 
The U in URATIONAL is for unsigned, so the values should be printed
as unsigned.
 2018-11-26 22:48:48 +01:00
Adam Baratz
a22d2850d4 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Check column number before trying to fetch the value
 2018-11-26 10:36:18 -05:00
Sergei Morozov
e126ca1557 Check column number before trying to fetch the value 2018-11-26 10:34:37 -05:00
Christoph M. Becker
07d6dfbfe4 Use zend_empty_array 
No need to define our own `com_dotnet_object_properties` as empty hash,
since we can use `zend_empty_array` instead as of PHP 7.3.0.

Cf. <https://github.com/php/php-src/pull/3672#issuecomment-440467704>.
 2018-11-26 15:33:58 +01:00
Christoph M. Becker
070f6838db Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77200: imagecropauto(…, GD_CROP_SIDES) crops left but not right
 2018-11-25 19:03:38 +01:00
Christoph M. Becker
a1aaec08b5 Fix #77200: imagecropauto(…, GD_CROP_SIDES) crops left but not right 
We apply the upstream patch[1].

[1] <6613094e5d>
 2018-11-25 19:00:50 +01:00
Christoph M. Becker
d2a1839d82 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77198: auto cropping has insufficient precision
 2018-11-25 15:56:35 +01:00
Christoph M. Becker
b47b8886dd Fix #77198: auto cropping has insufficient precision 
We apply the upstream patch[1], and also fix the erroneous bailout at
the end of `gdImageAutoCrop()`, since `crop.x` and `crop.y` may very
well be zero.

[1] <bda85aaeeb>
 2018-11-25 15:41:27 +01:00
Frank Denis
8e5381915b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  ext/sodium: remove redundant code
  ext/sodium: Correct base64 decoding with unpadded variants
 2018-11-24 17:56:33 +01:00
Frank Denis
ff02d50909 ext/sodium: remove redundant code 2018-11-24 17:55:36 +01:00
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
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
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
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
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
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
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
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