[Python-checkins] python/dist/src/Lib BaseHTTPServer.py,1.23,1.24

[akuchling@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv17964

Modified Files:
	BaseHTTPServer.py 
Log Message:
[Bug #676292] BaseHTTPServer incorrectly parses protocol; fix by Andrew Dalke
   * Treat major, minor numbers of HTTP version as separate integers
   * Fix errors if version string is "HTTP/1.2.3" or even simply "BLAH". 
   * send_error() checks if 'self.command' is a
     HEAD.  However, if there's an error parsing the first line of the
     HTTP request the self.command wasn't set yet; force 
     self.command to be initialized to None.


Index: BaseHTTPServer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/BaseHTTPServer.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** BaseHTTPServer.py	3 Feb 2003 15:21:15 -0000	1.23
--- BaseHTTPServer.py	3 Feb 2003 19:11:18 -0000	1.24
***************
*** 227,230 ****
--- 227,231 ----
  
          """
+         self.command = None  # set in case of error on the first line
          self.request_version = version = "HTTP/0.9" # Default
          self.close_connection = 1
***************
*** 242,254 ****
                  return False
              try:
!                 version_number = float(version.split('/', 1)[1])
!             except ValueError:
                  self.send_error(400, "Bad request version (%s)" % `version`)
                  return False
!             if version_number >= 1.1 and self.protocol_version >= "HTTP/1.1":
                  self.close_connection = 0
!             if version_number >= 2.0:
                  self.send_error(505,
!                                 "Invalid HTTP Version (%f)" % version_number)
                  return False
          elif len(words) == 2:
--- 243,265 ----
                  return False
              try:
!                 base_version_number = version.split('/', 1)[1]
!                 version_number = base_version_number.split(".")
!                 # RFC 2145 section 3.1 says there can be only one "." and
!                 #   - major and minor numbers MUST be treated as
!                 #      separate integers;
!                 #   - HTTP/2.4 is a lower version than HTTP/2.13, which in
!                 #      turn is lower than HTTP/12.3;
!                 #   - Leading zeros MUST be ignored by recipients.
!                 if len(version_number) != 2:
!                     raise ValueError
!                 version_number = int(version_number[0]), int(version_number[1])
!             except (ValueError, IndexError):
                  self.send_error(400, "Bad request version (%s)" % `version`)
                  return False
!             if version_number >= (1, 1) and self.protocol_version >= "HTTP/1.1":
                  self.close_connection = 0
!             if version_number >= (2, 0):
                  self.send_error(505,
!                           "Invalid HTTP Version (%s)" % base_version_number)
                  return False
          elif len(words) == 2: