1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 00:48:25 +02:00
Commit Graph

917 Commits

Author SHA1 Message Date
Nikita Popov b942648771 Merge branch 'PHP-7.2' 2018-01-12 18:18:45 +01:00
Nikita Popov f8c889760c Merge branch 'PHP-7.1' into PHP-7.2 2018-01-12 18:18:34 +01:00
Nikita Popov 9e98e99a3a Revert "Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)"
This reverts commit 816758eda2.

After this commit relative router scripts were resolved against
docroot rather than shell cwd.
2018-01-12 18:11:12 +01:00
Xinchen Hui a76eeea736 Merge branch 'PHP-7.2'
* PHP-7.2:
  Happy new year (Update copyright to 2018)

Conflicts:
	ext/phar/LICENSE
2018-01-03 16:02:15 +08:00
Xinchen Hui 0e62639d28 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Happy new year (Update copyright to 2018)
2018-01-03 16:00:34 +08:00
Lior Kaplan fbfdd1e1c4 Happy new year (Update copyright to 2018) 2018-01-02 23:42:29 +02:00
Xinchen Hui a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Xinchen Hui 7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Nikita Popov abdece72c2 Merge branch 'PHP-7.2' 2017-12-16 17:21:06 +01:00
Nikita Popov f01d5faf30 Merge branch 'PHP-7.1' into PHP-7.2 2017-12-16 17:21:01 +01:00
David Carlier 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
Anatol Belski af55904f18 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fixed bug #73830 Directory does not exist.
2017-11-28 12:43:03 +01:00
Anatol Belski 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
Anatol Belski 578049fdb6 Fixed bug #73830 Directory does not exist. 2017-11-28 12:41:49 +01:00
Anatol Belski 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
Sammy Kaye Powers 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
Xinchen Hui 266f19babb Added PCRE_JIT_SUPPORT flag 2017-11-14 11:02:16 +08:00
Anatol Belski a5bc5aed71 Patch core for PCRE2 support
RFC https://wiki.php.net/rfc/pcre2-migration
2017-11-13 19:37:38 +01:00
Dmitry Stogov 749db50a36 Added exceptions for ZEND_RC_DEBUG 2017-11-02 14:40:28 +03:00
Dmitry Stogov cf67a421e9 Use per-request heap instead of system one 2017-10-27 14:45:54 +03:00
Xinchen Hui 77af496150 Merge branch 'PHP-7.2'
* PHP-7.2:
  Update NEWS
  Update NEWS
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
2017-10-15 10:29:56 +08:00
Xinchen Hui 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
Xinchen Hui 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
Xinchen Hui 816758eda2 Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function) 2017-10-15 10:28:28 +08:00
Peter Kokot 2664638f7e Remove empty and done TODO file for CLI SAPI
[ci skip]
2017-09-24 18:44:46 +02:00
Anatol Belski b81659d34f Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix the version check causing the test fail
2017-09-18 12:07:12 +02:00
Anatol Belski 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
Anatol Belski 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
Anatol Belski 9641586efa Fix the version check causing the test fail 2017-09-18 12:04:31 +02:00
Anatol Belski 8e6619445f Fix test portability 2017-09-06 13:05:56 +02:00
Jansen Price fafd67cb71 Add tests for sapi/cli option combinations 2017-09-06 09:54:00 +01:00
Nikita Popov dfe030097d Merge branch 'PHP-7.2' 2017-09-05 18:14:21 +02:00
Nikita Popov d78a7909c8 Merge branch 'PHP-7.1' into PHP-7.2 2017-09-05 18:14:16 +02:00
Nikita Popov 0b69ce72b8 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-05 18:14:10 +02:00
Nikita Popov 42549b7844 Add missing null termination 2017-09-05 18:13:50 +02:00
Nikita Popov 1ca43597df Merge branch 'PHP-7.2' 2017-09-05 16:25:06 +02:00
Nikita Popov 9fbd8620fb Merge branch 'PHP-7.1' into PHP-7.2 2017-09-05 16:24:40 +02:00
Nikita Popov e866e05b0d Merge branch 'PHP-7.0' into PHP-7.1 2017-09-05 16:24:21 +02:00
Bouke van der Bijl cd9d90f4d4 Fixed bug #70470 2017-09-05 16:23:32 +02:00
Patrick Allaert 21cd57e5f2 EXPECT instead of EXPECTF 2017-08-16 17:05:47 +02:00
Patrick Allaert b34702c774 Fixed: tests not written to pass on Windows 2017-08-16 17:05:47 +02:00
Patrick Allaert 5e83fc4e49 cli_get_process_title() may not be empty before set 2017-08-16 17:05:47 +02:00
Patrick Allaert ce09f485ca Not skipping test on Windows and test against CLI instead 2017-08-16 17:05:47 +02:00
Patrick Allaert 9f16c22ead Added: tests for cli_get_process_title / cli_set_process_title 2017-08-16 17:05:47 +02:00
Anatol Belski 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
Joe Watkins 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
Joe Watkins 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
Peter Kokot 924ff6164e Update copyright year to 2017 2017-07-24 17:23:57 +01:00
Anatol Belski 8871d2d12e Fixed bug #74849 Process is started as interactive shell in PhpStorm 2017-07-03 21:59:31 +02:00