haiwan
/
http-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove EOL whitespace

Browse Source
event_stream
Ryan Dahl 15 years ago
parent 402eda40a7
commit 79947a7334
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

36
http_parser.c
Unescape View File

@ -1,25 +1,25 @@
/* Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
*
* Some parts of this source file were taken from NGINX
* (src/http/ngx_http_parser.c) copyright (C) 2002-2009 Igor Sysoev.
*
* (src/http/ngx_http_parser.c) copyright (C) 2002-2009 Igor Sysoev.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
* IN THE SOFTWARE.
*/
#include <http_parser.h>
#include <stdint.h>
@ -148,7 +148,7 @@ static const uint32_t usual[] = {
#define USUAL(c) (usual[c >> 5] & (1 << (c & 0x1f)))
enum state
enum state
{ s_dead = 1 /* important that this is > 0 */
, s_start_res
@ -212,7 +212,7 @@ enum state
, s_body_identity_eof
};
enum header_states
enum header_states
{ h_general = 0
, h_C
, h_CO
@ -249,15 +249,15 @@ enum flags
#if HTTP_PARSER_STRICT
# define STRICT_CHECK(cond) if (cond) goto error
# define NEW_MESSAGE() (http_should_keep_alive(parser) ? start_state : s_dead)
#else
# define STRICT_CHECK(cond)
#else
# define STRICT_CHECK(cond)
# define NEW_MESSAGE() start_state
#endif
static inline
size_t parse (http_parser *parser, const char *data, size_t len, int start_state)
{
char c, ch;
char c, ch;
const char *p, *pe;
ssize_t to_read;
@ -298,7 +298,7 @@ size_t parse (http_parser *parser, const char *data, size_t len, int start_state
switch (ch) {
case 'H':
state = s_res_H;
state = s_res_H;
break;
case CR:
@ -321,7 +321,7 @@ size_t parse (http_parser *parser, const char *data, size_t len, int start_state
state = s_res_HTT;
break;
case s_res_HTT:
case s_res_HTT:
STRICT_CHECK(ch != 'P');
state = s_res_HTTP;
break;
@ -353,7 +353,7 @@ size_t parse (http_parser *parser, const char *data, size_t len, int start_state
if (parser->http_major > 999) goto error;
break;
}
/* first digit of minor HTTP version */
case s_res_first_http_minor:
if (ch < '0' || ch > '9') goto error;
@ -464,7 +464,7 @@ size_t parse (http_parser *parser, const char *data, size_t len, int start_state
if (strncmp(parser->buffer, "GET", 3) == 0) {
parser->method = HTTP_GET;
break;
}
}
if (strncmp(parser->buffer, "PUT", 3) == 0) {
parser->method = HTTP_PUT;
@ -706,7 +706,7 @@ size_t parse (http_parser *parser, const char *data, size_t len, int start_state
switch (ch) {
case '?':
break; // XXX ignore extra '?' ... is this right?
break; // XXX ignore extra '?' ... is this right?
case ' ':
CALLBACK(url);
state = s_req_http_start;
@ -1089,7 +1089,7 @@ size_t parse (http_parser *parser, const char *data, size_t len, int start_state
header_state = h_general;
break;
}
}
switch (header_state) {
case h_transfer_encoding:
@ -1162,7 +1162,7 @@ size_t parse (http_parser *parser, const char *data, size_t len, int start_state
/* Transfer-Encoding: chunked */
case h_matching_transfer_encoding_chunked:
index++;
if (index > sizeof(CHUNKED)-1
if (index > sizeof(CHUNKED)-1
|| c != CHUNKED[index]) {
header_state = h_general;
} else if (index == sizeof(CHUNKED)-2) {
@ -1241,7 +1241,7 @@ size_t parse (http_parser *parser, const char *data, size_t len, int start_state
parser->body_read = 0;
CALLBACK2(headers_complete);
if (parser->flags & F_CHUNKED) {
/* chunked encoding - ignore Content-Length header */
state = s_chunk_size_start;

14
http_parser.h
Unescape View File

@ -1,22 +1,22 @@
/* Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
* IN THE SOFTWARE.
*/
#ifndef http_parser_h
#define http_parser_h
@ -30,8 +30,8 @@ extern "C" {
#include <sys/types.h>
/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run
* faster
*/
* faster
*/
#ifndef HTTP_PARSER_STRICT
# define HTTP_PARSER_STRICT 1
#else
@ -129,7 +129,7 @@ void http_parser_init(http_parser *parser);
size_t http_parse_requests(http_parser *parser, const char *data, size_t len);
size_t http_parse_responses(http_parser *parser, const char *data, size_t len);
/* Call this in the on_headers_complete or on_message_complete callback to
* determine if this will be the last message on the connection.
* determine if this will be the last message on the connection.
* If you are the server, respond with the "Connection: close" header
* if you are the client, close the connection.
*/

22
test.c
Unescape View File

@ -1,22 +1,22 @@
/* Copyright 2009 Ryan Dahl <ry@tinyclouds.org>
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
* IN THE SOFTWARE.
*/
#include "http_parser.h"
#include <stdlib.h>
@ -69,7 +69,7 @@ inline size_t parse (enum message_type t, const char *buf, size_t len)
{
size_t nparsed;
currently_parsing_eof = (len == 0);
nparsed = (t == REQUEST ? http_parse_requests(parser, buf, len)
nparsed = (t == REQUEST ? http_parse_requests(parser, buf, len)
: http_parse_responses(parser, buf, len));
return nparsed;
}
@ -88,7 +88,7 @@ const struct message requests[] =
"Accept: */*\r\n"
"\r\n"
,.should_keep_alive= TRUE
,.message_complete_on_eof= FALSE
,.message_complete_on_eof= FALSE
,.http_major= 1
,.http_minor= 1
,.method= HTTP_GET
@ -119,7 +119,7 @@ const struct message requests[] =
"Connection: keep-alive\r\n"
"\r\n"
,.should_keep_alive= TRUE
,.message_complete_on_eof= FALSE
,.message_complete_on_eof= FALSE
,.http_major= 1
,.http_minor= 1
,.method= HTTP_GET
@ -148,7 +148,7 @@ const struct message requests[] =
"aaaaaaaaaaaaa:++++++++++\r\n"
"\r\n"
,.should_keep_alive= TRUE
,.message_complete_on_eof= FALSE
,.message_complete_on_eof= FALSE
,.http_major= 1
,.http_minor= 1
,.method= HTTP_GET
@ -169,7 +169,7 @@ const struct message requests[] =
,.raw= "GET /forums/1/topics/2375?page=1#posts-17408 HTTP/1.1\r\n"
"\r\n"
,.should_keep_alive= TRUE
,.message_complete_on_eof= FALSE
,.message_complete_on_eof= FALSE
,.http_major= 1
,.http_minor= 1
,.method= HTTP_GET
@ -688,7 +688,7 @@ message_complete_cb (http_parser *p)
messages[num_messages].message_complete_cb_called = TRUE;
messages[num_messages].message_complete_on_eof = currently_parsing_eof;
num_messages++;
return 0;
}
@ -807,7 +807,7 @@ static void
print_error (const char *raw, size_t error_location)
{
fprintf(stderr, "\n*** parse error ***\n\n");
int this_line = 0, char_len = 0;
size_t i, j, len = strlen(raw), error_location_line = 0;
for (i = 0; i < len; i++) {

Write Preview
Loading…
Cancel
Save