php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 20:22:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
113,472 Commits 547 Branches 1,481 Tags
cb0921b34fe9d7051573700a68fec6890781b89f
Commit Graph

113472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Watkins
cb0921b34f enable JIT only in master for macosx 2019-06-14 12:59:05 +02:00
Joe Watkins
956db0cdc2 Merge branch 'PHP-7.4' 
* PHP-7.4:
  fix mac tests on azure
 2019-06-14 12:58:13 +02:00
Joe Watkins
dd10bf5450 Merge branch 'mac-tests' into PHP-7.4 
* mac-tests:
  fix mac tests on azure
 2019-06-14 12:56:08 +02:00
Joe Watkins
f16b012116 fix mac tests on azure 2019-06-14 12:55:00 +02:00
Nikita Popov
3e8b456ada Merge branch 'PHP-7.4' 2019-06-14 12:46:56 +02:00
Nikita Popov
e6aec81470 Fix SNMP build warnings 2019-06-14 12:45:46 +02:00
Dmitry Stogov
26009b4c36 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Backport 96a12578c1
 2019-06-14 13:29:50 +03:00
Dmitry Stogov
6e397e9887 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Backport 96a12578c1
 2019-06-14 13:29:40 +03:00
Dmitry Stogov
96a6f7f7f5 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Backport 96a12578c1
 2019-06-14 13:29:30 +03:00
Dmitry Stogov
28808ca96d Backport 96a12578c1 2019-06-14 13:29:13 +03:00
Dmitry Stogov
9a20e3f500 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Backport 91a6cdbff5
 2019-06-14 13:26:26 +03:00
Dmitry Stogov
cfa3866578 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Backport 91a6cdbff5
 2019-06-14 13:26:04 +03:00
Dmitry Stogov
a5b39abd86 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Backport 91a6cdbff5
 2019-06-14 13:25:06 +03:00
Dmitry Stogov
40f463b560 Backport 91a6cdbff5 2019-06-14 13:24:47 +03:00
Dmitry Stogov
29902e0e46 Merge branch 'PHP-7.4' 
* PHP-7.4:
  More edge case fixes that may cause bug #78106
 2019-06-14 13:10:39 +03:00
Dmitry Stogov
96a12578c1 More edge case fixes that may cause bug #78106 2019-06-14 13:10:02 +03:00
Dmitry Stogov
ca486893ba Merge branch 'PHP-7.4' 
* PHP-7.4:
  Attempt to fix edge conditions that may cause bug #78106
 2019-06-14 12:48:00 +03:00
Dmitry Stogov
91a6cdbff5 Attempt to fix edge conditions that may cause bug #78106 2019-06-14 12:47:22 +03:00
Nikita Popov
7e066a4b3b Merge branch 'PHP-7.4' 2019-06-14 11:37:41 +02:00
Theodore Brown
f74109d9a4 Implement numeric literal separators 
RFC: https://wiki.php.net/rfc/numeric_literal_separator
 2019-06-14 11:37:04 +02:00
Nikita Popov
ca2a6f75bf Merge branch 'PHP-7.4' 2019-06-14 11:14:08 +02:00
Nikita Popov
ec77cca5f3 Merge branch 'PHP-7.3' into PHP-7.4 2019-06-14 11:13:43 +02:00
Nikita Popov
98457b6d60 Fix some leaks in ldap 
The result of zval_get_string() needs to be released. In some places
where it is inconvenient to manage, I went back to convert_to_string.
It is safe in those places due to existing array separations.

Also fix a preexisting leak when getting controls, the previous
value was not destroyed.
 2019-06-14 11:11:24 +02:00
Nikita Popov
23dc29c8e8 Merge branch 'PHP-7.4' 2019-06-14 09:30:22 +02:00
Nikita Popov
646b64b119 Fix skipif syntax errors 
Apparently I did this only on masster...
 2019-06-14 09:29:14 +02:00
Joe Watkins
0a5896291b Merge branch 'PHP-7.4' 
* PHP-7.4:
  disable phpdbg on i386 builds [ci skip]
 2019-06-14 08:30:46 +02:00
