3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-28 07:28:13 +08:00
Code Issues Projects Releases Wiki Activity

SCRIPT_FILENAME should be relative to document root, and begin with slash.

Browse Source
This commit is contained in:
valenok 2010-09-19 21:57:34 +01:00
parent fb87fd5343
commit 7865ed7bad
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mongoose.c
View File

@ -1528,7 +1528,7 @@ static void convert_uri_to_file_name(struct mg_connection *conn,
change_slashes_to_backslashes(buf);
#endif /* _WIN32 */
DEBUG_TRACE(("[%s] -> [%s]", uri, buf));
DEBUG_TRACE(("[%s] -> [%s], [%.*s]", uri, buf, (int) vec.len, vec.ptr));
}
static int sslize(struct mg_connection *conn, int (*func)(SSL *)) {
@ -2743,7 +2743,7 @@ static char *addenv(struct cgi_env_block *block, const char *fmt, ...) {
static void prepare_cgi_environment(struct mg_connection *conn,
const char *prog,
struct cgi_env_block *blk) {
const char *s, *script_filename, *slash;
const char *s, *slash;
struct vec var_vec, root;
char *p;
int i;
@ -2751,11 +2751,6 @@ static void prepare_cgi_environment(struct mg_connection *conn,
blk->len = blk->nvars = 0;
blk->conn = conn;
// SCRIPT_FILENAME
script_filename = prog;
if ((s = strrchr(prog, '/')) != NULL)
script_filename = s + 1;
get_document_root(conn, &root);
addenv(blk, "SERVER_NAME=%s", conn->ctx->config[AUTHENTICATION_DOMAIN]);
@ -2773,10 +2768,13 @@ static void prepare_cgi_environment(struct mg_connection *conn,
addenv(blk, "REMOTE_PORT=%d", conn->request_info.remote_port);
addenv(blk, "REQUEST_URI=%s", conn->request_info.uri);
// SCRIPT_NAME
assert(conn->request_info.uri[0] == '/');
slash = strrchr(conn->request_info.uri, '/');
addenv(blk, "SCRIPT_NAME=%.*s%s",
(slash - conn->request_info.uri) + 1, conn->request_info.uri,
script_filename);
if ((s = strrchr(prog, '/')) == NULL)
s = prog;
addenv(blk, "SCRIPT_NAME=%.*s%s", slash - conn->request_info.uri,
conn->request_info.uri, s);
addenv(blk, "SCRIPT_FILENAME=%s", prog);
addenv(blk, "PATH_TRANSLATED=%s", prog);