Fix default reason phrase if header line ends with CRLF #26
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sad-spirit
requested changes
Jun 17, 2022
HTTP/Request2/Response.php
Outdated
| @@ -218,7 +218,7 @@ public static function getDefaultReasonPhrase($code = null) | |||
| */ | |||
| public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null) | |||
| { | |||
| if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) { | |||
| if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', trim($statusLine), $m)) { | |||
There was a problem hiding this comment.
Looking at section 6.1 of RFC 2616 which gives Status-Line as
Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF
and later the Reason-Phrase as
Reason-Phrase = *<TEXT, excluding CR, LF>
both my regex and your fix is incorrect. The former treats Reason-Phrase as optional (rather than mandatory but possibly empty) and the latter essentially allows Status-Line to start with whitespace. Can you fix the regex instead? I guess changing the part for the Reason-Phrase from (?: (.+))? to something like space here(.*) will work.
There was a problem hiding this comment.
Sorry, space here[^\\r\\n]* of course.
There was a problem hiding this comment.
I'm not sure if I got that right, but I changed it now to allow empty reason phrase (or spaces) and use the default then.
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Nov 4, 2023
2.6.0 (2023-11-01) * Tested on PHP 8.2 and 8.3 * Use psalm for static analysis, several minor issues fixed * Correctly parse HTTP status line with an empty reason-phrase (see pear/HTTP_Request2#26) * Updated Public Suffix List
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I discovered that the reason phrase is empty if it's not part of the status line and the Curl adapter is used. In this case the line ends with CRLF (it does not, if the Socket adapter is used), like shown in the tests.