summaryrefslogtreecommitdiff
path: root/Lib/http/server.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-10-07 11:01:47 +0000
committerMartin Panter <vadmium+py@gmail.com>2015-10-07 11:01:47 +0000
commita32a738a7abcc86dc3536e722952d971c8db0032 (patch)
treeac647fa04b07ced0999ac98d93d162d56feeb012 /Lib/http/server.py
parent720e5857ecdfa70c1eb719356bcf78f0e7241d0e (diff)
parent7b023565142fc77ff13b1c13de2f3bb92025c4e8 (diff)
downloadcpython-a32a738a7abcc86dc3536e722952d971c8db0032.tar.gz
Merge typo fixes from 3.4 into 3.5
Diffstat (limited to 'Lib/http/server.py')
-rw-r--r--Lib/http/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py
index fde2f144fb..e1b71abf37 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -831,7 +831,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
def _url_collapse_path(path):
"""
Given a URL path, remove extra '/'s and '.' path elements and collapse
- any '..' references and returns a colllapsed path.
+ any '..' references and returns a collapsed path.
Implements something akin to RFC-2396 5.2 step 6 to parse relative paths.
The utility of this function is limited to is_cgi method and helps