Sara Golemon
d316ba2d65
Remove user=foo from FPM test config
...
This setting has nothing to do with what's being tested,
and on any system without a "foo" user we'll get a spurious error.
2017-05-24 15:07:24 -07:00
Sara Golemon
d8d1c78ed0
Skip FPM tests when running as root (unless requested)
...
FPM must be configured as a user.
Normally it defaults to the current user,
but if that's root it'll fail to startup
unless the --run-as-root option is provided.
Extend that logic into the test runner so that
we don't fail for stupid reasons.
If you're running `make test` as root and you want
FPM tests to run anyway, set TEST_FPM_RUN_AS_ROOT=1
in your environment.
2017-05-24 13:58:18 -07:00
Xinchen Hui
23ea38d8f7
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Added cleanup
2017-05-17 23:25:34 +08:00
Xinchen Hui
78b10dd9d6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Added cleanup
2017-05-17 23:25:17 +08:00
Xinchen Hui
0954ea8d6d
Added cleanup
2017-05-17 23:24:58 +08:00
Xinchen Hui
af0c443dde
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Added test for bug #74600
2017-05-17 23:21:42 +08:00
Xinchen Hui
f38487a0e0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Added test for bug #74600
2017-05-17 23:21:38 +08:00
Xinchen Hui
ef09bc0645
Added test for bug #74600
2017-05-17 23:21:18 +08:00
Dmitry Stogov
6f6ad066ea
Merge branch 'hybrid-vm'
...
* hybrid-vm:
Cleanup
Fixed zend_vm_call_opcode_handler(). Make phpdbg work with HYBRID VM.
Added missing ZEND_VM_HOT define
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-09 09:38:34 +03:00
Xinchen Hui
282d09a740
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix typo: exectute => execute
2017-05-09 11:02:02 +08:00
Xinchen Hui
15dbe775d1
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix typo: exectute => execute
2017-05-09 11:01:52 +08:00
Andrew Marcinkevičius
abad134681
Fix typo: exectute => execute
2017-05-08 13:59:05 +03:00
Dmitry Stogov
27e01cd918
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 10:01:22 +03:00
Sammy Kaye Powers
fd0e71d001
Fix bug 60471 by correctly identifying unused speculative preconnections
...
* Correctly identify unused speculative preconnections from browsers
like Chrome and Firefox
* Add a new message to the debug level that is emitted when a TCP
connection is closed without sending any request (a preconnection)
* Fix an issue where the existing debug messages were not being
displayed even when debug mode was enabled
2017-04-11 15:08:05 -07:00
Joe Watkins
68b312db7d
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
...
* 'PHP-7.1' of git.php.net:/php-src:
Fixed condition check
Fixed condition check
another place
Fixed issue #2466 Invalid integer constant expression error in php.h
2017-04-10 08:07:52 +01:00
Joe Watkins
e642375764
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
Fixed condition check
Fixed issue #2466 Invalid integer constant expression error in php.h
2017-04-10 08:07:24 +01:00
Joe Watkins
e24dcf97f1
Merge branch 'master' of git.php.net:/php-src
...
* 'master' of git.php.net:/php-src:
Fixed condition check
Fixed condition check
another place
Fixed issue #2466 Invalid integer constant expression error in php.h
2017-04-10 08:06:52 +01:00
Joe Watkins
5b013e7935
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #74400 (phpdbg comparing socket function to int)
2017-04-10 08:06:28 +01:00
Joe Watkins
c961beb5de
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74400 (phpdbg comparing socket function to int)
2017-04-10 08:06:11 +01:00
Joe Watkins
60b68f19f0
Fixed bug #74400 (phpdbg comparing socket function to int)
2017-04-10 08:05:31 +01:00
Xinchen Hui
696bd37e67
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed condition check
Fixed condition check
another place
Conflicts:
ext/mcrypt/mcrypt.c
2017-04-10 14:49:13 +08:00
Xinchen Hui
9398f15efd
Fixed condition check
2017-04-10 14:48:31 +08:00
Xinchen Hui
65d77812fc
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed condition check
2017-04-10 14:47:42 +08:00
Xinchen Hui
4bebcb84ad
Fixed condition check
2017-04-10 14:47:24 +08:00
Anatol Belski
1459d5dc18
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix buffer overflow
2017-04-03 14:25:37 +02:00
Anatol Belski
2ec54af8df
fix buffer overflow
2017-04-03 14:22:23 +02:00
Thomas Punt
9f08aff3fd
Remove superfluous allocation checks around ZMM-based functions
2017-04-02 00:58:19 +02:00
Sara Golemon
2b86a89193
Update tests and add NEWS entry for phpdbg opcode dump change
2017-03-29 12:54:52 -07:00
Sara Golemon
764b529efd
Add extended_value to phpdbg opcode dump
2017-03-29 04:08:52 -07:00
Anatol Belski
0eb3c377d4
Merge branch 'PHP-7.1'
...
* PHP-7.1:
update NEWS
update NEWS
Revert "Fixed bug #61471 "
2017-03-28 13:17:05 +02:00
Anatol Belski
279d1efbdb
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update NEWS
Revert "Fixed bug #61471 "
2017-03-28 13:13:24 +02:00
Anatol Belski
ef8632c9dc
Revert "Fixed bug #61471 "
...
This reverts commit 80c8d84af3 .
2017-03-28 13:06:38 +02:00
Rowan Collins
1b565f1393
Change 'undefined constant' from E_NOTICE to E_WARNING and mention deprecation
...
Implements RFC "Deprecate and Remove Bareword (Unquoted) Strings"
[https://wiki.php.net/rfc/deprecate-bareword-strings ]
2017-03-23 18:52:43 +01:00
Thomas Punt
932c4b35dc
Remove more unnecessary checks on Zend's allocator functions
2017-03-16 12:23:55 +01:00
Nikita Popov
edcabf6d07
Drop unnecessary allocator return value checks
2017-03-13 22:07:15 +01:00
Sara Golemon
b63c45c69e
Try fallback on IPv4 ANYADDR when IPv6 ANYADDR fails
...
https://bugs.php.net/bug.php?id=74166
A host system with no/limited IPv6 support will fail at binding
the IPv6 ANYADDR address (::) as the address family is unsupported.
Deal with this by handling failure to implicitly bind to ::
as a soft failure, falling back to 0.0.0.0.
If binding to :: failed for some other reason (e.g. port in use)
then binding to 0.0.0.0 will likely fail as well, but we'll
get appropriate warnings for that.
2017-03-08 11:02:54 -08:00
Anatol Belski
c698299550
Interned strings unification for TS/NTS
...
Hereby, interned strings are supported in thread safe PHP. The patch
implements two types of interned strings
- interning per process, strings are not freed till process end
- interning per request, strings are freed at request end
There is no runtime interning.
With Opcache, all the permanent iterned strings are copied into SHM on
startup, additional copying into SHM might happen on demand.
2017-03-04 10:39:13 +01: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
Joe Watkins
7aa59a4440
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:55:14 +00:00
Joe Watkins
008fb28eaf
fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:54:48 +00:00
Joe Watkins
78ae563a48
Merge branch 'PHP-7.1'
...
* PHP-7.1:
pull-request/2393:
stop fpm make install clobbering dot d configuration
2017-02-22 06:49:22 +00:00
Joe Watkins
46d0933668
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
pull-request/2393:
stop fpm make install clobbering dot d configuration
2017-02-22 06:48:48 +00:00
Coenraad Loubser
9eaf551c86
pull-request/2393:
...
stop make install from clobbering default dot d configuration
2017-02-22 06:47:23 +00:00
Nikita Popov
5383c9d9e5
Merge branch 'PHP-7.1'
2017-02-12 00:06:47 +01:00
Nikita Popov
6d5ea20e0b
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-12 00:06:35 +01:00
Denis Yeldandi
9814be4bc2
Fixed bug #69860
2017-02-12 00:06:04 +01:00
Nikita Popov
4ec80663a6
Merge branch 'PHP-7.1'
2017-02-08 01:10:54 +01:00
Nikita Popov
f352c50026
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-08 01:10:48 +01:00
Zheng SHAO
80c8d84af3
Fixed bug #61471
2017-02-08 01:10:13 +01:00