3d7f2fcdff
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Prevent race conditions
2019-05-12 17:17:52 +02:00
b3085bd0d4
Prevent race conditions
...
Since all current ODBC test cases use the same DSN, there may be
conflicts when running tests in parallel. We prevent this by adding a
CONFLICTS marker which might be unnecessarily general, but get's the
job done, and still can be refined later.
2019-05-12 17:16:41 +02:00
ca22b24711
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove unused variable
2019-05-12 03:24:43 +02:00
f1552c864f
Remove unused variable
2019-05-12 03:23:37 +02:00
b60173af0b
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove duplicate variables
2019-05-12 03:06:19 +02:00
188ece856d
Remove duplicate variables
...
Removing duplicate variables `$beginDtObj` and `$beginTimestamp`.
2019-05-12 03:02:38 +02:00
4dedf28380
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Use PKG_CHECK_MODULES to detect the iODBC library
2019-05-12 01:37:00 +02:00
3ece7df9cf
Use PKG_CHECK_MODULES to detect the iODBC library
2019-05-12 01:36:46 +02:00
628806c382
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Use PKG_CHECK_MODULES to detect the systemd library
2019-05-12 00:19:20 +02:00
755f6f6ede
Use PKG_CHECK_MODULES to detect the systemd library
2019-05-12 00:19:03 +02:00
4b2239b52b
Merge branch 'PHP-7.4'
2019-05-11 20:10:43 +01:00
4bf37e467b
Merge branch 'PHP-7.3' into PHP-7.4
2019-05-11 20:10:13 +01:00
0cad701374
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-11 20:08:57 +01:00
cc5c51e7f0
Fix bug #77934 (php-fpm kill -USR2 not working)
2019-05-11 20:07:39 +01:00
d40a3f4c28
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Using PDO instead because of consistency
2019-05-11 21:06:22 +02:00
d0ac3a6a86
Using PDO instead because of consistency
2019-05-11 21:05:49 +02:00
f1d9605970
Merge branch 'PHP-7.4'
...
* PHP-7.4:
list interfaces/adding just "binary" state status.
2019-05-11 20:29:36 +02:00
1f3f54f586
list interfaces/adding just "binary" state status.
2019-05-11 20:29:09 +02:00
64b98c0e33
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove dead DEBUG_CFLAGS setting
2019-05-11 19:53:20 +02:00
836bbb4e2c
Remove dead DEBUG_CFLAGS setting
...
The USE_MAINTAINER_MODE has been removed via
a4c484a4d843ed903949
2019-05-11 19:53:14 +02:00
3e86050726
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove unused symbol definition
Remove redundant memory.h file
2019-05-11 19:48:13 +02:00
f7cdac6c97
Remove unused symbol definition
2019-05-11 19:47:54 +02:00
9219e56063
Remove redundant memory.h file
...
The memory.h file is part of the pre-C89 era and is on today's systems
only a simple wrapper for including the final string.h header file.
2019-05-11 19:47:54 +02:00
f45a3a7847
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Simplify ext/mbstring/libmbfl/config.h creation
2019-05-11 19:45:00 +02:00
3a4df95793
Simplify ext/mbstring/libmbfl/config.h creation
...
- The config.h.in is part of the standalone libmbfl library and it is
forked and bundled.
2019-05-11 19:44:40 +02:00
5ba4e55324
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Integrate libmbfl docs to README.md and LICENSE
2019-05-11 18:35:38 +02:00
ab257ed320
Integrate libmbfl docs to README.md and LICENSE
...
- All credits, license info preserved, only merged together to not have
to many places to edit.
- Changelogs integrated in the readme since they are not used anymore.
2019-05-11 18:29:30 +02:00
5b4514dee8
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Convert CRLF to LF in *.wsdl files
2019-05-11 17:17:40 +02:00
4e0e0b8152
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Convert CRLF to LF in *.wsdl files
2019-05-11 17:16:50 +02:00
bec22af8d7
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Convert CRLF to LF in *.wsdl files
2019-05-11 17:15:08 +02:00
b15bfb9129
Convert CRLF to LF in *.wsdl files
...
These EOL types are part of different environments and not part of the
tests themselves.
2019-05-11 17:12:28 +02:00
4b595655eb
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix comment to match the future zts configuration option
2019-05-11 15:03:27 +02:00
8ef2121ee1
Fix comment to match the future zts configuration option
2019-05-11 15:03:17 +02:00
d3924071c3
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove ffi README in favour of docs
2019-05-11 14:51:40 +02:00
4bfb86cdca
Remove ffi README in favour of docs
...
- https://www.php.net/manual/en/book.ffi.php
- The FFI C parser is mentioned in the CONTRIBUTING.md file
2019-05-11 14:51:14 +02:00
ac0e0c9a90
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Prevent race condition
2019-05-11 09:53:07 +02:00
330d773b3c
Prevent race condition
...
This test may conflict with readdir_variation3.phpt otherwise.
2019-05-11 09:52:19 +02:00
9604e2f28f
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Rename *.jpeg files to *.jpg
2019-05-11 03:28:11 +02:00
a68e0767b3
Rename *.jpeg files to *.jpg
...
These file extensions are not part of these tests and *.jpg is more
common.
2019-05-11 03:22:19 +02:00
3539a902dc
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Bump config.guess and config.sub
2019-05-11 00:25:31 +02:00
e586d3f447
Bump config.guess and config.sub
...
```
wget -O config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD '
wget -O config.sub 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD '
```
2019-05-11 00:24:26 +02:00
a3c88135d4
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove unused variables
2019-05-10 22:58:29 +02:00
313930a36a
Remove unused variables
2019-05-10 22:58:14 +02:00
a8a391a2f2
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix typo
NEWS and UPGRADING for the scatter filter
2019-05-10 18:46:50 +02:00
1b0a33ec59
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix typo
2019-05-10 18:46:18 +02:00
49b5ffe48c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix typo
2019-05-10 18:44:47 +02:00
3759c6316d
Fix typo
...
Since opcache.enable defaults to 1 anyway, this change is only
cosmetic.
2019-05-10 18:43:40 +02:00
7c92eb734f
Merge branch 'master' of git.php.net:/php-src
2019-05-10 02:38:38 +03:00
a2a84af4ed
Merge branch 'PHP-7.4' of git.php.net:/php-src into PHP-7.4
2019-05-10 02:38:12 +03:00
f13fdeadd6
NEWS and UPGRADING for the scatter filter
2019-05-10 02:37:02 +03:00
Christoph M. Becker