external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Reset http-parser 2.1

Browse source
This commit is contained in:
winlin 2019-04-23 08:31:21 +08:00
parent 6e9bba4220
commit 646d490a18
2 changed files with 2235 additions and 2173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
trunk/src/protocol/srs_http_stack.cpp
View file

@ -909,8 +909,34 @@ string SrsHttpUri::get_uri_field(string uri, void* php_u, int ifield)
return uri.substr(offset, len); return uri.substr(offset, len);
} }
// For #if !defined(SRS_EXPORT_LIBRTMP)
#endif #endif
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/* Based on src/http/ngx_http_parse.c from NGINX copyright Igor Sysoev /* Based on src/http/ngx_http_parse.c from NGINX copyright Igor Sysoev
* *
* Additional changes are licensed under the same terms as NGINX and * Additional changes are licensed under the same terms as NGINX and

138
trunk/src/protocol/srs_http_stack.hpp
View file

@ -537,31 +537,61 @@ private:
virtual std::string get_uri_field(std::string uri, void* hp_u, int field); virtual std::string get_uri_field(std::string uri, void* hp_u, int field);
}; };
// For #if !defined(SRS_EXPORT_LIBRTMP)
#endif
// For #ifndef SRS_PROTOCOL_HTTP_HPP
#endif #endif
// The http-parser is license under MIT at https://github.com/nodejs/http-parser/blob/master/LICENSE-MIT // The http-parser is license under MIT at https://github.com/nodejs/http-parser/blob/master/LICENSE-MIT
// Version: 2.1 from https://github.com/nodejs/http-parser/releases/tag/v2.1 // Version: 2.1 from https://github.com/nodejs/http-parser/releases/tag/v2.1
// File: https://github.com/nodejs/http-parser/blob/80819384450b5511a3d1c424dd92a5843c891364/http_parser.h // File: https://github.com/nodejs/http-parser/blob/80819384450b5511a3d1c424dd92a5843c891364/http_parser.h
//Copyright Joyent, Inc. and other Node contributors. 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. /////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////
/* Copyright Joyent, Inc. and other Node contributors. 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.
*/
#ifndef http_parser_h #ifndef http_parser_h
#define http_parser_h #define http_parser_h
#ifdef __cplusplus #ifdef __cplusplus
@ -587,8 +617,9 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
#endif #endif
// Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run /* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run
// faster * faster
*/
#ifndef HTTP_PARSER_STRICT #ifndef HTTP_PARSER_STRICT
# define HTTP_PARSER_STRICT 1 # define HTTP_PARSER_STRICT 1
#endif #endif
@ -601,18 +632,19 @@ extern "C" {
typedef struct http_parser_settings http_parser_settings; typedef struct http_parser_settings http_parser_settings;
// Callbacks should return non-zero to indicate an error. The parser will /* Callbacks should return non-zero to indicate an error. The parser will
// then halt execution. * then halt execution.
// *
// The one exception is on_headers_complete. In a HTTP_RESPONSE parser * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
// returning '1' from on_headers_complete will tell the parser that it * returning '1' from on_headers_complete will tell the parser that it
// should not expect a body. This is used when receiving a response to a * should not expect a body. This is used when receiving a response to a
// HEAD request which may contain 'Content-Length' or 'Transfer-Encoding: * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
// chunked' headers that indicate the presence of a body. * 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 call arbitrarally
// many times for each string. E.G. you might get 10 callbacks for "on_url" * many times for each string. E.G. you might get 10 callbacks for "on_url"
// each providing just a few characters more data. * each providing just a few characters more data.
*/
typedef int (*http_data_cb) (http_parser*, const char *at, size_t length); typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
typedef int (*http_cb) (http_parser*); typedef int (*http_cb) (http_parser*);
@ -673,8 +705,10 @@ extern "C" {
}; };
// Map for errno-related constants /* Map for errno-related constants
// The provided argument should be a macro that takes 2 arguments. *
* The provided argument should be a macro that takes 2 arguments.
*/
#define HTTP_ERRNO_MAP(XX) \ #define HTTP_ERRNO_MAP(XX) \
/* No error */ \ /* No error */ \
XX(OK, "success") \ XX(OK, "success") \
@ -747,10 +781,11 @@ extern "C" {
unsigned char method; /* requests only */ unsigned char method; /* requests only */
unsigned char http_errno : 7; unsigned char http_errno : 7;
// 1 = Upgrade header was present and the parser has exited because of that. /* 1 = Upgrade header was present and the parser has exited because of that.
// 0 = No upgrade header present. * 0 = No upgrade header present.
// Should be checked when http_parser_execute() returns in addition to * Should be checked when http_parser_execute() returns in addition to
// error checking. * error checking.
*/
unsigned char upgrade : 1; unsigned char upgrade : 1;
/** PUBLIC **/ /** PUBLIC **/
@ -782,11 +817,13 @@ extern "C" {
}; };
// Result structure for http_parser_parse_url(). /* Result structure for http_parser_parse_url().
// Callers should index into field_data[] with UF_* values iff field_set *
// has the relevant (1 << UF_*) bit set. As a courtesy to clients (and * Callers should index into field_data[] with UF_* values iff field_set
// because we probably have padding left over), we convert any port to * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and
// a uint16_t. * because we probably have padding left over), we convert any port to
* a uint16_t.
*/
struct http_parser_url { struct http_parser_url {
uint16_t field_set; /* Bitmask of (1 << UF_*) values */ uint16_t field_set; /* Bitmask of (1 << UF_*) values */
uint16_t port; /* Converted UF_PORT string */ uint16_t port; /* Converted UF_PORT string */
@ -807,11 +844,12 @@ extern "C" {
size_t len); size_t len);
// If http_should_keep_alive() in the on_headers_complete or /* If http_should_keep_alive() in the on_headers_complete or
// on_message_complete callback returns 0, then this should be * on_message_complete callback returns 0, then this should be
// The last message on the connection. * the last message on the connection.
// If you are the server, respond with the "Connection: close" header. * If you are the server, respond with the "Connection: close" header.
// If you are the client, close the connection. * If you are the client, close the connection.
*/
int http_should_keep_alive(const http_parser *parser); int http_should_keep_alive(const http_parser *parser);
/* Returns a string version of the HTTP method. */ /* Returns a string version of the HTTP method. */
@ -839,5 +877,3 @@ extern "C" {
#endif #endif
#endif #endif
#endif