summaryrefslogtreecommitdiff
path: root/sapi/cli
diff options
context:
space:
mode:
Diffstat (limited to 'sapi/cli')
-rw-r--r--sapi/cli/php.1.in24
-rw-r--r--sapi/cli/php_cli.c3
-rw-r--r--sapi/cli/php_cli_server.c71
-rw-r--r--sapi/cli/tests/bug65066_100.phpt39
-rw-r--r--sapi/cli/tests/bug65066_422.phpt39
-rw-r--r--sapi/cli/tests/bug65066_511.phpt39
-rw-r--r--sapi/cli/tests/bug65633.phpt48
7 files changed, 222 insertions, 41 deletions
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
index 0e9d07ac7..c113030d1 100644
--- a/sapi/cli/php.1.in
+++ b/sapi/cli/php.1.in
@@ -1,6 +1,8 @@
.TH PHP 1 "2013" "The PHP Group" "Scripting Language"
.SH NAME
php \- PHP Command Line Interface 'CLI'
+.P
+php-cgi \- PHP Common Gateway Interface 'CGI' command
.SH SYNOPSIS
.B php
[options] [
@@ -18,21 +20,21 @@ php \- PHP Command Line Interface 'CLI'
.LP
.B php
[options] [\-B
-.IR code ]
+.IR begin_code ]
.B \-R
.IR code
[\-E
-.IR code ]
+.IR end_code ]
[[\-\-]
.IR args.\|.\|. ]
.LP
.B php
[options] [\-B
-.IR code ]
+.IR begin_code ]
.B \-F
.IR file
[\-E
-.IR code ]
+.IR end_code ]
[[\-\-]
.IR args.\|.\|. ]
.LP
@@ -84,7 +86,7 @@ and therefore reading from
.B STDIN
explicitly changes the next input line or skips input lines.
.LP
-PHP also contains an embedded web server for application development purpose. By using the \-S option where
+PHP also contains an built-in web server for application development purpose. By using the \-S option where
.B addr:port
point to a local address and port PHP will listen to HTTP requests on that address and port and serve files from the current working directory or the
.B docroot
@@ -235,9 +237,9 @@ without using script tags
.B \-\-process\-begin \fIcode\fP
.TP
.PD 1
-.B \-B \fIcode\fP
+.B \-B \fIbegin_code\fP
Run PHP
-.IR code
+.IR begin_code
before processing input lines
.TP
.PD 0
@@ -262,9 +264,9 @@ for every input line
.B \-\-process\-end \fIcode\fP
.TP
.PD 1
-.B \-E \fIcode\fP
+.B \-E \fIend_code\fP
Run PHP
-.IR code
+.IR end_code
after processing all input lines
.TP
.PD 0
@@ -279,14 +281,14 @@ Output HTML syntax highlighted source
.TP
.PD 1
.B \-S \fIaddr:port\fP
-Start embedded Webserver on the given local address and port
+Start built-in web server on the given local address and port
.TP
.PD 0
.B \-\-docroot \fIdocroot\fP
.TP
.PD 1
.B \-t \fIdocroot\fP
-Specify the document root to be used by the embedded web server
+Specify the document root to be used by the built-in web server
.TP
.PD 0
.B \-\-version
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index c01f3705b..aa300ce88 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -498,6 +498,7 @@ static void php_cli_usage(char *argv0)
" %s [options] -r <code> [--] [args...]\n"
" %s [options] [-B <begin_code>] -R <code> [-E <end_code>] [--] [args...]\n"
" %s [options] [-B <begin_code>] -F <file> [-E <end_code>] [--] [args...]\n"
+ " %s [options] -S <addr>:<port> [-t docroot]\n"
" %s [options] -- [args...]\n"
" %s [options] -a\n"
"\n"
@@ -539,7 +540,7 @@ static void php_cli_usage(char *argv0)
" --rz <name> Show information about Zend extension <name>.\n"
" --ri <name> Show configuration for extension <name>.\n"
"\n"
- , prog, prog, prog, prog, prog, prog);
+ , prog, prog, prog, prog, prog, prog, prog);
}
/* }}} */
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 903f04212..4da55acc6 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -20,6 +20,7 @@
/* $Id: php_cli.c 306938 2011-01-01 02:17:06Z felipe $ */
#include <stdio.h>
+#include <stdlib.h>
#include <fcntl.h>
#include <assert.h>
@@ -192,17 +193,17 @@ typedef struct php_cli_server {
HashTable clients;
} php_cli_server;
-typedef struct php_cli_server_http_reponse_status_code_pair {
+typedef struct php_cli_server_http_response_status_code_pair {
int code;
const char *str;
-} php_cli_server_http_reponse_status_code_pair;
+} php_cli_server_http_response_status_code_pair;
typedef struct php_cli_server_ext_mime_type_pair {
const char *ext;
const char *mime_type;
} php_cli_server_ext_mime_type_pair;
-static php_cli_server_http_reponse_status_code_pair status_map[] = {
+static php_cli_server_http_response_status_code_pair status_map[] = {
{ 100, "Continue" },
{ 101, "Switching Protocols" },
{ 200, "OK" },
@@ -249,7 +250,7 @@ static php_cli_server_http_reponse_status_code_pair status_map[] = {
{ 511, "Network Authentication Required" },
};
-static php_cli_server_http_reponse_status_code_pair template_map[] = {
+static php_cli_server_http_response_status_code_pair template_map[] = {
{ 400, "<h1>%s</h1><p>Your browser sent a request that this server could not understand.</p>" },
{ 404, "<h1>%s</h1><p>The requested resource %s was not found on this server.</p>" },
{ 500, "<h1>%s</h1><p>The server is temporarily unavailable.</p>" },
@@ -333,28 +334,43 @@ static char *get_last_error() /* {{{ */
return pestrdup(strerror(errno), 1);
} /* }}} */
+static int status_comp(const void *a, const void *b) /* {{{ */
+{
+ const php_cli_server_http_response_status_code_pair *pa = (const php_cli_server_http_response_status_code_pair *) a;
+ const php_cli_server_http_response_status_code_pair *pb = (const php_cli_server_http_response_status_code_pair *) b;
+
+ if (pa->code < pb->code) {
+ return -1;
+ } else if (pa->code > pb->code) {
+ return 1;
+ }
+
+ return 0;
+} /* }}} */
+
static const char *get_status_string(int code) /* {{{ */
{
- size_t e = (sizeof(status_map) / sizeof(php_cli_server_http_reponse_status_code_pair));
- size_t s = 0;
+ php_cli_server_http_response_status_code_pair needle, *result = NULL;
- while (e != s) {
- size_t c = MIN((e + s + 1) / 2, e - 1);
- int d = status_map[c].code;
- if (d > code) {
- e = c;
- } else if (d < code) {
- s = c;
- } else {
- return status_map[c].str;
- }
+ needle.code = code;
+ needle.str = NULL;
+
+ result = bsearch(&needle, status_map, sizeof(status_map) / sizeof(needle), sizeof(needle), status_comp);
+
+ if (result) {
+ return result->str;
}
- return NULL;
+
+ /* Returning NULL would require complicating append_http_status_line() to
+ * not segfault in that case, so let's just return a placeholder, since RFC
+ * 2616 requires a reason phrase. This is basically what a lot of other Web
+ * servers do in this case anyway. */
+ return "Unknown Status Code";
} /* }}} */
static const char *get_template_string(int code) /* {{{ */
{
- size_t e = (sizeof(template_map) / sizeof(php_cli_server_http_reponse_status_code_pair));
+ size_t e = (sizeof(template_map) / sizeof(php_cli_server_http_response_status_code_pair));
size_t s = 0;
while (e != s) {
@@ -392,7 +408,7 @@ static void append_essential_headers(smart_str* buffer, php_cli_server_client *c
{
{
char **val;
- if (SUCCESS == zend_hash_find(&client->request.headers, "Host", sizeof("Host"), (void**)&val)) {
+ if (SUCCESS == zend_hash_find(&client->request.headers, "host", sizeof("host"), (void**)&val)) {
smart_str_appendl_ex(buffer, "Host", sizeof("Host") - 1, persistent);
smart_str_appendl_ex(buffer, ": ", sizeof(": ") - 1, persistent);
smart_str_appends_ex(buffer, *val, persistent);
@@ -542,7 +558,7 @@ static char *sapi_cli_server_read_cookies(TSRMLS_D) /* {{{ */
{
php_cli_server_client *client = SG(server_context);
char **val;
- if (FAILURE == zend_hash_find(&client->request.headers, "Cookie", sizeof("Cookie"), (void**)&val)) {
+ if (FAILURE == zend_hash_find(&client->request.headers, "cookie", sizeof("cookie"), (void**)&val)) {
return NULL;
}
return *val;
@@ -1309,7 +1325,7 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
static const char *index_files[] = { "index.php", "index.html", NULL };
char *buf = safe_pemalloc(1, request->vpath_len, 1 + document_root_len + 1 + sizeof("index.html"), 1);
char *p = buf, *prev_path = NULL, *q, *vpath;
- size_t prev_path_len;
+ size_t prev_path_len = 0;
int is_static_file = 0;
if (!buf) {
@@ -1540,12 +1556,9 @@ static int php_cli_server_client_read_request_on_header_value(php_http_parser *p
return 1;
}
{
- char *header_name = client->current_header_name;
- size_t header_name_len = client->current_header_name_len;
- char c = header_name[header_name_len];
- header_name[header_name_len] = '\0';
- zend_hash_add(&client->request.headers, header_name, header_name_len + 1, &value, sizeof(char *), NULL);
- header_name[header_name_len] = c;
+ char *header_name = zend_str_tolower_dup(client->current_header_name, client->current_header_name_len);
+ zend_hash_add(&client->request.headers, header_name, client->current_header_name_len + 1, &value, sizeof(char *), NULL);
+ efree(header_name);
}
if (client->current_header_name_allocated) {
@@ -1703,7 +1716,7 @@ static void php_cli_server_client_populate_request_info(const php_cli_server_cli
request_info->post_data = client->request.content;
request_info->content_length = request_info->post_data_length = client->request.content_len;
request_info->auth_user = request_info->auth_password = request_info->auth_digest = NULL;
- if (SUCCESS == zend_hash_find(&client->request.headers, "Content-Type", sizeof("Content-Type"), (void**)&val)) {
+ if (SUCCESS == zend_hash_find(&client->request.headers, "content-type", sizeof("content-type"), (void**)&val)) {
request_info->content_type = *val;
}
} /* }}} */
@@ -1941,7 +1954,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv
static int php_cli_server_request_startup(php_cli_server *server, php_cli_server_client *client TSRMLS_DC) { /* {{{ */
char **auth;
php_cli_server_client_populate_request_info(client, &SG(request_info));
- if (SUCCESS == zend_hash_find(&client->request.headers, "Authorization", sizeof("Authorization"), (void**)&auth)) {
+ if (SUCCESS == zend_hash_find(&client->request.headers, "authorization", sizeof("authorization"), (void**)&auth)) {
php_handle_auth_data(*auth TSRMLS_CC);
}
SG(sapi_headers).http_response_code = 200;
diff --git a/sapi/cli/tests/bug65066_100.phpt b/sapi/cli/tests/bug65066_100.phpt
new file mode 100644
index 000000000..3a97c7e91
--- /dev/null
+++ b/sapi/cli/tests/bug65066_100.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Bug #65066 (Cli server not responsive when responding with 422 http status code): 100 status code
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start('http_response_code(100);');
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+ die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+Host: {$host}
+
+
+HEADER
+)) {
+ while (!feof($fp)) {
+ echo fgets($fp);
+ }
+}
+?>
+--EXPECTF--
+HTTP/1.1 100 Continue
+Host: %s
+Connection: close
+X-Powered-By: PHP/%s
+Content-type: text/html
diff --git a/sapi/cli/tests/bug65066_422.phpt b/sapi/cli/tests/bug65066_422.phpt
new file mode 100644
index 000000000..2552d1d11
--- /dev/null
+++ b/sapi/cli/tests/bug65066_422.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Bug #65066 (Cli server not responsive when responding with 422 http status code): 422 status code
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start('http_response_code(422);');
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+ die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+Host: {$host}
+
+
+HEADER
+)) {
+ while (!feof($fp)) {
+ echo fgets($fp);
+ }
+}
+?>
+--EXPECTF--
+HTTP/1.1 422 Unknown Status Code
+Host: %s
+Connection: close
+X-Powered-By: PHP/%s
+Content-type: text/html
diff --git a/sapi/cli/tests/bug65066_511.phpt b/sapi/cli/tests/bug65066_511.phpt
new file mode 100644
index 000000000..aa4a9a003
--- /dev/null
+++ b/sapi/cli/tests/bug65066_511.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Bug #65066 (Cli server not responsive when responding with 422 http status code): 511 status code
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start('http_response_code(511);');
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+ die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+Host: {$host}
+
+
+HEADER
+)) {
+ while (!feof($fp)) {
+ echo fgets($fp);
+ }
+}
+?>
+--EXPECTF--
+HTTP/1.1 511 Network Authentication Required
+Host: %s
+Connection: close
+X-Powered-By: PHP/%s
+Content-type: text/html
diff --git a/sapi/cli/tests/bug65633.phpt b/sapi/cli/tests/bug65633.phpt
new file mode 100644
index 000000000..55834095b
--- /dev/null
+++ b/sapi/cli/tests/bug65633.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Bug #65633 (built-in server treat some http headers as case-sensitive)
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start(<<<'PHP'
+var_dump($_COOKIE, $_SERVER['HTTP_FOO']);
+PHP
+);
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+ die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+cookie: foo=bar
+foo: bar
+
+
+HEADER
+)) {
+ while (!feof($fp)) {
+ echo fgets($fp);
+ }
+}
+
+fclose($fp);
+?>
+--EXPECTF--
+HTTP/1.1 200 OK
+Connection: close
+X-Powered-By: %s
+Content-type: text/html
+
+array(1) {
+ ["foo"]=>
+ string(3) "bar"
+}
+string(3) "bar"
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-02 00:02:14 +0000