author | Yiteng Zhang <yiteng.zhang@oracle.com> |
Mon, 09 May 2016 14:33:25 -0700 | |
changeset 5947 | d9fcc08e98bf |
parent 5109 | 5d341c4a6b80 |
permissions | -rw-r--r-- |
5947
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
1 |
# This issue has been offered to upstream and merged. |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
2 |
# Please see https://bitbucket.org/cherrypy/cherrypy/commits/89dbd2f00b541f8f8378eaabf2caef3e932bb805 |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
3 |
# HG changeset patch |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
4 |
# User Yiteng Zhang <[email protected]> |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
5 |
# Date 1461887965 25200 |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
6 |
# Node ID 89dbd2f00b541f8f8378eaabf2caef3e932bb805 |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
7 |
# Parent ea07b29deabd28d5a10b764a1a452c876692d028 |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
8 |
parse_request_uri() incorrectly parses URI which contains :// |
5109
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
9 |
|
5947
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
10 |
--- cherrypy/wsgiserver/wsgiserver2.py |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
11 |
+++ cherrypy/wsgiserver/wsgiserver2.py |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
12 |
@@ -92,6 +92,7 @@ |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
13 |
import traceback as traceback_ |
5109
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
14 |
import operator |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
15 |
from urllib import unquote |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
16 |
+from urlparse import urlparse |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
17 |
import warnings |
5947
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
18 |
import errno |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
19 |
import logging |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
20 |
@@ -830,15 +831,12 @@ |
5109
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
21 |
if uri == ASTERISK: |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
22 |
return None, None, uri |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
23 |
|
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
24 |
- i = uri.find('://') |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
25 |
- if i > 0 and QUESTION_MARK not in uri[:i]: |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
26 |
+ scheme, authority, path, params, query, fragment = urlparse(uri) |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
27 |
+ if scheme and QUESTION_MARK not in scheme: |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
28 |
# An absoluteURI. |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
29 |
# If there's a scheme (and it must be http or https), then: |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
30 |
# http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
31 |
# ]] |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
32 |
- scheme, remainder = uri[:i].lower(), uri[i + 3:] |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
33 |
- authority, path = remainder.split(FORWARD_SLASH, 1) |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
34 |
- path = FORWARD_SLASH + path |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
35 |
return scheme, authority, path |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
36 |
|
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
37 |
if uri.startswith(FORWARD_SLASH): |
5947
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
38 |
--- cherrypy/wsgiserver/wsgiserver3.py |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
39 |
+++ cherrypy/wsgiserver/wsgiserver3.py |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
40 |
@@ -92,6 +92,8 @@ |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
41 |
import traceback as traceback_ |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
42 |
import errno |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
43 |
import logging |
5109
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
44 |
+from urllib.parse import urlparse |
5947
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
45 |
+ |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
46 |
try: |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
47 |
# prefer slower Python-based io module |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
48 |
import _pyio as io |
d9fcc08e98bf
23093717 Upgrade cherrypy to 5.1.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
5109
diff
changeset
|
49 |
@@ -819,14 +821,13 @@ |
5109
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
50 |
if uri == ASTERISK: |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
51 |
return None, None, uri |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
52 |
|
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
53 |
- scheme, sep, remainder = uri.partition(b'://') |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
54 |
- if sep and QUESTION_MARK not in scheme: |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
55 |
+ scheme, authority, path, params, query, fragment = urlparse(uri) |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
56 |
+ if scheme and QUESTION_MARK not in scheme: |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
57 |
# An absoluteURI. |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
58 |
# If there's a scheme (and it must be http or https), then: |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
59 |
# http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
60 |
# ]] |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
61 |
- authority, path_a, path_b = remainder.partition(FORWARD_SLASH) |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
62 |
- return scheme.lower(), authority, path_a + path_b |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
63 |
+ return scheme, authority, path |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
64 |
|
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
65 |
if uri.startswith(FORWARD_SLASH): |
5d341c4a6b80
19877233 ply should hookup its tests
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
66 |
# An abs_path. |