delta/php-git.git/sapi/cli/php_cli_server.c, branch php-7.0.0RC3 git.php.net: repository/php-src.git Merge branch 'PHP-5.6' 2015-09-05T12:43:19+00:00 Christoph M. Becker cmb@php.net 2015-09-05T12:43:19+00:00 cc9da62bdb815421151958e8f2971d992291192a * PHP-5.6: Fix #68291: 404 on urls with '+' Resolved conflicts: sapi/cli/php_cli_server.c 
* PHP-5.6:
  Fix #68291: 404 on urls with '+'

Resolved conflicts:
	sapi/cli/php_cli_server.c
Fix #68291: 404 on urls with '+' 2015-09-05T12:34:08+00:00 Christoph M. Becker cmbecker69@gmx.de 2015-09-05T11:52:41+00:00 fd94c92171eb4f25a792b38c7754bdd76933ec04 URI paths have to be treated according to RFC 3986 by the CLI web server, not as application/x-www-form-urlencoded. 
URI paths have to be treated according to RFC 3986 by the CLI web server, not
as application/x-www-form-urlencoded.
Merge branch 'PHP-5.6' 2015-08-14T15:18:35+00:00 Christoph M. Becker cmb@php.net 2015-08-14T15:18:35+00:00 fc444896af3bfd6c051913b6f0db49f3376e586b * PHP-5.6: Fix #70264: CLI server directory traversal 
* PHP-5.6:
  Fix #70264: CLI server directory traversal
Fix #70264: CLI server directory traversal 2015-08-14T15:05:31+00:00 Christoph M. Becker cmb@php.net 2015-08-14T14:56:40+00:00 9c805a6cb31596c41609512bdd8a9a76c9ce9b15 On Windows the built-in webserver doesn't prevent directory traversal when backslashes are used as path component separators. Even though that is not a security issue (the CLI webserver is meant for testing only), we fix that by replacing backslashes in the path with slashes on Windows, because backslashes may be valid characters for file names on other systems, but not on Windows. 
On Windows the built-in webserver doesn't prevent directory traversal when
backslashes are used as path component separators. Even though that is not a
security issue (the CLI webserver is meant for testing only), we fix that by
replacing backslashes in the path with slashes on Windows, because backslashes
may be valid characters for file names on other systems, but not on Windows.
Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE 2015-08-09T00:37:16+00:00 wusuopu admin@longchangjin.cn 2014-11-03T06:52:16+00:00 72976e2497f963b7f203443f9881d52e0ff97962 The patch will store Content-Type header value in both HTTP_CONTENT_TYPE field and CONTENT_TYPE field. 
The patch will store Content-Type header value in both HTTP_CONTENT_TYPE field and CONTENT_TYPE field.
Merge branch 'PHP-5.6' 2015-08-09T00:51:16+00:00 Christoph M. Becker cmb@php.net 2015-08-09T00:51:16+00:00 fc69549593cb1ab4f9fa0fd41d74000cd4a98894 * PHP-5.6: Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE added tests for bug #66606 
* PHP-5.6:
  Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE
  added tests for bug #66606
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30T10:59:27+00:00 Dmitry Stogov dmitry@zend.com 2015-06-30T10:59:27+00:00 7aa7627172c11979ec45c2db85f99182812ee59d 






Merge branch 'PHP-5.6'
2015-06-27T12:35:20+00:00

Christoph M. Becker
cmb@php.net

2015-06-27T12:35:20+00:00

4e32ecb90a00e46ebef2c2636622c8f630b3a5e2

* PHP-5.6:
  Fix #64878: 304 responses return Content-Type header





* PHP-5.6:
  Fix #64878: 304 responses return Content-Type header







Fix #64878: 304 responses return Content-Type header
2015-06-27T12:28:33+00:00

Christoph M. Becker
cmbecker69@gmx.de

2015-05-18T19:28:22+00:00

1920ba6f7bd1ce3c866ca947f51a1633dc892fce

According to RFC 7232 304 responses should not send a Content-Type header,
so the CLI server should comply.





According to RFC 7232 304 responses should not send a Content-Type header,
so the CLI server should comply.







cleanup more redundant S_IS* declarations
2015-05-25T16:03:26+00:00

Anatol Belski
ab@php.net

2015-05-25T11:28:18+00:00

cfadcfc73486828b53ec45217fd00659a1a2e918