Robert Brewer avatar Robert Brewer committed beb6ac5

Fix to 2.1, 2.2, 3.0 for bugs in Range slicing and final boundary. Also made the output match Apache output (CRLFs).

Comments (0)

Files changed (2)

cherrypy/lib/cptools.py

                         yield ("\nContent-range: bytes %s-%s/%s\n\n"
                                % (start, stop - 1, c_len))
                         bodyfile.seek(start)
-                        yield bodyfile.read((stop + 1) - start)
+                        yield bodyfile.read(stop - start)
                         yield "\n"
                     # Final boundary
-                    yield "--" + boundary
+                    yield "--" + boundary + "--"
                 response.body = fileRanges()
         else:
             response.headerMap['Content-Length'] = c_len

cherrypy/test/test_core.py

 Content-type: text/html
 Content-range: bytes 4-6/14
 
-o, w
+o, 
 --%s
 Content-type: text/html
 Content-range: bytes 2-5/14
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.