dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue 964, thanks Michael and Jonathan

Browse Source
This commit is contained in:
mdipierro
2012-08-30 17:04:07 -05:00
parent b3be11953d
commit c844759c63
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/main.py
+9 -5
View File
@@ -30,7 +30,7 @@ import string
import urllib2
from thread import allocate_lock
from fileutils import abspath, write_file, parse_version
from fileutils import abspath, write_file, parse_version, copystream
from settings import global_settings
from admin import add_path_first, create_missing_folders, create_missing_app_folders
from globals import current
@@ -84,7 +84,6 @@ from http import HTTP, redirect
from globals import Request, Response, Session
from compileapp import build_environment, run_models_in, \
run_controller_in, run_view_in
from fileutils import copystream, parse_version
from contenttype import contenttype
from dal import BaseAdapter
from settings import global_settings
@@ -384,7 +383,7 @@ def wsgibase(environ, responder):
# ##################################################
eget = environ.get
if not eget('PATH_INFO',None) and eget('REQUEST_URI',None):
if not eget('PATH_INFO') and eget('REQUEST_URI'):
# for fcgi, get path_info and
# query_string from request_uri
items = environ['REQUEST_URI'].split('?')
@@ -393,9 +392,14 @@ def wsgibase(environ, responder):
environ['QUERY_STRING'] = items[1]
else:
environ['QUERY_STRING'] = ''
if not eget('HTTP_HOST',None):
elif not eget('REQUEST_URI'):
if eget('QUERY_STRING'):
environ['REQUEST_URI'] = eget('PATH_INFO') + '?' + eget('QUERY_STRING')
else:
environ['REQUEST_URI'] = eget('PATH_INFO')
if not eget('HTTP_HOST'):
environ['HTTP_HOST'] = \
eget('SERVER_NAME')+':'+eget('SERVER_PORT')
eget('SERVER_NAME') + ':' + eget('SERVER_PORT')
(static_file, environ) = url_in(request, environ)