php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
111,066 Commits 549 Branches 1,486 Tags
ebefb95fda95b5e1414838f69ea590fddff13495
Commit Graph

50263 Commits

Author SHA1 Message Date
Christoph M. Becker ebefb95fda Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove dead code
 2019-02-28 13:18:49 +01:00
Christoph M. Becker 345a75f541 Remove dead code 
`_php_image_output()` is only ever called for `PHP_GDIMG_CONVERT_WBM`,
`PHP_GDIMG_TYPE_GD` and `PHP_GDIMG_TYPE_GD2`.  All other image types
solely use the more flexible `_php_image_output_ctx()`.
 2019-02-28 13:11:41 +01:00
Nikita Popov ca8e2abb8e Merge branch 'PHP-7.4' 2019-02-28 12:56:00 +01:00
Nikita Popov 7be0e06b48 Remove mysqli embedded server support 
This code is not compatible with PHP 7.0. The fact that nobody
complained that the mysqli embedded server functionality doesn't
build anymore seems like a strong signal that we can drop it...
 2019-02-28 12:55:16 +01:00
Anatol Belski 9abb47155f Merge branch 'PHP-7.4' 
* PHP-7.4:
  Sync with behavior change in OpenSSL 1.1.1b
 2019-02-28 12:53:31 +01:00
Anatol Belski a5e986181a Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Sync with behavior change in OpenSSL 1.1.1b
 2019-02-28 12:53:05 +01:00
Anatol Belski 58d3dd466f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Sync with behavior change in OpenSSL 1.1.1b
 2019-02-28 12:52:28 +01:00
Anatol Belski 19a44ffb7b Sync with behavior change in OpenSSL 1.1.1b 
A behavior change in revealed by some openssl_decrypt() based test,
where an encrypt API is used with a decrypt context. The EVP_Cipher*
functions will automatically choose the right operation depending on the
context passed.
 2019-02-28 12:48:47 +01:00
Nikita Popov 4be8208ef7 Use zpp string argument in imagecreatefromstring() 
Instead of accepting a zval and casting it.
 2019-02-28 12:07:34 +01:00
Nikita Popov 23d8d93aad Merge branch 'PHP-7.4' 2019-02-28 10:58:19 +01:00
Nikita Popov a18e5c61cd Mark ext/xmlreader/tests/bug70309.phpt as online test 
The relax NG schema is fetched from a remote server. We could
include it in the repo, but it's 500KB. A minimized test case would
be better.

Also, apparently this bug has never been reported upstream and just
patched in the libxml we build on Windows?
 2019-02-28 10:12:40 +01:00
Nikita Popov f198ae1558 Merge branch 'PHP-7.4' 2019-02-28 09:59:19 +01:00
Nikita Popov 5e6846cad7 Merge branch 'PHP-7.3' into PHP-7.4 2019-02-28 09:59:07 +01:00
Nikita Popov 019fd1d9ba Merge branch 'PHP-7.2' into PHP-7.3 2019-02-28 09:58:47 +01:00
Nikita Popov 9ad9cc71ff Fixed bug #77669 2019-02-28 09:58:01 +01:00
Peter Kokot 0517d203b3 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove unused package2.xml file
  Remove not needed PHP_PDO_PEAR_CHECK m4 macro
 2019-02-28 01:09:30 +01:00
Peter Kokot 6d487ee177 Remove unused package2.xml file 2019-02-28 01:09:19 +01:00
Peter Kokot 6ee82a2a48 Remove not needed PHP_PDO_PEAR_CHECK m4 macro 2019-02-28 01:08:48 +01:00
Joe Watkins 0e391d14bf Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #77673 ReflectionClass::getDefaultProperties returns spooky array
 2019-02-27 09:18:20 +01:00
Joe Watkins 1ca9d818b8 Fix #77673 ReflectionClass::getDefaultProperties returns spooky array 2019-02-27 09:17:09 +01:00
Nikita Popov b4cbf6faca Fix tests bareword fallback with error suppression 
Re-merge commit a369326003 into PHP-7.4
(cherry picked from commit aad39879f2)
(cherry picked from commit 76f8a908bb)
 2019-02-25 17:43:07 +01:00
Nikita Popov a8daef51e1 Merge branch 'PHP-7.3' into PHP-7.4 2019-02-25 13:02:58 +01:00
Nikita Popov 9489a7bfdb Merge branch 'PHP-7.4' 2019-02-25 09:36:20 +01:00
Nikita Popov 251e948946 Fix some directory collisions in dir tests 2019-02-25 09:34:20 +01:00
Nikita Popov c937c55d75 Fix some port collisions in sockets tests 2019-02-25 09:24:45 +01:00
Xinchen Hui c599c18e6f Merge branch 'PHP-7.3' 
* PHP-7.3:
  Update NEWS
  Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)
 2019-02-25 14:42:56 +08:00
Xinchen Hui 3c3d59aa39 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)
 2019-02-25 14:42:01 +08:00
Xinchen Hui 4a72dd782d Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper) 2019-02-25 14:41:46 +08:00
Jakub Zelenka 7a564fc0cb Merge branch 'PHP-7.4' 2019-02-24 13:15:57 +00:00
Jakub Zelenka 20af026acd Merge branch 'PHP-7.3' into PHP-7.4 2019-02-24 13:15:17 +00:00
Jakub Zelenka 900d4cdb9e Merge branch 'PHP-7.2' into PHP-7.3 2019-02-24 13:14:36 +00:00
Jakub Zelenka 42df0d26ef Merge branch 'PHP-7.4' 2019-02-24 13:13:10 +00:00
Jakub Zelenka 043ce4c8a1 Revert "Disable bug77390.phpt" 
This reverts commit 139492b1ae.
 2019-02-24 13:12:38 +00:00
Jakub Zelenka 01c00953ff Print empty string in test for but 77390 just once 2019-02-24 13:11:27 +00:00
Jakub Zelenka c814b34b1d Use spaces instead of tabs in bug 77390 test 2019-02-24 13:05:43 +00:00
Peter Kokot 20addf88e4 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove unused PHP_AC_BROKEN_SPRINTF and AC_ZEND_BROKEN_SPRINTF
 2019-02-23 22:29:16 +01:00
Peter Kokot b33fa18eab Remove unused PHP_AC_BROKEN_SPRINTF and AC_ZEND_BROKEN_SPRINTF 
The sprintf function has been normalized to php_sprintf via
61364b5bb1.

This patch removes the checks to make a custom sprintf function

The ZEND_BROKEN_SPRINTF has been removed and the
hardcoded #define zend_sprintf sprintf is used.

The php_sprintf and zend_sprintf are now symbols to sprintf.

This patch now removes the custom PHP definitions of the php_sprintf and
zend_sprintf functions in favor of the C99 sprintf which is also
standardized in C89 already. Once, on some systems sprintf didn't behave
in same way.
 2019-02-23 22:26:47 +01:00
Peter Kokot d2a6096f25 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Replace Hebrew characters with escape sequences
 2019-02-23 22:18:19 +01:00
Peter Kokot 6926cf356e Replace Hebrew characters with escape sequences 
calendar.c includes ISO-8859-8 encoded Hebrew characters, which may
cause compile errors, and is causing issues when saving file as UTF-8.
This patch replaces characters with appropriate escape sequences.

Following 99fdf5916e.
 2019-02-23 22:17:15 +01:00
Nikita Popov 4d18ab73ec Merge branch 'PHP-7.4' 2019-02-22 17:40:08 +01:00
Nikita Popov 139492b1ae Disable bug77390.phpt 
This is causing a lot of spurious failures on AppVeyor.
 2019-02-22 17:39:43 +01:00
Nikita Popov 3cfe80dfce Merge branch 'PHP-7.4' 2019-02-22 13:42:22 +01:00
Nikita Popov dda2074bf7 Merge branch 'PHP-7.3' into PHP-7.4 2019-02-22 13:42:13 +01:00
Nikita Popov 66fda0cdb1 Remove result def during jmp_set optimization 2019-02-22 13:41:47 +01:00
Nikita Popov 7cf177cd42 Merge branch 'PHP-7.4' 2019-02-22 12:45:39 +01:00
Nikita Popov ea115a617f Fix removal of unreachable code in SCCP 
Due to a wrongly placed check, we were only performing the
unreachable code removal if there were loop vars...
 2019-02-22 12:44:36 +01:00
Nikita Popov b8866a5a0e Merge branch 'PHP-7.4' 2019-02-22 12:00:49 +01:00
Nikita Popov 4a98f42330 Merge branch 'PHP-7.3' into PHP-7.4 2019-02-22 12:00:35 +01:00
Nikita Popov 33c2b47de3 Merge branch 'PHP-7.2' into PHP-7.3 2019-02-22 12:00:20 +01:00
Nikita Popov 2cfb09caa7 Fix inference warning about missing key type 2019-02-22 11:55:16 +01:00