clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-09-06 21:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed php SCRIPT_NAME usage when --php-app is in place

Browse Source
This commit is contained in:
Unbit
2014-10-18 04:20:21 +02:00
parent 19c2e22d37
commit 04ad72ef44
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/php/php_plugin.c
+13 -5
View File
@@ -674,6 +674,7 @@ int uwsgi_php_request(struct wsgi_request *wsgi_req) {
size_t real_filename_len = 0;
struct stat php_stat;
char *filename = NULL;
int force_empty_script_name = 0;
zend_file_handle file_handle;
@@ -742,6 +743,7 @@ int uwsgi_php_request(struct wsgi_request *wsgi_req) {
appready:
wsgi_req->path_info = "";
wsgi_req->path_info_len = 0;
force_empty_script_name = 1;
goto secure2;
}
@@ -871,13 +873,19 @@ secure2:
}
secure3:
wsgi_req->script_name = orig_path_info;
if (path_info) {
wsgi_req->script_name_len = path_info - orig_path_info;
if (force_empty_script_name) {
wsgi_req->script_name = "";
wsgi_req->script_name_len = 0;
}
else {
wsgi_req->script_name_len = orig_path_info_len;
}
wsgi_req->script_name = orig_path_info;
if (path_info) {
wsgi_req->script_name_len = path_info - orig_path_info;
}
else {
wsgi_req->script_name_len = orig_path_info_len;
}
}
#ifdef UWSGI_DEBUG
uwsgi_log("php filename = %s script_name = %.*s (%d) document_root = %.*s (%d)\n", real_filename, wsgi_req->script_name_len, wsgi_req->script_name, wsgi_req->script_name_len,