php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
108,904 Commits 549 Branches 1,485 Tags
a22d2850d4b45c7729a8df4a55a16dff61df04d2
Commit Graph

108904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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] <https://github.com/libgd/libgd/commit/6613094e5d218dc4d4372757aef5e58c6462a9f7>
 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] <https://github.com/libgd/libgd/commit/bda85aaeeb1d7467d92c892ba4c30eaa53d7a6d4>
 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 2979c6a56d [ci skip] Preliminary fix for NEWS 
No more regular bug fixes for PHP 7.3.0.

We'll clean up the rest later.
 2018-11-23 18:37:12 +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
Sara Golemon 5b55b587ea Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Prep for 7.1.26
 2018-11-21 14:39:40 -05:00
Sara Golemon f2de4d185d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Prep for 7.1.26
 2018-11-21 14:39:25 -05:00
Sara Golemon 0b3cbd665e Prep for 7.1.26 2018-11-21 14:37:37 -05: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 b6d5d92661 Merge branch 'PHP-7.2' into PHP-7.3 2018-11-20 21:30:53 +01:00
Nikita Popov bbbaf1ca85 Merge branch 'PHP-7.1' into PHP-7.2 2018-11-20 21:30:38 +01:00
Valentin V. Bartenev 11ddf7669a Fix bug #71041 dynamic embed SAPI load error 
If the library is built with ZEND_SIGNALS defined, it's unusable with an
external SAPI module because the zend_signal_startup() call is mandatory
in this case.

This bug is similar to #74149, but related to dynamic loading of PHP library.
 2018-11-20 21:30:02 +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
Sara Golemon 7d766bd657 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Bump for 7.2.14
 2018-11-20 14:41:31 -05:00
Sara Golemon 9fc52c16b5 Bump for 7.2.14 2018-11-20 14:40:21 -05:00
Stanislav Malyshev 63973d1b33 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Disable rsh/ssh functionality in imap by default (bug #77153)
 2018-11-20 11:20:45 -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
Christoph M. Becker 03a3a04e55 [ci skip] Update NEWS wrt. php-7.3.0RC6 tagging 2018-11-20 13:36:10 +01:00
Remi Collet 3ed07cc34a NEWS 2018-11-20 11:20:40 +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 e7acb29eb0 NEWS 2018-11-20 11:20:05 +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 1adbf70e26 NEWS 2018-11-20 11:19:29 +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
Anatol Belski 05df19b9f0 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-11-18 14:41:14 +01:00
Anatol Belski 68442312e3 [ci skip] Update NEWS 2018-11-18 14:40:00 +01:00
Anatol Belski 6742b4b7cc [ci skip] Update NEWS 2018-11-18 14:38:35 +01:00
Anatol Belski 6e32f59525 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
 2018-11-18 14:37:56 +01:00
Anatol Belski 3e78380d02 [ci skip] Update NEWS 2018-11-18 14:37:04 +01:00
Anatol Belski 5f64afc073 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
 2018-11-18 12:33:35 +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 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