Anatol Belski
ae364546d6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Move to next bin SDK version for AppVeyor
2017-08-28 13:14:08 +02:00
Anatol Belski
0966f9de41
Move to next bin SDK version for AppVeyor
2017-08-28 13:12:51 +02:00
Christoph M. Becker
a9ff4d1f5a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #75124 (gdImageGrayScale() may produce colors)
2017-08-27 13:55:23 +02:00
Christoph M. Becker
499f5480f1
Fixed bug #75124 (gdImageGrayScale() may produce colors)
...
We have to make sure to avoid alpha-blending issues by explicitly
switching to `gdEffectReplace` and to restore the old value afterwards.
This is a port of <https://github.com/libgd/libgd/commit/a7a7ece >.
2017-08-27 13:53:39 +02:00
Nikita Popov
52e854f0ab
Merge branch 'PHP-7.0' into PHP-7.1
2017-08-25 22:03:00 +02:00
Thomas Punt
be9edd83c2
Fixed bug #75090
2017-08-25 22:02:19 +02:00
Anatol Belski
3641ba4332
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update libs versions
2017-08-25 11:28:54 +02:00
Anatol Belski
55db2c31cd
update libs versions
2017-08-25 11:28:12 +02:00
Remi Collet
c449057808
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
From documentation, only the sign of returned value is relevant
2017-08-24 10:29:44 +02:00
Remi Collet
b7e96f8e0e
From documentation, only the sign of returned value is relevant
...
With recent glibc, memcmp sometime return a negative value instead of -1
2017-08-24 10:27:38 +02:00
Tianfang Yang
1b8a71e740
Update NEWS
2017-08-22 01:43:07 -04:00
Tianfang Yang
441487cd05
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
2017-08-22 01:39:55 -04:00
Tianfang Yang
4bf1a11c07
Merge branch 'pull-request/2534' into PHP-7.0
...
* pull-request/2534:
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
2017-08-22 01:10:58 -04:00
Ingmar Runge
079bc324cd
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
2017-08-22 01:09:35 -04:00
Andrea Faulds
158b06cffb
Merge branch 'PHP-7.0' into PHP-7.1
2017-08-19 20:35:22 +01:00
Andrea Faulds
61538ebadc
Fixed bug #75097 (gethostname fails if your host name is 64 chars long)
...
PHP contained two different off-by-one errors, which are fixed here. First,
it created a buffer of size HOST_NAME_MAX, not adding space for a null
terminator. Second, it subtracted 1 from the size of that buffer when passing
its size to gethostname(), despite gethostname() expecting it to be a buffer
size including space for a terminating null byte, not a string length.
2017-08-19 20:31:54 +01:00
Anatol Belski
11d3a7869c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
[ci skip] update NEWS
2017-08-19 02:41:07 +02:00
Anatol Belski
95ef8e96d2
[ci skip] update NEWS
2017-08-19 02:40:50 +02:00
Anatol Belski
3cad07b84f
[ci skip] update NEWS
2017-08-19 02:40:17 +02:00
Anatol Belski
97ed208cfd
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix issues with phpt and EXTENSION on windows (BUG 75042)
2017-08-19 02:01:03 +02:00
John Boehr
71b12940d0
Fix issues with phpt and EXTENSION on windows (BUG 75042)
...
* Commands are not properly escaped for windows
* Specifying "-n" to check loaded modules causes "Module already loaded"
warning
* Extensions to be loaded need the "php_" prefix on Windows
Bug: https://bugs.php.net/bug.php?id=75042
Add back -n flag to fetch loaded extensions in run-tests.php
Add test for phpt EXTENSIONS directive
Add a second test for bug 75042
Add test to test loading of nonexistent shared module
with the EXTENSIONS phpt block
Pass ini settings when checking loaded extensions
Fix skipifs
2017-08-19 01:59:48 +02:00
Anatol Belski
5ef63b6f0e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix .pgd name for ts build
2017-08-19 00:31:55 +02:00
Anatol Belski
ba59b6f11b
Fix .pgd name for ts build
2017-08-19 00:31:04 +02:00
Remi Collet
de0b816b49
NEWS
2017-08-18 14:52:30 +02:00
Remi Collet
acf09c416b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
NEWS
Fixed bug #75093 OpenSSL support not detected
2017-08-18 14:52:22 +02:00
Remi Collet
b28912b0f7
NEWS
2017-08-18 14:52:11 +02:00
Remi Collet
a7594cb74f
Fixed bug #75093 OpenSSL support not detected
2017-08-18 14:51:44 +02:00
Anatol Belski
4494ad6911
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix phpize exit status
2017-08-18 12:06:07 +02:00
Anatol Belski
065551bc9c
Fix phpize exit status
...
Configure and others are generated, not copied. Seems there's yet much
more to do wrt exit status catching.
2017-08-18 11:54:56 +02:00
Anatol Belski
264271f69e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Add dump env target
2017-08-18 11:09:59 +02:00
Anatol Belski
e7f4e67155
Add dump env target
2017-08-18 11:08:27 +02:00
Joe Watkins
d53d793673
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
...
* 'PHP-7.1' of git.php.net:/php-src:
Do the revert properly, and put back fraction support in 7.1
2017-08-16 16:41:48 +01:00
Joe Watkins
5b02d10584
bump versions
2017-08-16 16:41:15 +01:00
Derick Rethans
7121b8d0a2
Do the revert properly, and put back fraction support in 7.1
2017-08-16 15:59:56 +01:00
Derick Rethans
547f9fd389
Merge branch 'PHP-7.0' into PHP-7.1
2017-08-16 15:20:45 +01:00
Derick Rethans
60a6feed07
Revert "Upgrade timelib to 2017.05beta7"
...
This reverts commit bdd56f3107 .
2017-08-16 15:19:18 +01:00
Derick Rethans
8af70958fc
Revert "Remove removed header files from configuration files."
...
This reverts commit 3df753c6ca .
2017-08-16 15:19:11 +01:00
Derick Rethans
9a72a7c58f
Merge branch 'PHP-7.0' into PHP-7.1
2017-08-16 11:14:47 +01:00
Derick Rethans
5d2c303438
Fixed stupid test
2017-08-16 11:14:41 +01:00
Derick Rethans
4dc8f4f9d1
Merge branch 'PHP-7.0' into PHP-7.1
2017-08-16 09:51:28 +01:00
Derick Rethans
7829f9b1d2
Added timelib version to phpinfo()
2017-08-16 09:51:21 +01:00
Remi Collet
44209573e3
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
cleanup
2017-08-16 07:46:23 +02:00
Remi Collet
01735f4d9f
cleanup
2017-08-16 07:46:07 +02:00
Derick Rethans
336cfd9980
Merge branch 'PHP-7.0' into PHP-7.1
2017-08-15 20:24:21 +01:00
Derick Rethans
3df753c6ca
Remove removed header files from configuration files.
2017-08-15 20:22:41 +01:00
Derick Rethans
584db6f38f
Merged PHP-7.0 by hand due to conflicts.
2017-08-15 15:06:18 +01:00
Derick Rethans
bdd56f3107
Upgrade timelib to 2017.05beta7
2017-08-15 14:10:23 +01:00
Dmitry Stogov
3bc1226804
Made test 32/64-bit independent
2017-08-15 13:12:54 +03:00
Dmitry Stogov
0f3e01f5cc
Skip 64-bit related test
2017-08-15 13:00:45 +03:00
Anatol Belski
49501f8f41
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
move dev to 7.0.24
2017-08-15 09:36:14 +02:00