Anatol Belski
927d2d3608
Merge branch 'PHP-7.1'
...
* PHP-7.1:
sync NEWS for bug #74159
2017-03-02 20:47:56 +01:00
Anatol Belski
f844c0880d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
sync NEWS for bug #74159
2017-03-02 20:46:39 +01:00
Anatol Belski
c082c92b7e
sync NEWS for bug #74159
2017-03-02 20:45:15 +01:00
Anatol Belski
834d13879f
Merge branch 'PHP-7.1'
...
* PHP-7.1:
improve signal globals consistency check for TS
2017-03-02 20:36:12 +01:00
Anatol Belski
1d4248af42
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
improve signal globals consistency check for TS
2017-03-02 20:34:48 +01:00
Anatol Belski
18f7e26257
improve signal globals consistency check for TS
...
Seems when we receive TERM, TLS is destroyed completely. In that case,
not only signal globals, but the entire globals array doesn't exist
anymore.
2017-03-02 20:27:27 +01:00
Anatol Belski
5b6ee004ba
Merge branch 'PHP-7.1'
...
* PHP-7.1:
do not try to handle signals, when globals are inconsistent
2017-03-02 16:43:10 +01:00
Anatol Belski
494fc16184
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
do not try to handle signals, when globals are inconsistent
2017-03-02 16:41:43 +01:00
Anatol Belski
c7b2c698d0
do not try to handle signals, when globals are inconsistent
2017-03-02 16:40:38 +01:00
Remi Collet
402eeb8598
Zip: add support for encrypted archive
2017-03-02 13:36:40 +01:00
Nikita Popov
859a6505d3
Merge branch 'PHP-7.1'
2017-03-02 12:36:31 +01:00
Nikita Popov
bf8c463f5b
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 12:36:13 +01:00
somedaysummer
fab5ce347c
PHP bug #74004
...
Fix for DOMDocument loadHTML and loadHTMLFile ignore LIBXML_NOWARNING
and LIBXML_NOERROR flags.
2017-03-02 12:35:42 +01:00
Derick Rethans
1aaf03432d
Merge branch 'PHP-7.1'
2017-03-02 11:28:17 +00:00
Derick Rethans
a7ff583e7e
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 11:28:09 +00:00
Derick Rethans
cf60f26da6
Fixed tests after tzdb removed abbreviations
2017-03-02 11:28:02 +00:00
Derick Rethans
61e9b7354f
Make sure we anchor this test to February
2017-03-02 11:27:44 +00:00
Eric Poe
4ab097eba1
Add test-case from bug #55157
...
The issue itself is not fixed, this is just a workaround.
2017-03-02 12:22:48 +01:00
Nikita Popov
5cdfa46d3f
Merge branch 'PHP-7.1'
2017-03-02 12:14:00 +01:00
Nikita Popov
bc1807dbe2
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 12:13:38 +01:00
Mitch Hagstrand
29333550d2
Fix bug73858.phpt to work in months without 31 days
...
Used hardcoded months in bug73858.phpt rather than the current and previous
month.
2017-03-02 12:13:06 +01:00
Christopher Jones
1f9bdec059
Update NEWS
2017-03-02 15:35:19 +11:00
Christopher Jones
9f09c810f5
Update NEWs
2017-03-02 15:34:47 +11:00
Christopher Jones
f997d6f4ca
Merge branch 'PHP-7.1'
2017-03-02 15:33:50 +11:00
Christopher Jones
06e5ec9e32
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 15:33:25 +11:00
Christopher Jones
e80ea04c79
Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated)
...
This was a modification of an incomplete PR #2276 .
2017-03-02 15:28:01 +11:00
Adam Baratz
2f09973968
Remove dead code related to error constants
2017-03-01 16:28:47 -05:00
Adam Baratz
3985ddc495
Remove PHP5-specific code
2017-03-01 16:27:26 -05:00
Derick Rethans
b20879348a
Updated to version 2017.1 (2017a)
2017-03-01 20:07:53 +00:00
Derick Rethans
ce4a679d85
Empty merge
2017-03-01 20:07:52 +00:00
Derick Rethans
1b16fb594f
Updated to version 2017.1 (2017a)
2017-03-01 20:07:51 +00:00
Derick Rethans
dfcb11d7d1
Updated to version 2017.1 (2017a)
2017-03-01 20:07:51 +00:00
Derick Rethans
36d8c1b182
Empty merge
2017-03-01 20:07:51 +00:00
Remi Collet
f6fc9aa1b1
Merge branch 'PHP-7.1'
...
* PHP-7.1:
make type consistent with glob_t.gl_pathc
2017-03-01 17:03:11 +01:00
Remi Collet
2f955d5d0a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
make type consistent with glob_t.gl_pathc
2017-03-01 17:02:42 +01:00
Remi Collet
53a08fd07d
make type consistent with glob_t.gl_pathc
2017-03-01 17:01:58 +01:00
Sara Golemon
5b52a44860
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix potential crash when setting invalid declare value
2017-02-28 17:18:08 -08:00
Sara Golemon
c5727a30cf
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix potential crash when setting invalid declare value
2017-02-28 17:17:41 -08:00
Sara Golemon
868930e079
Fix potential crash when setting invalid declare value
...
Using a non-literal expression in a declare value can cause the
compiler to crash trying to turn that AST node into a usable zval.
There was an existing test for such values using 'encoding',
but that didn't crash because it's handled by the lexer
rather than being compiled.
Trying to use a non-literal with ticks reproduces the crash.
2017-02-28 17:08:23 -08:00
Remi Collet
18293f9a6f
Merge branch 'PHP-7.1'
...
* PHP-7.1:
make test slower again
2017-02-28 11:36:42 +01:00
Remi Collet
3006d1de5b
make test slower again
2017-02-28 11:36:24 +01:00
Joe Watkins
bbda362f8d
Merge branch 'PHP-7.1'
...
* PHP-7.1:
prepare 7.1.4
2017-02-28 09:08:34 +00:00
Joe Watkins
55bcef1751
prepare 7.1.4
2017-02-28 09:08:05 +00:00
Anatol Belski
3dff3d2756
Merge branch 'PhP-7.1'
...
* PhP-7.1:
prepare next
2017-02-28 09:52:44 +01:00
Anatol Belski
52393daa3a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
prepare next
2017-02-28 09:47:56 +01:00
Anatol Belski
21a05b0418
prepare next
2017-02-28 09:46:11 +01:00
Joe Watkins
d98c31a359
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Revert "fix crash in phpdbg shutdown process when opcache is loaded"
2017-02-27 19:21:51 +00:00
Joe Watkins
585ea4cda0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "fix crash in phpdbg shutdown process when opcache is loaded"
2017-02-27 19:21:37 +00:00
Joe Watkins
c564924d31
Revert "fix crash in phpdbg shutdown process when opcache is loaded"
...
This reverts commit 008fb28eaf
2017-02-27 19:21:10 +00:00
Joe Watkins
61ecad0f53
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:55:31 +00:00