Joe Watkins
8b6b4870e7 disable phpdbg on i386 builds [ci skip] 2019-06-14 08:30:20 +02:00
Dmitry Stogov
5883dbcb18 Fixed incorect register allocation in ZTS build 2019-06-14 00:29:22 +03:00
Christoph M. Becker
b994fd81cb Throw TypeError instead of warning in case of invalid path 
For consistency with imagegd(), imagegd2() and imagexbm(), which throw
a TypeError if a path containing NUL bytes is given, we throw a
TypeError for the other image writer functions as well.
 2019-06-13 22:37:50 +02:00
Côme Chilliet
890e846d85 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Some more string conversion handling, fixing bug #77958
  Avoid converting zval when not needed
 2019-06-13 22:15:41 +02:00
Côme Chilliet
9684d5f282 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Some more string conversion handling, fixing bug #77958
  Avoid converting zval when not needed
 2019-06-13 22:15:13 +02:00
Côme Chilliet
5d2fe48785 Some more string conversion handling, fixing bug #77958 2019-06-13 22:12:34 +02:00
Côme Chilliet
c219d8d5c2 Avoid converting zval when not needed 
Also added exception checks so that exception from __toString are
 correctly handled in the future
 2019-06-13 20:58:45 +02:00
Nikita Popov
03b299574b Merge branch 'PHP-7.4' 2019-06-13 16:53:25 +02:00
Nikita Popov
19e2101dfa Revert "ext/standard: Use PKG_CHECK_MODULES to detect the Argon2 library" 
This reverts commit bdcef51bcb.

It seems that pkg-config support for libargon2 is still flaky:
 * No pc file on Alpine.
 * Custom builds of released libargon2 versions create a broken
   pc file. This is fixed in master, but not released.

Go back to the old detection code for now.
 2019-06-13 16:53:05 +02:00
Christoph M. Becker
2018615c2a Remove superfluous CLEAN sections 
These actually should have been removed with commit be73ae3[1].

[1] <be73ae3132>
 2019-06-13 14:33:41 +02:00
Nikita Popov
f36282c521 Merge branch 'PHP-7.4' 2019-06-13 14:22:48 +02:00
Nikita Popov
ce2b36bc48 Condition some azure jobs on schedule trigger 2019-06-13 14:20:47 +02:00
Christoph M. Becker
692673f6a4 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add BMP support to PHP info
 2019-06-13 13:07:30 +02:00
Christoph M. Becker
3c5bb06536 Add BMP support to PHP info 2019-06-13 13:07:01 +02:00
Nikita Popov
026023bd71 Merge branch 'PHP-7.4' 2019-06-13 12:54:17 +02:00
Nikita Popov
e5be58f57c Merge branch 'PHP-7.3' into PHP-7.4 2019-06-13 12:54:10 +02:00
Nikita Popov
bada2049ca Merge branch 'PHP-7.2' into PHP-7.3 2019-06-13 12:52:32 +02:00
Nikita Popov
f1a8138055 Fixed bug #78106 
When disabling opcache during the request via opcache.enable ini
setting, make sure we also disable ZCG(accelerator_enabled).
 2019-06-13 12:51:35 +02:00
Nikita Popov
b2b9c4785f Merge branch 'PHP-7.4' 2019-06-13 12:41:14 +02:00
Nikita Popov
da275e6214 Merge branch 'PHP-7.3' into PHP-7.4 2019-06-13 12:41:01 +02:00
Nikita Popov
ee137a7033 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-13 12:38:57 +02:00
Nikita Popov
f8a68fd935 Add test for bug #78106 
Also add PHP_TEST_EXTRA_ARGS environment variable, which allows
to pass on -c, -d etc flags provided by run-tests.php. Otherwise
we won't get the built-in server to run with opcache.
 2019-06-13 12:35:29 +02:00
Nikita Popov
3b27689d46 Fix helper call on 32-bit 
This is using the fast-call calling convention. Use FCARG1a and
same code for 32-bit and 64-bit.
 2019-06-13 12:11:23 +02:00
Nikita Popov
792e38d863 Fix bug #78154 with JIT 2019-06-13 11:53:31 +02:00