deps: update http_parser to 2.5.0
PR-URL: https://github.com/iojs/io.js/pull/1517 Reviewed-By: Brian White <mscdex@mscdex.net>
This commit is contained in:
Fedor Indutny
Родитель
5404cbc745
Коммит
b3a7da1091
|
|
@ -5,6 +5,7 @@ tags
|
|||
test
|
||||
test_g
|
||||
test_fast
|
||||
bench
|
||||
url_parser
|
||||
parsertrace
|
||||
parsertrace_g
|
||||
|
|
|
|||
|
|
@ -5,3 +5,4 @@ Salman Haq <salman.haq@asti-usa.com>
|
|||
Simon Zimmermann <simonz05@gmail.com>
|
||||
Thomas LE ROUX <thomas@november-eleven.fr> LE ROUX Thomas <thomas@procheo.fr>
|
||||
Thomas LE ROUX <thomas@november-eleven.fr> Thomas LE ROUX <thomas@procheo.fr>
|
||||
Fedor Indutny <fedor@indutny.com>
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@ script:
|
|||
notifications:
|
||||
email: false
|
||||
irc:
|
||||
- "irc.freenode.net#libuv"
|
||||
- "irc.freenode.net#node-ci"
|
||||
|
|
|
|||
|
|
@ -39,12 +39,29 @@ BogDan Vatra <bogdan@kde.org>
|
|||
Peter Faiman <peter@thepicard.org>
|
||||
Corey Richardson <corey@octayn.net>
|
||||
Tóth Tamás <tomika_nospam@freemail.hu>
|
||||
Patrik Stutz <patrik.stutz@gmail.com>
|
||||
Cam Swords <cam.swords@gmail.com>
|
||||
Chris Dickinson <christopher.s.dickinson@gmail.com>
|
||||
Uli Köhler <ukoehler@btronik.de>
|
||||
Charlie Somerville <charlie@charliesomerville.com>
|
||||
Patrik Stutz <patrik.stutz@gmail.com>
|
||||
Fedor Indutny <fedor.indutny@gmail.com>
|
||||
runner <runner.mei@gmail.com>
|
||||
Alexis Campailla <alexis@janeasystems.com>
|
||||
David Wragg <david@wragg.org>
|
||||
Vinnie Falco <vinnie.falco@gmail.com>
|
||||
Alex Butum <alexbutum@linux.com>
|
||||
Rex Feng <rexfeng@gmail.com>
|
||||
Alex Kocharin <alex@kocharin.ru>
|
||||
Mark Koopman <markmontymark@yahoo.com>
|
||||
Helge Heß <me@helgehess.eu>
|
||||
Alexis La Goutte <alexis.lagoutte@gmail.com>
|
||||
George Miroshnykov <george.miroshnykov@gmail.com>
|
||||
Maciej Małecki <me@mmalecki.com>
|
||||
Marc O'Morain <github.com@marcomorain.com>
|
||||
Jeff Pinner <jpinner@twitter.com>
|
||||
Timothy J Fontaine <tjfontaine@gmail.com>
|
||||
Akagi201 <akagi201@gmail.com>
|
||||
Romain Giraud <giraud.romain@gmail.com>
|
||||
Jay Satiro <raysatiro@yahoo.com>
|
||||
Arne Steen <Arne.Steen@gmx.de>
|
||||
Kjell Schubert <kjell.schubert@gmail.com>
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
Contributors must agree to the Contributor License Agreement before patches
|
||||
can be accepted.
|
||||
|
||||
http://spreadsheets2.google.com/viewform?hl=en&formkey=dDJXOGUwbzlYaWM4cHN1MERwQS1CSnc6MQ
|
||||
|
|
@ -19,24 +19,34 @@
|
|||
# IN THE SOFTWARE.
|
||||
|
||||
PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
|
||||
SONAME ?= libhttp_parser.so.2.3
|
||||
SONAME ?= libhttp_parser.so.2.5.0
|
||||
|
||||
CC?=gcc
|
||||
AR?=ar
|
||||
|
||||
CPPFLAGS ?=
|
||||
LDFLAGS ?=
|
||||
|
||||
CPPFLAGS += -I.
|
||||
CPPFLAGS_DEBUG = $(CPPFLAGS) -DHTTP_PARSER_STRICT=1
|
||||
CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA)
|
||||
CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0
|
||||
CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
|
||||
CPPFLAGS_BENCH = $(CPPFLAGS_FAST)
|
||||
|
||||
CFLAGS += -Wall -Wextra -Werror
|
||||
CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
|
||||
CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
|
||||
CFLAGS_BENCH = $(CFLAGS_FAST) -Wno-unused-parameter
|
||||
CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
|
||||
|
||||
LDFLAGS_LIB = $(LDFLAGS) -shared
|
||||
|
||||
INSTALL ?= install
|
||||
PREFIX ?= $(DESTDIR)/usr/local
|
||||
LIBDIR = $(PREFIX)/lib
|
||||
INCLUDEDIR = $(PREFIX)/include
|
||||
|
||||
ifneq (darwin,$(PLATFORM))
|
||||
# TODO(bnoordhuis) The native SunOS linker expects -h rather than -soname...
|
||||
LDFLAGS_LIB += -Wl,-soname=$(SONAME)
|
||||
|
|
@ -61,6 +71,12 @@ test_fast: http_parser.o test.o http_parser.h
|
|||
test.o: test.c http_parser.h Makefile
|
||||
$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c test.c -o $@
|
||||
|
||||
bench: http_parser.o bench.o
|
||||
$(CC) $(CFLAGS_BENCH) $(LDFLAGS) http_parser.o bench.o -o $@
|
||||
|
||||
bench.o: bench.c http_parser.h Makefile
|
||||
$(CC) $(CPPFLAGS_BENCH) $(CFLAGS_BENCH) -c bench.c -o $@
|
||||
|
||||
http_parser.o: http_parser.c http_parser.h Makefile
|
||||
$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c http_parser.c
|
||||
|
||||
|
|
@ -94,6 +110,21 @@ parsertrace_g: http_parser_g.o contrib/parsertrace.c
|
|||
tags: http_parser.c http_parser.h test.c
|
||||
ctags $^
|
||||
|
||||
install: library
|
||||
$(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h
|
||||
$(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME)
|
||||
ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
|
||||
|
||||
install-strip: library
|
||||
$(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h
|
||||
$(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME)
|
||||
ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
|
||||
|
||||
uninstall:
|
||||
rm $(INCLUDEDIR)/http_parser.h
|
||||
rm $(LIBDIR)/$(SONAME)
|
||||
rm $(LIBDIR)/libhttp_parser.so
|
||||
|
||||
clean:
|
||||
rm -f *.o *.a tags test test_fast test_g \
|
||||
http_parser.tar libhttp_parser.so.* \
|
||||
|
|
@ -102,4 +133,4 @@ clean:
|
|||
contrib/url_parser.c: http_parser.h
|
||||
contrib/parsertrace.c: http_parser.h
|
||||
|
||||
.PHONY: clean package test-run test-run-timed test-valgrind
|
||||
.PHONY: clean package test-run test-run-timed test-valgrind install install-strip uninstall
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ if (recved < 0) {
|
|||
}
|
||||
|
||||
/* Start up / continue the parser.
|
||||
* Note we pass recved==0 to signal that EOF has been recieved.
|
||||
* Note we pass recved==0 to signal that EOF has been received.
|
||||
*/
|
||||
nparsed = http_parser_execute(parser, &settings, buf, recved);
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ if (parser->upgrade) {
|
|||
HTTP needs to know where the end of the stream is. For example, sometimes
|
||||
servers send responses without Content-Length and expect the client to
|
||||
consume input (for the body) until EOF. To tell http_parser about EOF, give
|
||||
`0` as the forth parameter to `http_parser_execute()`. Callbacks and errors
|
||||
`0` as the fourth parameter to `http_parser_execute()`. Callbacks and errors
|
||||
can still be encountered during an EOF, so one must still be prepared
|
||||
to receive them.
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ followed by non-HTTP data.
|
|||
information the Web Socket protocol.)
|
||||
|
||||
To support this, the parser will treat this as a normal HTTP message without a
|
||||
body. Issuing both on_headers_complete and on_message_complete callbacks. However
|
||||
body, issuing both on_headers_complete and on_message_complete callbacks. However
|
||||
http_parser_execute() will stop parsing at the end of the headers and return.
|
||||
|
||||
The user is expected to check if `parser->upgrade` has been set to 1 after
|
||||
|
|
@ -131,7 +131,7 @@ There are two types of callbacks:
|
|||
* notification `typedef int (*http_cb) (http_parser*);`
|
||||
Callbacks: on_message_begin, on_headers_complete, on_message_complete.
|
||||
* data `typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);`
|
||||
Callbacks: (requests only) on_uri,
|
||||
Callbacks: (requests only) on_url,
|
||||
(common) on_header_field, on_header_value, on_body;
|
||||
|
||||
Callbacks must return 0 on success. Returning a non-zero value indicates
|
||||
|
|
@ -145,7 +145,7 @@ buffer to avoid copying memory around if this fits your application.
|
|||
|
||||
Reading headers may be a tricky task if you read/parse headers partially.
|
||||
Basically, you need to remember whether last header callback was field or value
|
||||
and apply following logic:
|
||||
and apply the following logic:
|
||||
|
||||
(on_header_field and on_header_value shortened to on_h_*)
|
||||
------------------------ ------------ --------------------------------------------
|
||||
|
|
|
|||
|
|
@ -0,0 +1,111 @@
|
|||
/* Copyright Fedor Indutny. All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
#include "http_parser.h"
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
static const char data[] =
|
||||
"POST /joyent/http-parser HTTP/1.1\r\n"
|
||||
"Host: github.com\r\n"
|
||||
"DNT: 1\r\n"
|
||||
"Accept-Encoding: gzip, deflate, sdch\r\n"
|
||||
"Accept-Language: ru-RU,ru;q=0.8,en-US;q=0.6,en;q=0.4\r\n"
|
||||
"User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) "
|
||||
"AppleWebKit/537.36 (KHTML, like Gecko) "
|
||||
"Chrome/39.0.2171.65 Safari/537.36\r\n"
|
||||
"Accept: text/html,application/xhtml+xml,application/xml;q=0.9,"
|
||||
"image/webp,*/*;q=0.8\r\n"
|
||||
"Referer: https://github.com/joyent/http-parser\r\n"
|
||||
"Connection: keep-alive\r\n"
|
||||
"Transfer-Encoding: chunked\r\n"
|
||||
"Cache-Control: max-age=0\r\n\r\nb\r\nhello world\r\n0\r\n\r\n";
|
||||
static const size_t data_len = sizeof(data) - 1;
|
||||
|
||||
static int on_info(http_parser* p) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int on_data(http_parser* p, const char *at, size_t length) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static http_parser_settings settings = {
|
||||
.on_message_begin = on_info,
|
||||
.on_headers_complete = on_info,
|
||||
.on_message_complete = on_info,
|
||||
.on_header_field = on_data,
|
||||
.on_header_value = on_data,
|
||||
.on_url = on_data,
|
||||
.on_status = on_data,
|
||||
.on_body = on_data
|
||||
};
|
||||
|
||||
int bench(int iter_count, int silent) {
|
||||
struct http_parser parser;
|
||||
int i;
|
||||
int err;
|
||||
struct timeval start;
|
||||
struct timeval end;
|
||||
float rps;
|
||||
|
||||
if (!silent) {
|
||||
err = gettimeofday(&start, NULL);
|
||||
assert(err == 0);
|
||||
}
|
||||
|
||||
for (i = 0; i < iter_count; i++) {
|
||||
size_t parsed;
|
||||
http_parser_init(&parser, HTTP_REQUEST);
|
||||
|
||||
parsed = http_parser_execute(&parser, &settings, data, data_len);
|
||||
assert(parsed == data_len);
|
||||
}
|
||||
|
||||
if (!silent) {
|
||||
err = gettimeofday(&end, NULL);
|
||||
assert(err == 0);
|
||||
|
||||
fprintf(stdout, "Benchmark result:\n");
|
||||
|
||||
rps = (float) (end.tv_sec - start.tv_sec) +
|
||||
(end.tv_usec - start.tv_usec) * 1e-6f;
|
||||
fprintf(stdout, "Took %f seconds to run\n", rps);
|
||||
|
||||
rps = (float) iter_count / rps;
|
||||
fprintf(stdout, "%f req/sec\n", rps);
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
if (argc == 2 && strcmp(argv[1], "infinite") == 0) {
|
||||
for (;;)
|
||||
bench(5000000, 1);
|
||||
return 0;
|
||||
} else {
|
||||
return bench(5000000, 0);
|
||||
}
|
||||
}
|
||||
|
|
@ -111,14 +111,14 @@ int main(int argc, char* argv[]) {
|
|||
FILE* file = fopen(filename, "r");
|
||||
if (file == NULL) {
|
||||
perror("fopen");
|
||||
return EXIT_FAILURE;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
fseek(file, 0, SEEK_END);
|
||||
long file_length = ftell(file);
|
||||
if (file_length == -1) {
|
||||
perror("ftell");
|
||||
return EXIT_FAILURE;
|
||||
goto fail;
|
||||
}
|
||||
fseek(file, 0, SEEK_SET);
|
||||
|
||||
|
|
@ -126,7 +126,7 @@ int main(int argc, char* argv[]) {
|
|||
if (fread(data, 1, file_length, file) != (size_t)file_length) {
|
||||
fprintf(stderr, "couldn't read entire file\n");
|
||||
free(data);
|
||||
return EXIT_FAILURE;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
http_parser_settings settings;
|
||||
|
|
@ -149,8 +149,12 @@ int main(int argc, char* argv[]) {
|
|||
"Error: %s (%s)\n",
|
||||
http_errno_description(HTTP_PARSER_ERRNO(&parser)),
|
||||
http_errno_name(HTTP_PARSER_ERRNO(&parser)));
|
||||
return EXIT_FAILURE;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
|
||||
fail:
|
||||
fclose(file);
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ dump_url (const char *url, const struct http_parser_url *u)
|
|||
continue;
|
||||
}
|
||||
|
||||
printf("\tfield_data[%u]: off: %u len: %u part: \"%.*s\n",
|
||||
printf("\tfield_data[%u]: off: %u, len: %u, part: %.*s\n",
|
||||
i,
|
||||
u->field_data[i].off,
|
||||
u->field_data[i].len,
|
||||
|
|
@ -24,16 +24,18 @@ dump_url (const char *url, const struct http_parser_url *u)
|
|||
}
|
||||
|
||||
int main(int argc, char ** argv) {
|
||||
struct http_parser_url u;
|
||||
int len, connect, result;
|
||||
|
||||
if (argc != 3) {
|
||||
printf("Syntax : %s connect|get url\n", argv[0]);
|
||||
return 1;
|
||||
}
|
||||
struct http_parser_url u;
|
||||
int len = strlen(argv[2]);
|
||||
int connect = strcmp("connect", argv[1]) == 0 ? 1 : 0;
|
||||
len = strlen(argv[2]);
|
||||
connect = strcmp("connect", argv[1]) == 0 ? 1 : 0;
|
||||
printf("Parsing %s, connect %d\n", argv[2], connect);
|
||||
|
||||
int result = http_parser_parse_url(argv[2], len, connect, &u);
|
||||
result = http_parser_parse_url(argv[2], len, connect, &u);
|
||||
if (result != 0) {
|
||||
printf("Parse error : %d\n", result);
|
||||
return result;
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -26,7 +26,7 @@ extern "C" {
|
|||
|
||||
/* Also update SONAME in the Makefile whenever you change these. */
|
||||
#define HTTP_PARSER_VERSION_MAJOR 2
|
||||
#define HTTP_PARSER_VERSION_MINOR 3
|
||||
#define HTTP_PARSER_VERSION_MINOR 5
|
||||
#define HTTP_PARSER_VERSION_PATCH 0
|
||||
|
||||
#include <sys/types.h>
|
||||
|
|
@ -52,9 +52,16 @@ typedef unsigned __int64 uint64_t;
|
|||
# define HTTP_PARSER_STRICT 1
|
||||
#endif
|
||||
|
||||
/* Maximium header size allowed */
|
||||
#define HTTP_MAX_HEADER_SIZE (80*1024)
|
||||
|
||||
/* Maximium header size allowed. If the macro is not defined
|
||||
* before including this header then the default is used. To
|
||||
* change the maximum header size, define the macro in the build
|
||||
* environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
|
||||
* the effective limit on the size of the header, define the macro
|
||||
* to a very large number (e.g. -DHTTP_MAX_HEADER_SIZE=0x7fffffff)
|
||||
*/
|
||||
#ifndef HTTP_MAX_HEADER_SIZE
|
||||
# define HTTP_MAX_HEADER_SIZE (80*1024)
|
||||
#endif
|
||||
|
||||
typedef struct http_parser http_parser;
|
||||
typedef struct http_parser_settings http_parser_settings;
|
||||
|
|
@ -69,7 +76,7 @@ typedef struct http_parser_settings http_parser_settings;
|
|||
* HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
|
||||
* chunked' headers that indicate the presence of a body.
|
||||
*
|
||||
* http_data_cb does not return data chunks. It will be call arbitrarally
|
||||
* http_data_cb does not return data chunks. It will be called arbitrarily
|
||||
* many times for each string. E.G. you might get 10 callbacks for "on_url"
|
||||
* each providing just a few characters more data.
|
||||
*/
|
||||
|
|
@ -110,6 +117,8 @@ typedef int (*http_cb) (http_parser*);
|
|||
/* RFC-5789 */ \
|
||||
XX(24, PATCH, PATCH) \
|
||||
XX(25, PURGE, PURGE) \
|
||||
/* CalDAV */ \
|
||||
XX(26, MKCALENDAR, MKCALENDAR) \
|
||||
|
||||
enum http_method
|
||||
{
|
||||
|
|
@ -127,9 +136,10 @@ enum flags
|
|||
{ F_CHUNKED = 1 << 0
|
||||
, F_CONNECTION_KEEP_ALIVE = 1 << 1
|
||||
, F_CONNECTION_CLOSE = 1 << 2
|
||||
, F_TRAILING = 1 << 3
|
||||
, F_UPGRADE = 1 << 4
|
||||
, F_SKIPBODY = 1 << 5
|
||||
, F_CONNECTION_UPGRADE = 1 << 3
|
||||
, F_TRAILING = 1 << 4
|
||||
, F_UPGRADE = 1 << 5
|
||||
, F_SKIPBODY = 1 << 6
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -150,6 +160,8 @@ enum flags
|
|||
XX(CB_body, "the on_body callback failed") \
|
||||
XX(CB_message_complete, "the on_message_complete callback failed") \
|
||||
XX(CB_status, "the on_status callback failed") \
|
||||
XX(CB_chunk_header, "the on_chunk_header callback failed") \
|
||||
XX(CB_chunk_complete, "the on_chunk_complete callback failed") \
|
||||
\
|
||||
/* Parsing-related errors */ \
|
||||
XX(INVALID_EOF_STATE, "stream ended at an unexpected time") \
|
||||
|
|
@ -194,8 +206,8 @@ enum http_errno {
|
|||
struct http_parser {
|
||||
/** PRIVATE **/
|
||||
unsigned int type : 2; /* enum http_parser_type */
|
||||
unsigned int flags : 6; /* F_* values from 'flags' enum; semi-public */
|
||||
unsigned int state : 8; /* enum state from http_parser.c */
|
||||
unsigned int flags : 7; /* F_* values from 'flags' enum; semi-public */
|
||||
unsigned int state : 7; /* enum state from http_parser.c */
|
||||
unsigned int header_state : 8; /* enum header_state from http_parser.c */
|
||||
unsigned int index : 8; /* index into current matcher */
|
||||
|
||||
|
|
@ -230,6 +242,11 @@ struct http_parser_settings {
|
|||
http_cb on_headers_complete;
|
||||
http_data_cb on_body;
|
||||
http_cb on_message_complete;
|
||||
/* When on_chunk_header is called, the current chunk length is stored
|
||||
* in parser->content_length.
|
||||
*/
|
||||
http_cb on_chunk_header;
|
||||
http_cb on_chunk_complete;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -271,13 +288,20 @@ struct http_parser_url {
|
|||
* unsigned major = (version >> 16) & 255;
|
||||
* unsigned minor = (version >> 8) & 255;
|
||||
* unsigned patch = version & 255;
|
||||
* printf("http_parser v%u.%u.%u\n", major, minor, version);
|
||||
* printf("http_parser v%u.%u.%u\n", major, minor, patch);
|
||||
*/
|
||||
unsigned long http_parser_version(void);
|
||||
|
||||
void http_parser_init(http_parser *parser, enum http_parser_type type);
|
||||
|
||||
|
||||
/* Initialize http_parser_settings members to 0
|
||||
*/
|
||||
void http_parser_settings_init(http_parser_settings *settings);
|
||||
|
||||
|
||||
/* Executes the parser. Returns number of parsed bytes. Sets
|
||||
* `parser->http_errno` on error. */
|
||||
size_t http_parser_execute(http_parser *parser,
|
||||
const http_parser_settings *settings,
|
||||
const char *data,
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
|
||||
#define MAX_HEADERS 13
|
||||
#define MAX_ELEMENT_SIZE 2048
|
||||
#define MAX_CHUNKS 16
|
||||
|
||||
#define MIN(a,b) ((a) < (b) ? (a) : (b))
|
||||
|
||||
|
|
@ -65,6 +66,10 @@ struct message {
|
|||
char headers [MAX_HEADERS][2][MAX_ELEMENT_SIZE];
|
||||
int should_keep_alive;
|
||||
|
||||
int num_chunks;
|
||||
int num_chunks_complete;
|
||||
int chunk_lengths[MAX_CHUNKS];
|
||||
|
||||
const char *upgrade; // upgraded body
|
||||
|
||||
unsigned short http_major;
|
||||
|
|
@ -301,6 +306,8 @@ const struct message requests[] =
|
|||
{ { "Transfer-Encoding" , "chunked" }
|
||||
}
|
||||
,.body= "all your base are belong to us"
|
||||
,.num_chunks_complete= 2
|
||||
,.chunk_lengths= { 0x1e }
|
||||
}
|
||||
|
||||
#define TWO_CHUNKS_MULT_ZERO_END 9
|
||||
|
|
@ -327,6 +334,8 @@ const struct message requests[] =
|
|||
{ { "Transfer-Encoding", "chunked" }
|
||||
}
|
||||
,.body= "hello world"
|
||||
,.num_chunks_complete= 3
|
||||
,.chunk_lengths= { 5, 6 }
|
||||
}
|
||||
|
||||
#define CHUNKED_W_TRAILING_HEADERS 10
|
||||
|
|
@ -357,6 +366,8 @@ const struct message requests[] =
|
|||
, { "Content-Type", "text/plain" }
|
||||
}
|
||||
,.body= "hello world"
|
||||
,.num_chunks_complete= 3
|
||||
,.chunk_lengths= { 5, 6 }
|
||||
}
|
||||
|
||||
#define CHUNKED_W_BULLSHIT_AFTER_LENGTH 11
|
||||
|
|
@ -383,6 +394,8 @@ const struct message requests[] =
|
|||
{ { "Transfer-Encoding", "chunked" }
|
||||
}
|
||||
,.body= "hello world"
|
||||
,.num_chunks_complete= 3
|
||||
,.chunk_lengths= { 5, 6 }
|
||||
}
|
||||
|
||||
#define WITH_QUOTES 12
|
||||
|
|
@ -950,6 +963,143 @@ const struct message requests[] =
|
|||
,.body= ""
|
||||
}
|
||||
|
||||
#define CONNECTION_MULTI 35
|
||||
, {.name = "multiple connection header values with folding"
|
||||
,.type= HTTP_REQUEST
|
||||
,.raw= "GET /demo HTTP/1.1\r\n"
|
||||
"Host: example.com\r\n"
|
||||
"Connection: Something,\r\n"
|
||||
" Upgrade, ,Keep-Alive\r\n"
|
||||
"Sec-WebSocket-Key2: 12998 5 Y3 1 .P00\r\n"
|
||||
"Sec-WebSocket-Protocol: sample\r\n"
|
||||
"Upgrade: WebSocket\r\n"
|
||||
"Sec-WebSocket-Key1: 4 @1 46546xW%0l 1 5\r\n"
|
||||
"Origin: http://example.com\r\n"
|
||||
"\r\n"
|
||||
"Hot diggity dogg"
|
||||
,.should_keep_alive= TRUE
|
||||
,.message_complete_on_eof= FALSE
|
||||
,.http_major= 1
|
||||
,.http_minor= 1
|
||||
,.method= HTTP_GET
|
||||
,.query_string= ""
|
||||
,.fragment= ""
|
||||
,.request_path= "/demo"
|
||||
,.request_url= "/demo"
|
||||
,.num_headers= 7
|
||||
,.upgrade="Hot diggity dogg"
|
||||
,.headers= { { "Host", "example.com" }
|
||||
, { "Connection", "Something, Upgrade, ,Keep-Alive" }
|
||||
, { "Sec-WebSocket-Key2", "12998 5 Y3 1 .P00" }
|
||||
, { "Sec-WebSocket-Protocol", "sample" }
|
||||
, { "Upgrade", "WebSocket" }
|
||||
, { "Sec-WebSocket-Key1", "4 @1 46546xW%0l 1 5" }
|
||||
, { "Origin", "http://example.com" }
|
||||
}
|
||||
,.body= ""
|
||||
}
|
||||
|
||||
#define CONNECTION_MULTI_LWS 36
|
||||
, {.name = "multiple connection header values with folding and lws"
|
||||
,.type= HTTP_REQUEST
|
||||
,.raw= "GET /demo HTTP/1.1\r\n"
|
||||
"Connection: keep-alive, upgrade\r\n"
|
||||
"Upgrade: WebSocket\r\n"
|
||||
"\r\n"
|
||||
"Hot diggity dogg"
|
||||
,.should_keep_alive= TRUE
|
||||
,.message_complete_on_eof= FALSE
|
||||
,.http_major= 1
|
||||
,.http_minor= 1
|
||||
,.method= HTTP_GET
|
||||
,.query_string= ""
|
||||
,.fragment= ""
|
||||
,.request_path= "/demo"
|
||||
,.request_url= "/demo"
|
||||
,.num_headers= 2
|
||||
,.upgrade="Hot diggity dogg"
|
||||
,.headers= { { "Connection", "keep-alive, upgrade" }
|
||||
, { "Upgrade", "WebSocket" }
|
||||
}
|
||||
,.body= ""
|
||||
}
|
||||
|
||||
#define CONNECTION_MULTI_LWS_CRLF 37
|
||||
, {.name = "multiple connection header values with folding and lws"
|
||||
,.type= HTTP_REQUEST
|
||||
,.raw= "GET /demo HTTP/1.1\r\n"
|
||||
"Connection: keep-alive, \r\n upgrade\r\n"
|
||||
"Upgrade: WebSocket\r\n"
|
||||
"\r\n"
|
||||
"Hot diggity dogg"
|
||||
,.should_keep_alive= TRUE
|
||||
,.message_complete_on_eof= FALSE
|
||||
,.http_major= 1
|
||||
,.http_minor= 1
|
||||
,.method= HTTP_GET
|
||||
,.query_string= ""
|
||||
,.fragment= ""
|
||||
,.request_path= "/demo"
|
||||
,.request_url= "/demo"
|
||||
,.num_headers= 2
|
||||
,.upgrade="Hot diggity dogg"
|
||||
,.headers= { { "Connection", "keep-alive, upgrade" }
|
||||
, { "Upgrade", "WebSocket" }
|
||||
}
|
||||
,.body= ""
|
||||
}
|
||||
|
||||
#define UPGRADE_POST_REQUEST 38
|
||||
, {.name = "upgrade post request"
|
||||
,.type= HTTP_REQUEST
|
||||
,.raw= "POST /demo HTTP/1.1\r\n"
|
||||
"Host: example.com\r\n"
|
||||
"Connection: Upgrade\r\n"
|
||||
"Upgrade: HTTP/2.0\r\n"
|
||||
"Content-Length: 15\r\n"
|
||||
"\r\n"
|
||||
"sweet post body"
|
||||
"Hot diggity dogg"
|
||||
,.should_keep_alive= TRUE
|
||||
,.message_complete_on_eof= FALSE
|
||||
,.http_major= 1
|
||||
,.http_minor= 1
|
||||
,.method= HTTP_POST
|
||||
,.request_path= "/demo"
|
||||
,.request_url= "/demo"
|
||||
,.num_headers= 4
|
||||
,.upgrade="Hot diggity dogg"
|
||||
,.headers= { { "Host", "example.com" }
|
||||
, { "Connection", "Upgrade" }
|
||||
, { "Upgrade", "HTTP/2.0" }
|
||||
, { "Content-Length", "15" }
|
||||
}
|
||||
,.body= "sweet post body"
|
||||
}
|
||||
|
||||
#define CONNECT_WITH_BODY_REQUEST 39
|
||||
, {.name = "connect with body request"
|
||||
,.type= HTTP_REQUEST
|
||||
,.raw= "CONNECT foo.bar.com:443 HTTP/1.0\r\n"
|
||||
"User-agent: Mozilla/1.1N\r\n"
|
||||
"Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
|
||||
"Content-Length: 10\r\n"
|
||||
"\r\n"
|
||||
"blarfcicle"
|
||||
,.should_keep_alive= FALSE
|
||||
,.message_complete_on_eof= FALSE
|
||||
,.http_major= 1
|
||||
,.http_minor= 0
|
||||
,.method= HTTP_CONNECT
|
||||
,.request_url= "foo.bar.com:443"
|
||||
,.num_headers= 3
|
||||
,.upgrade="blarfcicle"
|
||||
,.headers= { { "User-agent", "Mozilla/1.1N" }
|
||||
, { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
|
||||
, { "Content-Length", "10" }
|
||||
}
|
||||
,.body= ""
|
||||
}
|
||||
|
||||
, {.name= NULL } /* sentinel */
|
||||
};
|
||||
|
|
@ -1110,7 +1260,8 @@ const struct message responses[] =
|
|||
,.body =
|
||||
"This is the data in the first chunk\r\n"
|
||||
"and this is the second one\r\n"
|
||||
|
||||
,.num_chunks_complete= 3
|
||||
,.chunk_lengths= { 0x25, 0x1c }
|
||||
}
|
||||
|
||||
#define NO_CARRIAGE_RET 5
|
||||
|
|
@ -1264,6 +1415,8 @@ const struct message responses[] =
|
|||
, { "Connection", "close" }
|
||||
}
|
||||
,.body= ""
|
||||
,.num_chunks_complete= 1
|
||||
,.chunk_lengths= {}
|
||||
}
|
||||
|
||||
#define NON_ASCII_IN_STATUS_LINE 10
|
||||
|
|
@ -1446,6 +1599,7 @@ const struct message responses[] =
|
|||
}
|
||||
,.body_size= 0
|
||||
,.body= ""
|
||||
,.num_chunks_complete= 1
|
||||
}
|
||||
|
||||
#if !HTTP_PARSER_STRICT
|
||||
|
|
@ -1519,6 +1673,8 @@ const struct message responses[] =
|
|||
, { "Transfer-Encoding", "chunked" }
|
||||
}
|
||||
,.body= "\n"
|
||||
,.num_chunks_complete= 2
|
||||
,.chunk_lengths= { 1 }
|
||||
}
|
||||
|
||||
#define EMPTY_REASON_PHRASE_AFTER_SPACE 20
|
||||
|
|
@ -1754,6 +1910,35 @@ response_status_cb (http_parser *p, const char *buf, size_t len)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
chunk_header_cb (http_parser *p)
|
||||
{
|
||||
assert(p == parser);
|
||||
int chunk_idx = messages[num_messages].num_chunks;
|
||||
messages[num_messages].num_chunks++;
|
||||
if (chunk_idx < MAX_CHUNKS) {
|
||||
messages[num_messages].chunk_lengths[chunk_idx] = p->content_length;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
chunk_complete_cb (http_parser *p)
|
||||
{
|
||||
assert(p == parser);
|
||||
|
||||
/* Here we want to verify that each chunk_header_cb is matched by a
|
||||
* chunk_complete_cb, so not only should the total number of calls to
|
||||
* both callbacks be the same, but they also should be interleaved
|
||||
* properly */
|
||||
assert(messages[num_messages].num_chunks ==
|
||||
messages[num_messages].num_chunks_complete + 1);
|
||||
|
||||
messages[num_messages].num_chunks_complete++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* These dontcall_* callbacks exist so that we can verify that when we're
|
||||
* paused, no additional callbacks are invoked */
|
||||
int
|
||||
|
|
@ -1822,6 +2007,23 @@ dontcall_response_status_cb (http_parser *p, const char *buf, size_t len)
|
|||
abort();
|
||||
}
|
||||
|
||||
int
|
||||
dontcall_chunk_header_cb (http_parser *p)
|
||||
{
|
||||
if (p) { } // gcc
|
||||
fprintf(stderr, "\n\n*** on_chunk_header() called on paused parser ***\n\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
int
|
||||
dontcall_chunk_complete_cb (http_parser *p)
|
||||
{
|
||||
if (p) { } // gcc
|
||||
fprintf(stderr, "\n\n*** on_chunk_complete() "
|
||||
"called on paused parser ***\n\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static http_parser_settings settings_dontcall =
|
||||
{.on_message_begin = dontcall_message_begin_cb
|
||||
,.on_header_field = dontcall_header_field_cb
|
||||
|
|
@ -1831,6 +2033,8 @@ static http_parser_settings settings_dontcall =
|
|||
,.on_body = dontcall_body_cb
|
||||
,.on_headers_complete = dontcall_headers_complete_cb
|
||||
,.on_message_complete = dontcall_message_complete_cb
|
||||
,.on_chunk_header = dontcall_chunk_header_cb
|
||||
,.on_chunk_complete = dontcall_chunk_complete_cb
|
||||
};
|
||||
|
||||
/* These pause_* callbacks always pause the parser and just invoke the regular
|
||||
|
|
@ -1901,6 +2105,22 @@ pause_response_status_cb (http_parser *p, const char *buf, size_t len)
|
|||
return response_status_cb(p, buf, len);
|
||||
}
|
||||
|
||||
int
|
||||
pause_chunk_header_cb (http_parser *p)
|
||||
{
|
||||
http_parser_pause(p, 1);
|
||||
*current_pause_parser = settings_dontcall;
|
||||
return chunk_header_cb(p);
|
||||
}
|
||||
|
||||
int
|
||||
pause_chunk_complete_cb (http_parser *p)
|
||||
{
|
||||
http_parser_pause(p, 1);
|
||||
*current_pause_parser = settings_dontcall;
|
||||
return chunk_complete_cb(p);
|
||||
}
|
||||
|
||||
static http_parser_settings settings_pause =
|
||||
{.on_message_begin = pause_message_begin_cb
|
||||
,.on_header_field = pause_header_field_cb
|
||||
|
|
@ -1910,6 +2130,8 @@ static http_parser_settings settings_pause =
|
|||
,.on_body = pause_body_cb
|
||||
,.on_headers_complete = pause_headers_complete_cb
|
||||
,.on_message_complete = pause_message_complete_cb
|
||||
,.on_chunk_header = pause_chunk_header_cb
|
||||
,.on_chunk_complete = pause_chunk_complete_cb
|
||||
};
|
||||
|
||||
static http_parser_settings settings =
|
||||
|
|
@ -1921,6 +2143,8 @@ static http_parser_settings settings =
|
|||
,.on_body = body_cb
|
||||
,.on_headers_complete = headers_complete_cb
|
||||
,.on_message_complete = message_complete_cb
|
||||
,.on_chunk_header = chunk_header_cb
|
||||
,.on_chunk_complete = chunk_complete_cb
|
||||
};
|
||||
|
||||
static http_parser_settings settings_count_body =
|
||||
|
|
@ -1932,6 +2156,8 @@ static http_parser_settings settings_count_body =
|
|||
,.on_body = count_body_cb
|
||||
,.on_headers_complete = headers_complete_cb
|
||||
,.on_message_complete = message_complete_cb
|
||||
,.on_chunk_header = chunk_header_cb
|
||||
,.on_chunk_complete = chunk_complete_cb
|
||||
};
|
||||
|
||||
static http_parser_settings settings_null =
|
||||
|
|
@ -1943,6 +2169,8 @@ static http_parser_settings settings_null =
|
|||
,.on_body = 0
|
||||
,.on_headers_complete = 0
|
||||
,.on_message_complete = 0
|
||||
,.on_chunk_header = 0
|
||||
,.on_chunk_complete = 0
|
||||
};
|
||||
|
||||
void
|
||||
|
|
@ -2111,6 +2339,12 @@ message_eq (int index, const struct message *expected)
|
|||
MESSAGE_CHECK_STR_EQ(expected, m, body);
|
||||
}
|
||||
|
||||
assert(m->num_chunks == m->num_chunks_complete);
|
||||
MESSAGE_CHECK_NUM_EQ(expected, m, num_chunks_complete);
|
||||
for (i = 0; i < m->num_chunks && i < MAX_CHUNKS; i++) {
|
||||
MESSAGE_CHECK_NUM_EQ(expected, m, chunk_lengths[i]);
|
||||
}
|
||||
|
||||
MESSAGE_CHECK_NUM_EQ(expected, m, num_headers);
|
||||
|
||||
int r;
|
||||
|
|
@ -2207,7 +2441,6 @@ print_error (const char *raw, size_t error_location)
|
|||
break;
|
||||
|
||||
case '\n':
|
||||
char_len = 2;
|
||||
fprintf(stderr, "\\n\n");
|
||||
|
||||
if (this_line) goto print;
|
||||
|
|
@ -2825,7 +3058,7 @@ test_message (const struct message *message)
|
|||
if (msg1len) {
|
||||
read = parse(msg1, msg1len);
|
||||
|
||||
if (message->upgrade && parser->upgrade) {
|
||||
if (message->upgrade && parser->upgrade && num_messages > 0) {
|
||||
messages[num_messages - 1].upgrade = msg1 + read;
|
||||
goto test;
|
||||
}
|
||||
|
|
@ -2910,15 +3143,11 @@ test_simple (const char *buf, enum http_errno err_expected)
|
|||
{
|
||||
parser_init(HTTP_REQUEST);
|
||||
|
||||
size_t parsed;
|
||||
int pass;
|
||||
enum http_errno err;
|
||||
|
||||
parsed = parse(buf, strlen(buf));
|
||||
pass = (parsed == strlen(buf));
|
||||
parse(buf, strlen(buf));
|
||||
err = HTTP_PARSER_ERRNO(parser);
|
||||
parsed = parse(NULL, 0);
|
||||
pass &= (parsed == 0);
|
||||
parse(NULL, 0);
|
||||
|
||||
parser_free();
|
||||
|
||||
|
|
@ -2964,6 +3193,22 @@ test_header_overflow_error (int req)
|
|||
abort();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
test_header_nread_value ()
|
||||
{
|
||||
http_parser parser;
|
||||
http_parser_init(&parser, HTTP_REQUEST);
|
||||
size_t parsed;
|
||||
const char *buf;
|
||||
buf = "GET / HTTP/1.1\r\nheader: value\nhdr: value\r\n";
|
||||
parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf));
|
||||
assert(parsed == strlen(buf));
|
||||
|
||||
assert(parser.nread == strlen(buf));
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
test_content_length_overflow (const char *buf, size_t buflen, int expect_ok)
|
||||
{
|
||||
|
|
@ -3330,6 +3575,9 @@ main (void)
|
|||
test_parse_url();
|
||||
test_method_str();
|
||||
|
||||
//// NREAD
|
||||
test_header_nread_value();
|
||||
|
||||
//// OVERFLOW CONDITIONS
|
||||
|
||||
test_header_overflow_error(HTTP_REQUEST);
|
||||
|
|
@ -3389,7 +3637,11 @@ main (void)
|
|||
, { "Content-Type", "text/plain" }
|
||||
}
|
||||
,.body_size= 31337*1024
|
||||
,.num_chunks_complete= 31338
|
||||
};
|
||||
for (i = 0; i < MAX_CHUNKS; i++) {
|
||||
large_chunked.chunk_lengths[i] = 1024;
|
||||
}
|
||||
test_message_count_body(&large_chunked);
|
||||
free(msg);
|
||||
}
|
||||
|
|
@ -3476,6 +3728,13 @@ main (void)
|
|||
test_simple(buf, HPE_INVALID_METHOD);
|
||||
}
|
||||
|
||||
// illegal header field name line folding
|
||||
test_simple("GET / HTTP/1.1\r\n"
|
||||
"name\r\n"
|
||||
" : value\r\n"
|
||||
"\r\n",
|
||||
HPE_INVALID_HEADER_TOKEN);
|
||||
|
||||
const char *dumbfuck2 =
|
||||
"GET / HTTP/1.1\r\n"
|
||||
"X-SSL-Bullshit: -----BEGIN CERTIFICATE-----\r\n"
|
||||
|
|
@ -3513,6 +3772,22 @@ main (void)
|
|||
"\r\n";
|
||||
test_simple(dumbfuck2, HPE_OK);
|
||||
|
||||
const char *corrupted_connection =
|
||||
"GET / HTTP/1.1\r\n"
|
||||
"Host: www.example.com\r\n"
|
||||
"Connection\r\033\065\325eep-Alive\r\n"
|
||||
"Accept-Encoding: gzip\r\n"
|
||||
"\r\n";
|
||||
test_simple(corrupted_connection, HPE_INVALID_HEADER_TOKEN);
|
||||
|
||||
const char *corrupted_header_name =
|
||||
"GET / HTTP/1.1\r\n"
|
||||
"Host: www.example.com\r\n"
|
||||
"X-Some-Header\r\033\065\325eep-Alive\r\n"
|
||||
"Accept-Encoding: gzip\r\n"
|
||||
"\r\n";
|
||||
test_simple(corrupted_header_name, HPE_INVALID_HEADER_TOKEN);
|
||||
|
||||
#if 0
|
||||
// NOTE(Wed Nov 18 11:57:27 CET 2009) this seems okay. we just read body
|
||||
// until EOF.
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
var assert = require('assert');
|
||||
var http = require('http');
|
||||
var net = require('net');
|
||||
|
||||
var upgrades = 0;
|
||||
process.on('exit', function() { assert.equal(upgrades, 1); });
|
||||
|
||||
http.createServer(assert.fail).listen(0, '127.0.0.1', function() {
|
||||
this.on('upgrade', function(req, conn, head) {
|
||||
conn.destroy();
|
||||
this.close();
|
||||
upgrades += 1;
|
||||
});
|
||||
var options = { host: this.address().address, port: this.address().port };
|
||||
net.connect(options, function() {
|
||||
this.write('GET / HTTP/1.1\r\n' +
|
||||
'Upgrade: Yes, please.\r\n' +
|
||||
'\r\n');
|
||||
});
|
||||
});
|
||||
Загрузка…
Ссылка в новой задаче