bced074124
Fix race conditions with Apache vhost vs. per dir config
...
If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.
(cherry picked from commit 73eb5a78b9
2018-02-01 15:24:31 +01:00
2503a27ae0
Fix invalid free
2018-01-13 12:32:22 +01:00
9e98e99a3a
Revert "Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)"
...
This reverts commit 816758eda2
2018-01-12 18:11:12 +01:00
fbfdd1e1c4
Happy new year (Update copyright to 2018)
2018-01-02 23:42:29 +02:00
b65abecfdf
regenerated with newer re2c
2018-01-02 13:54:29 +08:00
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
dc3822c343
Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
2017-12-27 12:51:50 +08:00
14393b5fb3
Move includes in ps_title.c
...
The HAVE_UNISTD_H check has to be after including config.h.
Also include sys/types.h, which may be needed for setproctitle.
2017-12-16 17:20:05 +01:00
8b57a5bca0
Follow up on bug #75574 for FCGI side
2017-11-28 20:33:11 +01:00
578049fdb6
Fixed bug #73830 Directory does not exist.
2017-11-28 12:41:49 +01:00
85021602ba
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Update NEWS
Fix bug 60471 by correctly identifying unused speculative preconnections
2017-11-14 20:03:02 +01:00
3bc5c9f118
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-11-14 20:00:45 +01:00
49702ad7fb
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
2017-10-15 10:28:46 +08:00
816758eda2
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
2017-10-15 10:28:28 +08:00
d34c8fa802
Merge branch 'PHP-7.0' into PHP-7.1
2017-10-05 12:25:37 +02:00
6b9ccda936
Fixed bug #75311
2017-10-05 12:24:57 +02:00
d0cda9d0bd
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Typo in status.html
2017-10-03 07:22:04 +01:00
e995b7e475
Typo in status.html
...
feet needs -> fit needs
2017-10-03 07:21:53 +01:00
1981c48e60
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix CGI m4 config message when CGI is disabled
2017-09-27 06:20:34 +01:00
29e673f8ed
Fix CGI m4 config message when CGI is disabled
2017-09-27 06:20:09 +01:00
af71942da2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #75248 and #75251
2017-09-27 06:15:47 +01:00
6d0391b1a4
Fix bug #75248 and #75251
2017-09-27 06:15:12 +01:00
5c59dd0047
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix the version check causing the test fail
2017-09-18 12:06:23 +02:00
9641586efa
Fix the version check causing the test fail
2017-09-18 12:04:31 +02:00
0b69ce72b8
Merge branch 'PHP-7.0' into PHP-7.1
2017-09-05 18:14:10 +02:00
42549b7844
Add missing null termination
2017-09-05 18:13:50 +02:00
e866e05b0d
Merge branch 'PHP-7.0' into PHP-7.1
2017-09-05 16:24:21 +02:00
cd9d90f4d4
Fixed bug #70470
2017-09-05 16:23:32 +02:00
9871555090
Merge branch 'PHP-7.0' into PHP-7.1
2017-08-02 18:16:56 +02:00
e78712791d
take care of compile warnings.
2017-08-02 11:59:41 -04:00
b44484b912
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Update copyright year to 2017
2017-07-24 17:24:10 +01:00
924ff6164e
Update copyright year to 2017
2017-07-24 17:23:57 +01:00
2e82ed9b73
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
2017-07-17 06:51:47 +01:00
0db20a7cb1
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
2017-07-17 06:50:59 +01:00
4e4f2f9f89
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-27 23:16:25 -04:00
751d19f698
[BUGFIX] fixes the issue that a value from .user.ini displays in phpinfo(), but not applies.
...
[BUGFIX] when lsapi used the php_value has higher priority then ini_set when called from the script by itself .
2017-06-27 23:14:36 -04:00
caf35c5cf5
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Add simple cli test for PATH/HOST ini sections
Fixed bug #74600
2017-06-12 17:21:35 +08:00
91f129ebf7
Add simple cli test for PATH/HOST ini sections
2017-06-09 23:28:19 +02:00
78b10dd9d6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Added cleanup
2017-05-17 23:25:17 +08:00
0954ea8d6d
Added cleanup
2017-05-17 23:24:58 +08:00
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
ef09bc0645
Added test for bug #74600
2017-05-17 23:21:18 +08:00
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
abad134681
Fix typo: exectute => execute
2017-05-08 13:59:05 +03:00
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
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
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
60b68f19f0
Fixed bug #74400 (phpdbg comparing socket function to int)
2017-04-10 08:05:31 +01:00
9398f15efd
Fixed condition check
2017-04-10 14:48:31 +08:00
65d77812fc
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed condition check
2017-04-10 14:47:42 +08:00
Anatol Belski