f01d5faf30
Merge branch 'PHP-7.1' into PHP-7.2
2017-12-16 17:21:01 +01: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
b6a27c7332
Revert "Fix macro redefinition warnings"
...
This reverts commit 23d2bd3748
2017-11-30 13:21:04 +01:00
23d2bd3748
Fix macro redefinition warnings
...
The corresponding implementations are available from APR.
2017-11-30 12:40:52 +01:00
0b30461764
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Follow up on bug #75574 for FCGI side
2017-11-28 20:34:44 +01:00
8b57a5bca0
Follow up on bug #75574 for FCGI side
2017-11-28 20:33:11 +01:00
79940993de
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #73830 Directory does not exist.
2017-11-28 12:42:40 +01:00
578049fdb6
Fixed bug #73830 Directory does not exist.
2017-11-28 12:41:49 +01:00
1310234aa3
Fix printf format issues on i386
2017-11-17 22:25:03 +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
9f5ed133b3
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update NEWS
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
2017-10-15 10:29:28 +08: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
0e8ccb179d
Merge branch 'PHP-7.1' into PHP-7.2
2017-10-05 12:26:19 +02: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
6e39258302
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Typo in status.html
2017-10-03 07:22:15 +01: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
b0950ff854
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix CGI m4 config message when CGI is disabled
2017-09-27 06:20:46 +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
474ee702ab
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #75248 and #75251
2017-09-27 06:16:13 +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
ee84f34344
rename test
2017-09-19 07:26:53 +02:00
cfc6c4d297
Fixed Bug #75212 php_value acts like php_admin_value
2017-09-18 18:08:51 +02:00
d8f1afb45e
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix the version check causing the test fail
2017-09-18 12:06:54 +02: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
d99cd28925
fix tests for 32-bit
2017-09-13 12:20:05 +02:00
d78a7909c8
Merge branch 'PHP-7.1' into PHP-7.2
2017-09-05 18:14:16 +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
9fbd8620fb
Merge branch 'PHP-7.1' into PHP-7.2
2017-09-05 16:24:40 +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
93c2c56a1b
Rework automatic interactive cli activation
...
There are still systems delivering buggy console info. If a file was
passed, obviously no interaction is meant.
2017-08-03 11:23:50 +02:00
042ff13ca9
Merge branch 'PHP-7.1' into PHP-7.2
2017-08-02 18:18:23 +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
515b396889
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update copyright year to 2017
2017-07-24 17:24:22 +01: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
463413db53
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update NEWS
Fixed bug #74947 (Segfault in scanner on INF number)
Conflicts:
Zend/zend_language_scanner.c
2017-07-21 12:02:54 +08:00
8c238c15bc
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
2017-07-17 06:52:43 +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
8871d2d12e
Fixed bug #74849 Process is started as interactive shell in PhpStorm
2017-07-03 21:59:31 +02:00
Nikita Popov