use realpath() for document_root

unbit · Apr 5, 2011 · d4f23cc · d4f23cc
1 parent b0db67d
commit d4f23cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/plugins/python/pyloader.c b/plugins/python/pyloader.c
@@ -439,6 +439,7 @@ PyObject *uwsgi_uwsgi_loader(void *arg1) {
 	if (quick_callable[strlen(quick_callable) -2 ] == '(' && quick_callable[strlen(quick_callable) -1] ==')') {
 		quick_callable[strlen(quick_callable) -2 ] = 0;
 		tmp_callable = PyDict_GetItemString(wsgi_dict, quick_callable);
+		quick_callable[strlen(quick_callable) -2 ] = '(';
 		if (tmp_callable) {
 			return python_call(tmp_callable, PyTuple_New(0), 0);
 		}

diff --git a/uwsgi.c b/uwsgi.c
@@ -2483,7 +2483,7 @@ uwsgi.shared->hooks[UWSGI_MODIFIER_PING] = uwsgi_request_ping;	//100
 			usm->mountpoint = optarg;
 			usm->mountpoint_len = docroot-usm->mountpoint;
 
-			usm->document_root = docroot+1;
+			usm->document_root = realpath(docroot+1, NULL);
 			usm->document_root_len = strlen(usm->document_root);
 
 			uwsgi_log("static-mapped %.*s to %.*s\n", usm->mountpoint_len, usm->mountpoint, usm->document_root_len, usm->document_root);