Remove old zlib compression and other cleanup
This commit is contained in:
Tatsuhiro Tsujikawa
parent
61bf7c6b02
commit
30d2c86a7a
|
|
@ -32,7 +32,7 @@ DISTCLEANFILES = $(pkgconfig_DATA)
|
||||||
lib_LTLIBRARIES = libnghttp2.la
|
lib_LTLIBRARIES = libnghttp2.la
|
||||||
|
|
||||||
OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
|
OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
|
||||||
nghttp2_buffer.c nghttp2_frame.c nghttp2_zlib.c \
|
nghttp2_buffer.c nghttp2_frame.c \
|
||||||
nghttp2_stream.c nghttp2_outbound_item.c \
|
nghttp2_stream.c nghttp2_outbound_item.c \
|
||||||
nghttp2_session.c nghttp2_submit.c \
|
nghttp2_session.c nghttp2_submit.c \
|
||||||
nghttp2_helper.c \
|
nghttp2_helper.c \
|
||||||
|
|
@ -40,7 +40,7 @@ OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
|
||||||
nghttp2_hd.c
|
nghttp2_hd.c
|
||||||
|
|
||||||
HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
|
HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
|
||||||
nghttp2_buffer.h nghttp2_frame.h nghttp2_zlib.h \
|
nghttp2_buffer.h nghttp2_frame.h \
|
||||||
nghttp2_session.h nghttp2_helper.h nghttp2_stream.h nghttp2_int.h \
|
nghttp2_session.h nghttp2_helper.h nghttp2_stream.h nghttp2_int.h \
|
||||||
nghttp2_npn.h nghttp2_gzip.h \
|
nghttp2_npn.h nghttp2_gzip.h \
|
||||||
nghttp2_submit.h nghttp2_outbound_item.h \
|
nghttp2_submit.h nghttp2_outbound_item.h \
|
||||||
|
|
|
||||||
|
|
@ -56,10 +56,6 @@ typedef enum {
|
||||||
* Invalid argument passed.
|
* Invalid argument passed.
|
||||||
*/
|
*/
|
||||||
NGHTTP2_ERR_INVALID_ARGUMENT = -501,
|
NGHTTP2_ERR_INVALID_ARGUMENT = -501,
|
||||||
/**
|
|
||||||
* Zlib error.
|
|
||||||
*/
|
|
||||||
NGHTTP2_ERR_ZLIB = -502,
|
|
||||||
/**
|
/**
|
||||||
* The specified protocol version is not supported.
|
* The specified protocol version is not supported.
|
||||||
*/
|
*/
|
||||||
|
|
@ -967,8 +963,6 @@ typedef struct {
|
||||||
*
|
*
|
||||||
* :enum:`NGHTTP2_ERR_NOMEM`
|
* :enum:`NGHTTP2_ERR_NOMEM`
|
||||||
* Out of memory.
|
* Out of memory.
|
||||||
* :enum:`NGHTTP2_ERR_ZLIB`
|
|
||||||
* The z_stream initialization failed.
|
|
||||||
*/
|
*/
|
||||||
int nghttp2_session_client_new(nghttp2_session **session_ptr,
|
int nghttp2_session_client_new(nghttp2_session **session_ptr,
|
||||||
const nghttp2_session_callbacks *callbacks,
|
const nghttp2_session_callbacks *callbacks,
|
||||||
|
|
@ -992,8 +986,6 @@ int nghttp2_session_client_new(nghttp2_session **session_ptr,
|
||||||
*
|
*
|
||||||
* :enum:`NGHTTP2_ERR_NOMEM`
|
* :enum:`NGHTTP2_ERR_NOMEM`
|
||||||
* Out of memory.
|
* Out of memory.
|
||||||
* :enum:`NGHTTP2_ERR_ZLIB`
|
|
||||||
* The z_stream initialization failed.
|
|
||||||
*/
|
*/
|
||||||
int nghttp2_session_server_new(nghttp2_session **session_ptr,
|
int nghttp2_session_server_new(nghttp2_session **session_ptr,
|
||||||
const nghttp2_session_callbacks *callbacks,
|
const nghttp2_session_callbacks *callbacks,
|
||||||
|
|
|
||||||
|
|
@ -351,35 +351,6 @@ size_t nghttp2_frame_count_nv_space(char **nv, size_t len_size);
|
||||||
*/
|
*/
|
||||||
ssize_t nghttp2_frame_pack_nv(uint8_t *buf, char **nv, size_t len_size);
|
ssize_t nghttp2_frame_pack_nv(uint8_t *buf, char **nv, size_t len_size);
|
||||||
|
|
||||||
/*
|
|
||||||
* Unpacks name/value header block in wire format |in| and stores them
|
|
||||||
* in |*nv_ptr|. Thif function allocates enough memory to store
|
|
||||||
* name/value pairs in |*nv_ptr|. |len_size| is the number of bytes
|
|
||||||
* in length of name/value pair and it must be 2 or 4.
|
|
||||||
*
|
|
||||||
* This function also validates the name/value pairs. If unpacking
|
|
||||||
* succeeds but validation fails, it is indicated by returning
|
|
||||||
* NGHTTP2_ERR_INVALID_HEADER_BLOCK.
|
|
||||||
*
|
|
||||||
* If error other than NGHTTP2_ERR_INVALID_HEADER_BLOCK is returned,
|
|
||||||
* the |nv_ptr| is not assigned. In other words,
|
|
||||||
* NGHTTP2_ERR_INVALID_HEADER_BLOCK means unpacking succeeded, but
|
|
||||||
* header block validation failed.
|
|
||||||
*
|
|
||||||
* This function returns 0 if it succeeds, or one of the following
|
|
||||||
* negative error codes:
|
|
||||||
*
|
|
||||||
* NGHTTP2_ERR_INVALID_HEADER_BLOCK
|
|
||||||
* Unpacking succeeds but the header block is invalid. The
|
|
||||||
* possible reasons are: There are duplicate header names; or the
|
|
||||||
* header names are not encoded in US-ASCII character set and not
|
|
||||||
* lower cased; or the header name is zero-length string.
|
|
||||||
* NGHTTP2_ERR_NOMEM
|
|
||||||
* Out of memory.
|
|
||||||
*/
|
|
||||||
int nghttp2_frame_unpack_nv(char ***nv_ptr, nghttp2_buffer *in,
|
|
||||||
size_t len_size);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initializes HEADERS frame |frame| with given values. |frame| takes
|
* Initializes HEADERS frame |frame| with given values. |frame| takes
|
||||||
* ownership of |nva|, so caller must not free it. If |stream_id| is
|
* ownership of |nva|, so caller must not free it. If |stream_id| is
|
||||||
|
|
|
||||||
|
|
@ -98,8 +98,6 @@ const char* nghttp2_strerror(int error_code)
|
||||||
return "Success";
|
return "Success";
|
||||||
case NGHTTP2_ERR_INVALID_ARGUMENT:
|
case NGHTTP2_ERR_INVALID_ARGUMENT:
|
||||||
return "Invalid argument";
|
return "Invalid argument";
|
||||||
case NGHTTP2_ERR_ZLIB:
|
|
||||||
return "Zlib error";
|
|
||||||
case NGHTTP2_ERR_UNSUPPORTED_VERSION:
|
case NGHTTP2_ERR_UNSUPPORTED_VERSION:
|
||||||
return "Unsupported SPDY version";
|
return "Unsupported SPDY version";
|
||||||
case NGHTTP2_ERR_WOULDBLOCK:
|
case NGHTTP2_ERR_WOULDBLOCK:
|
||||||
|
|
|
||||||
|
|
@ -1933,12 +1933,14 @@ static int nghttp2_session_process_ctrl_frame(nghttp2_session *session)
|
||||||
}
|
}
|
||||||
nghttp2_frame_headers_free(&frame.headers);
|
nghttp2_frame_headers_free(&frame.headers);
|
||||||
nghttp2_hd_end_headers(&session->hd_inflater);
|
nghttp2_hd_end_headers(&session->hd_inflater);
|
||||||
} else if(r == NGHTTP2_ERR_INVALID_HEADER_BLOCK ||
|
} else if(r == NGHTTP2_ERR_INVALID_HEADER_BLOCK) {
|
||||||
r == NGHTTP2_ERR_FRAME_TOO_LARGE) {
|
|
||||||
r = nghttp2_session_handle_invalid_stream
|
r = nghttp2_session_handle_invalid_stream
|
||||||
(session, frame.hd.stream_id, &frame,
|
(session, frame.hd.stream_id, &frame,
|
||||||
nghttp2_get_status_code_from_error_code(r));
|
nghttp2_get_status_code_from_error_code(r));
|
||||||
|
/* TODO test this. It seems NGHTTP2_ERR_INVALID_HEADER_BLOCK is
|
||||||
|
not used in framing anymore. */
|
||||||
nghttp2_frame_headers_free(&frame.headers);
|
nghttp2_frame_headers_free(&frame.headers);
|
||||||
|
nghttp2_hd_end_headers(&session->hd_inflater);
|
||||||
} else if(nghttp2_is_non_fatal(r)) {
|
} else if(nghttp2_is_non_fatal(r)) {
|
||||||
nghttp2_session_handle_parse_error(session, type, r);
|
nghttp2_session_handle_parse_error(session, type, r);
|
||||||
r = nghttp2_session_fail_session(session, NGHTTP2_PROTOCOL_ERROR);
|
r = nghttp2_session_fail_session(session, NGHTTP2_PROTOCOL_ERROR);
|
||||||
|
|
|
||||||
|
|
@ -1,356 +0,0 @@
|
||||||
/*
|
|
||||||
* nghttp2 - HTTP/2.0 C Library
|
|
||||||
*
|
|
||||||
* Copyright (c) 2012 Tatsuhiro Tsujikawa
|
|
||||||
*
|
|
||||||
* 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 "nghttp2_zlib.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#define COMPRESSION_LEVEL 9
|
|
||||||
#define WINDOW_BITS 11
|
|
||||||
#define MEM_LEVEL 1
|
|
||||||
|
|
||||||
static const char spdy2_hd_dict[] =
|
|
||||||
"optionsgetheadpostputdeletetraceacceptaccept-charsetaccept-encodingaccept-"
|
|
||||||
"languageauthorizationexpectfromhostif-modified-sinceif-matchif-none-matchi"
|
|
||||||
"f-rangeif-unmodifiedsincemax-forwardsproxy-authorizationrangerefererteuser"
|
|
||||||
"-agent10010120020120220320420520630030130230330430530630740040140240340440"
|
|
||||||
"5406407408409410411412413414415416417500501502503504505accept-rangesageeta"
|
|
||||||
"glocationproxy-authenticatepublicretry-afterservervarywarningwww-authentic"
|
|
||||||
"ateallowcontent-basecontent-encodingcache-controlconnectiondatetrailertran"
|
|
||||||
"sfer-encodingupgradeviawarningcontent-languagecontent-lengthcontent-locati"
|
|
||||||
"oncontent-md5content-rangecontent-typeetagexpireslast-modifiedset-cookieMo"
|
|
||||||
"ndayTuesdayWednesdayThursdayFridaySaturdaySundayJanFebMarAprMayJunJulAugSe"
|
|
||||||
"pOctNovDecchunkedtext/htmlimage/pngimage/jpgimage/gifapplication/xmlapplic"
|
|
||||||
"ation/xhtmltext/plainpublicmax-agecharset=iso-8859-1utf-8gzipdeflateHTTP/1"
|
|
||||||
".1statusversionurl";
|
|
||||||
|
|
||||||
static const uint8_t spdy3_hd_dict[] = {
|
|
||||||
0x00, 0x00, 0x00, 0x07, 0x6f, 0x70, 0x74, 0x69, /* - - - - o p t i */
|
|
||||||
0x6f, 0x6e, 0x73, 0x00, 0x00, 0x00, 0x04, 0x68, /* o n s - - - - h */
|
|
||||||
0x65, 0x61, 0x64, 0x00, 0x00, 0x00, 0x04, 0x70, /* e a d - - - - p */
|
|
||||||
0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x03, 0x70, /* o s t - - - - p */
|
|
||||||
0x75, 0x74, 0x00, 0x00, 0x00, 0x06, 0x64, 0x65, /* u t - - - - d e */
|
|
||||||
0x6c, 0x65, 0x74, 0x65, 0x00, 0x00, 0x00, 0x05, /* l e t e - - - - */
|
|
||||||
0x74, 0x72, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00, /* t r a c e - - - */
|
|
||||||
0x06, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x00, /* - a c c e p t - */
|
|
||||||
0x00, 0x00, 0x0e, 0x61, 0x63, 0x63, 0x65, 0x70, /* - - - a c c e p */
|
|
||||||
0x74, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65, /* t - c h a r s e */
|
|
||||||
0x74, 0x00, 0x00, 0x00, 0x0f, 0x61, 0x63, 0x63, /* t - - - - a c c */
|
|
||||||
0x65, 0x70, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f, /* e p t - e n c o */
|
|
||||||
0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x0f, /* d i n g - - - - */
|
|
||||||
0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x6c, /* a c c e p t - l */
|
|
||||||
0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x00, /* a n g u a g e - */
|
|
||||||
0x00, 0x00, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x70, /* - - - a c c e p */
|
|
||||||
0x74, 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73, /* t - r a n g e s */
|
|
||||||
0x00, 0x00, 0x00, 0x03, 0x61, 0x67, 0x65, 0x00, /* - - - - a g e - */
|
|
||||||
0x00, 0x00, 0x05, 0x61, 0x6c, 0x6c, 0x6f, 0x77, /* - - - a l l o w */
|
|
||||||
0x00, 0x00, 0x00, 0x0d, 0x61, 0x75, 0x74, 0x68, /* - - - - a u t h */
|
|
||||||
0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, /* o r i z a t i o */
|
|
||||||
0x6e, 0x00, 0x00, 0x00, 0x0d, 0x63, 0x61, 0x63, /* n - - - - c a c */
|
|
||||||
0x68, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, /* h e - c o n t r */
|
|
||||||
0x6f, 0x6c, 0x00, 0x00, 0x00, 0x0a, 0x63, 0x6f, /* o l - - - - c o */
|
|
||||||
0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, /* n n e c t i o n */
|
|
||||||
0x00, 0x00, 0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74, /* - - - - c o n t */
|
|
||||||
0x65, 0x6e, 0x74, 0x2d, 0x62, 0x61, 0x73, 0x65, /* e n t - b a s e */
|
|
||||||
0x00, 0x00, 0x00, 0x10, 0x63, 0x6f, 0x6e, 0x74, /* - - - - c o n t */
|
|
||||||
0x65, 0x6e, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f, /* e n t - e n c o */
|
|
||||||
0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x10, /* d i n g - - - - */
|
|
||||||
0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, /* c o n t e n t - */
|
|
||||||
0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, /* l a n g u a g e */
|
|
||||||
0x00, 0x00, 0x00, 0x0e, 0x63, 0x6f, 0x6e, 0x74, /* - - - - c o n t */
|
|
||||||
0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x65, 0x6e, 0x67, /* e n t - l e n g */
|
|
||||||
0x74, 0x68, 0x00, 0x00, 0x00, 0x10, 0x63, 0x6f, /* t h - - - - c o */
|
|
||||||
0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x6f, /* n t e n t - l o */
|
|
||||||
0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, /* c a t i o n - - */
|
|
||||||
0x00, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, /* - - c o n t e n */
|
|
||||||
0x74, 0x2d, 0x6d, 0x64, 0x35, 0x00, 0x00, 0x00, /* t - m d 5 - - - */
|
|
||||||
0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, /* - c o n t e n t */
|
|
||||||
0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00, /* - r a n g e - - */
|
|
||||||
0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, /* - - c o n t e n */
|
|
||||||
0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x00, 0x00, /* t - t y p e - - */
|
|
||||||
0x00, 0x04, 0x64, 0x61, 0x74, 0x65, 0x00, 0x00, /* - - d a t e - - */
|
|
||||||
0x00, 0x04, 0x65, 0x74, 0x61, 0x67, 0x00, 0x00, /* - - e t a g - - */
|
|
||||||
0x00, 0x06, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, /* - - e x p e c t */
|
|
||||||
0x00, 0x00, 0x00, 0x07, 0x65, 0x78, 0x70, 0x69, /* - - - - e x p i */
|
|
||||||
0x72, 0x65, 0x73, 0x00, 0x00, 0x00, 0x04, 0x66, /* r e s - - - - f */
|
|
||||||
0x72, 0x6f, 0x6d, 0x00, 0x00, 0x00, 0x04, 0x68, /* r o m - - - - h */
|
|
||||||
0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x08, 0x69, /* o s t - - - - i */
|
|
||||||
0x66, 0x2d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x00, /* f - m a t c h - */
|
|
||||||
0x00, 0x00, 0x11, 0x69, 0x66, 0x2d, 0x6d, 0x6f, /* - - - i f - m o */
|
|
||||||
0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2d, 0x73, /* d i f i e d - s */
|
|
||||||
0x69, 0x6e, 0x63, 0x65, 0x00, 0x00, 0x00, 0x0d, /* i n c e - - - - */
|
|
||||||
0x69, 0x66, 0x2d, 0x6e, 0x6f, 0x6e, 0x65, 0x2d, /* i f - n o n e - */
|
|
||||||
0x6d, 0x61, 0x74, 0x63, 0x68, 0x00, 0x00, 0x00, /* m a t c h - - - */
|
|
||||||
0x08, 0x69, 0x66, 0x2d, 0x72, 0x61, 0x6e, 0x67, /* - i f - r a n g */
|
|
||||||
0x65, 0x00, 0x00, 0x00, 0x13, 0x69, 0x66, 0x2d, /* e - - - - i f - */
|
|
||||||
0x75, 0x6e, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, /* u n m o d i f i */
|
|
||||||
0x65, 0x64, 0x2d, 0x73, 0x69, 0x6e, 0x63, 0x65, /* e d - s i n c e */
|
|
||||||
0x00, 0x00, 0x00, 0x0d, 0x6c, 0x61, 0x73, 0x74, /* - - - - l a s t */
|
|
||||||
0x2d, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, /* - m o d i f i e */
|
|
||||||
0x64, 0x00, 0x00, 0x00, 0x08, 0x6c, 0x6f, 0x63, /* d - - - - l o c */
|
|
||||||
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, /* a t i o n - - - */
|
|
||||||
0x0c, 0x6d, 0x61, 0x78, 0x2d, 0x66, 0x6f, 0x72, /* - m a x - f o r */
|
|
||||||
0x77, 0x61, 0x72, 0x64, 0x73, 0x00, 0x00, 0x00, /* w a r d s - - - */
|
|
||||||
0x06, 0x70, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x00, /* - p r a g m a - */
|
|
||||||
0x00, 0x00, 0x12, 0x70, 0x72, 0x6f, 0x78, 0x79, /* - - - p r o x y */
|
|
||||||
0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, /* - a u t h e n t */
|
|
||||||
0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00, /* i c a t e - - - */
|
|
||||||
0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2d, 0x61, /* - p r o x y - a */
|
|
||||||
0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, /* u t h o r i z a */
|
|
||||||
0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x05, /* t i o n - - - - */
|
|
||||||
0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00, 0x00, /* r a n g e - - - */
|
|
||||||
0x07, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72, /* - r e f e r e r */
|
|
||||||
0x00, 0x00, 0x00, 0x0b, 0x72, 0x65, 0x74, 0x72, /* - - - - r e t r */
|
|
||||||
0x79, 0x2d, 0x61, 0x66, 0x74, 0x65, 0x72, 0x00, /* y - a f t e r - */
|
|
||||||
0x00, 0x00, 0x06, 0x73, 0x65, 0x72, 0x76, 0x65, /* - - - s e r v e */
|
|
||||||
0x72, 0x00, 0x00, 0x00, 0x02, 0x74, 0x65, 0x00, /* r - - - - t e - */
|
|
||||||
0x00, 0x00, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c, /* - - - t r a i l */
|
|
||||||
0x65, 0x72, 0x00, 0x00, 0x00, 0x11, 0x74, 0x72, /* e r - - - - t r */
|
|
||||||
0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2d, 0x65, /* a n s f e r - e */
|
|
||||||
0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x00, /* n c o d i n g - */
|
|
||||||
0x00, 0x00, 0x07, 0x75, 0x70, 0x67, 0x72, 0x61, /* - - - u p g r a */
|
|
||||||
0x64, 0x65, 0x00, 0x00, 0x00, 0x0a, 0x75, 0x73, /* d e - - - - u s */
|
|
||||||
0x65, 0x72, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74, /* e r - a g e n t */
|
|
||||||
0x00, 0x00, 0x00, 0x04, 0x76, 0x61, 0x72, 0x79, /* - - - - v a r y */
|
|
||||||
0x00, 0x00, 0x00, 0x03, 0x76, 0x69, 0x61, 0x00, /* - - - - v i a - */
|
|
||||||
0x00, 0x00, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69, /* - - - w a r n i */
|
|
||||||
0x6e, 0x67, 0x00, 0x00, 0x00, 0x10, 0x77, 0x77, /* n g - - - - w w */
|
|
||||||
0x77, 0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, /* w - a u t h e n */
|
|
||||||
0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00, /* t i c a t e - - */
|
|
||||||
0x00, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, /* - - m e t h o d */
|
|
||||||
0x00, 0x00, 0x00, 0x03, 0x67, 0x65, 0x74, 0x00, /* - - - - g e t - */
|
|
||||||
0x00, 0x00, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, /* - - - s t a t u */
|
|
||||||
0x73, 0x00, 0x00, 0x00, 0x06, 0x32, 0x30, 0x30, /* s - - - - 2 0 0 */
|
|
||||||
0x20, 0x4f, 0x4b, 0x00, 0x00, 0x00, 0x07, 0x76, /* - O K - - - - v */
|
|
||||||
0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x00, /* e r s i o n - - */
|
|
||||||
0x00, 0x08, 0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, /* - - H T T P - 1 */
|
|
||||||
0x2e, 0x31, 0x00, 0x00, 0x00, 0x03, 0x75, 0x72, /* - 1 - - - - u r */
|
|
||||||
0x6c, 0x00, 0x00, 0x00, 0x06, 0x70, 0x75, 0x62, /* l - - - - p u b */
|
|
||||||
0x6c, 0x69, 0x63, 0x00, 0x00, 0x00, 0x0a, 0x73, /* l i c - - - - s */
|
|
||||||
0x65, 0x74, 0x2d, 0x63, 0x6f, 0x6f, 0x6b, 0x69, /* e t - c o o k i */
|
|
||||||
0x65, 0x00, 0x00, 0x00, 0x0a, 0x6b, 0x65, 0x65, /* e - - - - k e e */
|
|
||||||
0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x00, /* p - a l i v e - */
|
|
||||||
0x00, 0x00, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69, /* - - - o r i g i */
|
|
||||||
0x6e, 0x31, 0x30, 0x30, 0x31, 0x30, 0x31, 0x32, /* n 1 0 0 1 0 1 2 */
|
|
||||||
0x30, 0x31, 0x32, 0x30, 0x32, 0x32, 0x30, 0x35, /* 0 1 2 0 2 2 0 5 */
|
|
||||||
0x32, 0x30, 0x36, 0x33, 0x30, 0x30, 0x33, 0x30, /* 2 0 6 3 0 0 3 0 */
|
|
||||||
0x32, 0x33, 0x30, 0x33, 0x33, 0x30, 0x34, 0x33, /* 2 3 0 3 3 0 4 3 */
|
|
||||||
0x30, 0x35, 0x33, 0x30, 0x36, 0x33, 0x30, 0x37, /* 0 5 3 0 6 3 0 7 */
|
|
||||||
0x34, 0x30, 0x32, 0x34, 0x30, 0x35, 0x34, 0x30, /* 4 0 2 4 0 5 4 0 */
|
|
||||||
0x36, 0x34, 0x30, 0x37, 0x34, 0x30, 0x38, 0x34, /* 6 4 0 7 4 0 8 4 */
|
|
||||||
0x30, 0x39, 0x34, 0x31, 0x30, 0x34, 0x31, 0x31, /* 0 9 4 1 0 4 1 1 */
|
|
||||||
0x34, 0x31, 0x32, 0x34, 0x31, 0x33, 0x34, 0x31, /* 4 1 2 4 1 3 4 1 */
|
|
||||||
0x34, 0x34, 0x31, 0x35, 0x34, 0x31, 0x36, 0x34, /* 4 4 1 5 4 1 6 4 */
|
|
||||||
0x31, 0x37, 0x35, 0x30, 0x32, 0x35, 0x30, 0x34, /* 1 7 5 0 2 5 0 4 */
|
|
||||||
0x35, 0x30, 0x35, 0x32, 0x30, 0x33, 0x20, 0x4e, /* 5 0 5 2 0 3 - N */
|
|
||||||
0x6f, 0x6e, 0x2d, 0x41, 0x75, 0x74, 0x68, 0x6f, /* o n - A u t h o */
|
|
||||||
0x72, 0x69, 0x74, 0x61, 0x74, 0x69, 0x76, 0x65, /* r i t a t i v e */
|
|
||||||
0x20, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, /* - I n f o r m a */
|
|
||||||
0x74, 0x69, 0x6f, 0x6e, 0x32, 0x30, 0x34, 0x20, /* t i o n 2 0 4 - */
|
|
||||||
0x4e, 0x6f, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x65, /* N o - C o n t e */
|
|
||||||
0x6e, 0x74, 0x33, 0x30, 0x31, 0x20, 0x4d, 0x6f, /* n t 3 0 1 - M o */
|
|
||||||
0x76, 0x65, 0x64, 0x20, 0x50, 0x65, 0x72, 0x6d, /* v e d - P e r m */
|
|
||||||
0x61, 0x6e, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x34, /* a n e n t l y 4 */
|
|
||||||
0x30, 0x30, 0x20, 0x42, 0x61, 0x64, 0x20, 0x52, /* 0 0 - B a d - R */
|
|
||||||
0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x34, 0x30, /* e q u e s t 4 0 */
|
|
||||||
0x31, 0x20, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68, /* 1 - U n a u t h */
|
|
||||||
0x6f, 0x72, 0x69, 0x7a, 0x65, 0x64, 0x34, 0x30, /* o r i z e d 4 0 */
|
|
||||||
0x33, 0x20, 0x46, 0x6f, 0x72, 0x62, 0x69, 0x64, /* 3 - F o r b i d */
|
|
||||||
0x64, 0x65, 0x6e, 0x34, 0x30, 0x34, 0x20, 0x4e, /* d e n 4 0 4 - N */
|
|
||||||
0x6f, 0x74, 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, /* o t - F o u n d */
|
|
||||||
0x35, 0x30, 0x30, 0x20, 0x49, 0x6e, 0x74, 0x65, /* 5 0 0 - I n t e */
|
|
||||||
0x72, 0x6e, 0x61, 0x6c, 0x20, 0x53, 0x65, 0x72, /* r n a l - S e r */
|
|
||||||
0x76, 0x65, 0x72, 0x20, 0x45, 0x72, 0x72, 0x6f, /* v e r - E r r o */
|
|
||||||
0x72, 0x35, 0x30, 0x31, 0x20, 0x4e, 0x6f, 0x74, /* r 5 0 1 - N o t */
|
|
||||||
0x20, 0x49, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, /* - I m p l e m e */
|
|
||||||
0x6e, 0x74, 0x65, 0x64, 0x35, 0x30, 0x33, 0x20, /* n t e d 5 0 3 - */
|
|
||||||
0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x20, /* S e r v i c e - */
|
|
||||||
0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, /* U n a v a i l a */
|
|
||||||
0x62, 0x6c, 0x65, 0x4a, 0x61, 0x6e, 0x20, 0x46, /* b l e J a n - F */
|
|
||||||
0x65, 0x62, 0x20, 0x4d, 0x61, 0x72, 0x20, 0x41, /* e b - M a r - A */
|
|
||||||
0x70, 0x72, 0x20, 0x4d, 0x61, 0x79, 0x20, 0x4a, /* p r - M a y - J */
|
|
||||||
0x75, 0x6e, 0x20, 0x4a, 0x75, 0x6c, 0x20, 0x41, /* u n - J u l - A */
|
|
||||||
0x75, 0x67, 0x20, 0x53, 0x65, 0x70, 0x74, 0x20, /* u g - S e p t - */
|
|
||||||
0x4f, 0x63, 0x74, 0x20, 0x4e, 0x6f, 0x76, 0x20, /* O c t - N o v - */
|
|
||||||
0x44, 0x65, 0x63, 0x20, 0x30, 0x30, 0x3a, 0x30, /* D e c - 0 0 - 0 */
|
|
||||||
0x30, 0x3a, 0x30, 0x30, 0x20, 0x4d, 0x6f, 0x6e, /* 0 - 0 0 - M o n */
|
|
||||||
0x2c, 0x20, 0x54, 0x75, 0x65, 0x2c, 0x20, 0x57, /* - - T u e - - W */
|
|
||||||
0x65, 0x64, 0x2c, 0x20, 0x54, 0x68, 0x75, 0x2c, /* e d - - T h u - */
|
|
||||||
0x20, 0x46, 0x72, 0x69, 0x2c, 0x20, 0x53, 0x61, /* - F r i - - S a */
|
|
||||||
0x74, 0x2c, 0x20, 0x53, 0x75, 0x6e, 0x2c, 0x20, /* t - - S u n - - */
|
|
||||||
0x47, 0x4d, 0x54, 0x63, 0x68, 0x75, 0x6e, 0x6b, /* G M T c h u n k */
|
|
||||||
0x65, 0x64, 0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f, /* e d - t e x t - */
|
|
||||||
0x68, 0x74, 0x6d, 0x6c, 0x2c, 0x69, 0x6d, 0x61, /* h t m l - i m a */
|
|
||||||
0x67, 0x65, 0x2f, 0x70, 0x6e, 0x67, 0x2c, 0x69, /* g e - p n g - i */
|
|
||||||
0x6d, 0x61, 0x67, 0x65, 0x2f, 0x6a, 0x70, 0x67, /* m a g e - j p g */
|
|
||||||
0x2c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x67, /* - i m a g e - g */
|
|
||||||
0x69, 0x66, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69, /* i f - a p p l i */
|
|
||||||
0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78, /* c a t i o n - x */
|
|
||||||
0x6d, 0x6c, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69, /* m l - a p p l i */
|
|
||||||
0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78, /* c a t i o n - x */
|
|
||||||
0x68, 0x74, 0x6d, 0x6c, 0x2b, 0x78, 0x6d, 0x6c, /* h t m l - x m l */
|
|
||||||
0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c, /* - t e x t - p l */
|
|
||||||
0x61, 0x69, 0x6e, 0x2c, 0x74, 0x65, 0x78, 0x74, /* a i n - t e x t */
|
|
||||||
0x2f, 0x6a, 0x61, 0x76, 0x61, 0x73, 0x63, 0x72, /* - j a v a s c r */
|
|
||||||
0x69, 0x70, 0x74, 0x2c, 0x70, 0x75, 0x62, 0x6c, /* i p t - p u b l */
|
|
||||||
0x69, 0x63, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, /* i c p r i v a t */
|
|
||||||
0x65, 0x6d, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65, /* e m a x - a g e */
|
|
||||||
0x3d, 0x67, 0x7a, 0x69, 0x70, 0x2c, 0x64, 0x65, /* - g z i p - d e */
|
|
||||||
0x66, 0x6c, 0x61, 0x74, 0x65, 0x2c, 0x73, 0x64, /* f l a t e - s d */
|
|
||||||
0x63, 0x68, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65, /* c h c h a r s e */
|
|
||||||
0x74, 0x3d, 0x75, 0x74, 0x66, 0x2d, 0x38, 0x63, /* t - u t f - 8 c */
|
|
||||||
0x68, 0x61, 0x72, 0x73, 0x65, 0x74, 0x3d, 0x69, /* h a r s e t - i */
|
|
||||||
0x73, 0x6f, 0x2d, 0x38, 0x38, 0x35, 0x39, 0x2d, /* s o - 8 8 5 9 - */
|
|
||||||
0x31, 0x2c, 0x75, 0x74, 0x66, 0x2d, 0x2c, 0x2a, /* 1 - u t f - - - */
|
|
||||||
0x2c, 0x65, 0x6e, 0x71, 0x3d, 0x30, 0x2e /* - e n q - 0 - */
|
|
||||||
};
|
|
||||||
|
|
||||||
static const uint8_t* nghttp2_select_hd_dict(size_t *len_ptr, uint16_t version)
|
|
||||||
{
|
|
||||||
const uint8_t *hd_dict;
|
|
||||||
hd_dict = NULL;
|
|
||||||
hd_dict = (const uint8_t*)spdy2_hd_dict;
|
|
||||||
*len_ptr = sizeof(spdy2_hd_dict);
|
|
||||||
return hd_dict;
|
|
||||||
}
|
|
||||||
|
|
||||||
int nghttp2_zlib_deflate_hd_init(nghttp2_zlib *deflater, int comp,
|
|
||||||
uint16_t version)
|
|
||||||
{
|
|
||||||
const unsigned char *hd_dict;
|
|
||||||
size_t hd_dict_length;
|
|
||||||
deflater->zst.next_in = Z_NULL;
|
|
||||||
deflater->zst.zalloc = Z_NULL;
|
|
||||||
deflater->zst.zfree = Z_NULL;
|
|
||||||
deflater->zst.opaque = Z_NULL;
|
|
||||||
deflater->version = version;
|
|
||||||
hd_dict = nghttp2_select_hd_dict(&hd_dict_length, version);
|
|
||||||
if(hd_dict == NULL) {
|
|
||||||
return NGHTTP2_ERR_UNSUPPORTED_VERSION;
|
|
||||||
}
|
|
||||||
if(Z_OK != deflateInit2(&deflater->zst,
|
|
||||||
comp ? COMPRESSION_LEVEL : Z_NO_COMPRESSION,
|
|
||||||
Z_DEFLATED, WINDOW_BITS, MEM_LEVEL,
|
|
||||||
Z_DEFAULT_STRATEGY)) {
|
|
||||||
return NGHTTP2_ERR_ZLIB;
|
|
||||||
}
|
|
||||||
if(Z_OK != deflateSetDictionary(&deflater->zst, (uint8_t*)hd_dict,
|
|
||||||
hd_dict_length)) {
|
|
||||||
nghttp2_zlib_deflate_free(deflater);
|
|
||||||
return NGHTTP2_ERR_ZLIB;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int nghttp2_zlib_inflate_hd_init(nghttp2_zlib *inflater, uint16_t version)
|
|
||||||
{
|
|
||||||
const unsigned char *hd_dict;
|
|
||||||
size_t hd_dict_length;
|
|
||||||
inflater->zst.next_in = Z_NULL;
|
|
||||||
inflater->zst.avail_in = 0;
|
|
||||||
inflater->zst.zalloc = Z_NULL;
|
|
||||||
inflater->zst.zfree = Z_NULL;
|
|
||||||
inflater->zst.opaque = Z_NULL;
|
|
||||||
inflater->version = version;
|
|
||||||
hd_dict = nghttp2_select_hd_dict(&hd_dict_length, version);
|
|
||||||
if(hd_dict == NULL) {
|
|
||||||
return NGHTTP2_ERR_UNSUPPORTED_VERSION;
|
|
||||||
}
|
|
||||||
if(Z_OK != inflateInit(&inflater->zst)) {
|
|
||||||
return NGHTTP2_ERR_ZLIB;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void nghttp2_zlib_deflate_free(nghttp2_zlib *deflater)
|
|
||||||
{
|
|
||||||
deflateEnd(&deflater->zst);
|
|
||||||
}
|
|
||||||
|
|
||||||
void nghttp2_zlib_inflate_free(nghttp2_zlib *inflater)
|
|
||||||
{
|
|
||||||
inflateEnd(&inflater->zst);
|
|
||||||
}
|
|
||||||
|
|
||||||
ssize_t nghttp2_zlib_deflate_hd(nghttp2_zlib *deflater,
|
|
||||||
uint8_t *out, size_t outlen,
|
|
||||||
const uint8_t *in, size_t inlen)
|
|
||||||
{
|
|
||||||
int r;
|
|
||||||
deflater->zst.avail_in = inlen;
|
|
||||||
deflater->zst.next_in = (uint8_t*)in;
|
|
||||||
deflater->zst.avail_out = outlen;
|
|
||||||
deflater->zst.next_out = out;
|
|
||||||
r = deflate(&deflater->zst, Z_SYNC_FLUSH);
|
|
||||||
if(r == Z_OK) {
|
|
||||||
return outlen-deflater->zst.avail_out;
|
|
||||||
} else {
|
|
||||||
return NGHTTP2_ERR_ZLIB;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t nghttp2_zlib_deflate_hd_bound(nghttp2_zlib *deflater, size_t len)
|
|
||||||
{
|
|
||||||
return deflateBound(&deflater->zst, len);
|
|
||||||
}
|
|
||||||
|
|
||||||
ssize_t nghttp2_zlib_inflate_hd(nghttp2_zlib *inflater,
|
|
||||||
nghttp2_buffer* buf,
|
|
||||||
const uint8_t *in, size_t inlen)
|
|
||||||
{
|
|
||||||
int r;
|
|
||||||
inflater->zst.avail_in = inlen;
|
|
||||||
inflater->zst.next_in = (uint8_t*)in;
|
|
||||||
while(1) {
|
|
||||||
if(nghttp2_buffer_avail(buf) == 0) {
|
|
||||||
if((r = nghttp2_buffer_alloc(buf)) != 0) {
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
inflater->zst.avail_out = nghttp2_buffer_avail(buf);
|
|
||||||
inflater->zst.next_out = nghttp2_buffer_get(buf);
|
|
||||||
r = inflate(&inflater->zst, Z_NO_FLUSH);
|
|
||||||
if(r == Z_STREAM_ERROR || r == Z_STREAM_END || r == Z_DATA_ERROR) {
|
|
||||||
return NGHTTP2_ERR_ZLIB;
|
|
||||||
} else if(r == Z_NEED_DICT) {
|
|
||||||
const uint8_t *hd_dict;
|
|
||||||
size_t hd_dict_length;
|
|
||||||
hd_dict = nghttp2_select_hd_dict(&hd_dict_length, inflater->version);
|
|
||||||
assert(hd_dict);
|
|
||||||
if(Z_OK != inflateSetDictionary(&inflater->zst, (uint8_t*)hd_dict,
|
|
||||||
hd_dict_length)) {
|
|
||||||
return NGHTTP2_ERR_ZLIB;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if(r == Z_OK) {
|
|
||||||
size_t adv = nghttp2_buffer_avail(buf)-inflater->zst.avail_out;
|
|
||||||
nghttp2_buffer_advance(buf, adv);
|
|
||||||
}
|
|
||||||
if(inflater->zst.avail_in == 0 && inflater->zst.avail_out > 0) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nghttp2_buffer_length(buf);
|
|
||||||
}
|
|
||||||
|
|
@ -1,122 +0,0 @@
|
||||||
/*
|
|
||||||
* nghttp2 - HTTP/2.0 C Library
|
|
||||||
*
|
|
||||||
* Copyright (c) 2012 Tatsuhiro Tsujikawa
|
|
||||||
*
|
|
||||||
* 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 NGHTTP2_ZLIB_H
|
|
||||||
#define NGHTTP2_ZLIB_H
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
# include <config.h>
|
|
||||||
#endif /* HAVE_CONFIG_H */
|
|
||||||
#include <zlib.h>
|
|
||||||
|
|
||||||
#include "nghttp2_buffer.h"
|
|
||||||
|
|
||||||
/* This structure is used for both deflater and inflater. */
|
|
||||||
typedef struct {
|
|
||||||
z_stream zst;
|
|
||||||
/* The protocol version to select the dictionary later. */
|
|
||||||
uint16_t version;
|
|
||||||
} nghttp2_zlib;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Initializes |deflater| for deflating name/values pairs in the frame
|
|
||||||
* of the protocol version |version|. If the |comp| is zero,
|
|
||||||
* compression level becomes 0, which means no compression.
|
|
||||||
*
|
|
||||||
* This function returns 0 if it succeeds, or one of the following
|
|
||||||
* negative error codes:
|
|
||||||
*
|
|
||||||
* NGHTTP2_ERR_ZLIB
|
|
||||||
* The z_stream initialization failed.
|
|
||||||
* NGHTTP2_ERR_UNSUPPORTED_VERSION
|
|
||||||
* The version is not supported.
|
|
||||||
*/
|
|
||||||
int nghttp2_zlib_deflate_hd_init(nghttp2_zlib *deflater, int comp,
|
|
||||||
uint16_t version);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Initializes |inflater| for inflating name/values pairs in the
|
|
||||||
* frame of the protocol version |version|.
|
|
||||||
*
|
|
||||||
* This function returns 0 if it succeeds, or one of the following
|
|
||||||
* negative error codes:
|
|
||||||
*
|
|
||||||
* NGHTTP2_ERR_ZLIB
|
|
||||||
* The z_stream initialization failed.
|
|
||||||
* NGHTTP2_ERR_UNSUPPORTED_VERSION
|
|
||||||
* The version is not supported.
|
|
||||||
*/
|
|
||||||
int nghttp2_zlib_inflate_hd_init(nghttp2_zlib *inflater, uint16_t version);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Deallocates any resources allocated for |deflater|.
|
|
||||||
*/
|
|
||||||
void nghttp2_zlib_deflate_free(nghttp2_zlib *deflater);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Deallocates any resources allocated for |inflater|.
|
|
||||||
*/
|
|
||||||
void nghttp2_zlib_inflate_free(nghttp2_zlib *inflater);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Returns the maximum length when |len| bytes of data are deflated by
|
|
||||||
* |deflater|.
|
|
||||||
*/
|
|
||||||
size_t nghttp2_zlib_deflate_hd_bound(nghttp2_zlib *deflater, size_t len);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Deflates data stored in |in| with length |inlen|. The output is
|
|
||||||
* written to |out| with length |outlen|. This is not a strict
|
|
||||||
* requirement but |outlen| should have at least
|
|
||||||
* nghttp2_zlib_deflate_hd_bound(|inlen|) bytes for successful
|
|
||||||
* operation.
|
|
||||||
*
|
|
||||||
* This function returns the number of bytes outputted if it succeeds,
|
|
||||||
* or one of the following negative error codes:
|
|
||||||
*
|
|
||||||
* NGHTTP2_ERR_ZLIB
|
|
||||||
* The deflate operation failed.
|
|
||||||
*/
|
|
||||||
ssize_t nghttp2_zlib_deflate_hd(nghttp2_zlib *deflater,
|
|
||||||
uint8_t *out, size_t outlen,
|
|
||||||
const uint8_t *in, size_t inlen);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Inflates data stored in |in| with length |inlen|. The output is
|
|
||||||
* added to |buf|.
|
|
||||||
*
|
|
||||||
* This function returns the number of bytes outputted if it succeeds,
|
|
||||||
* or one of the following negative error codes:
|
|
||||||
*
|
|
||||||
* NGHTTP2_ERR_ZLIB
|
|
||||||
* The inflate operation failed.
|
|
||||||
*
|
|
||||||
* NGHTTP2_ERR_NOMEM
|
|
||||||
* Out of memory.
|
|
||||||
*/
|
|
||||||
ssize_t nghttp2_zlib_inflate_hd(nghttp2_zlib *inflater,
|
|
||||||
nghttp2_buffer* buf,
|
|
||||||
const uint8_t *in, size_t inlen);
|
|
||||||
|
|
||||||
#endif /* NGHTTP2_ZLIB_H */
|
|
||||||
|
|
@ -28,7 +28,7 @@ check_PROGRAMS = main
|
||||||
# failmalloc
|
# failmalloc
|
||||||
|
|
||||||
OBJECTS = main.c nghttp2_pq_test.c nghttp2_map_test.c nghttp2_queue_test.c \
|
OBJECTS = main.c nghttp2_pq_test.c nghttp2_map_test.c nghttp2_queue_test.c \
|
||||||
nghttp2_buffer_test.c nghttp2_zlib_test.c \
|
nghttp2_buffer_test.c \
|
||||||
nghttp2_test_helper.c \
|
nghttp2_test_helper.c \
|
||||||
nghttp2_frame_test.c \
|
nghttp2_frame_test.c \
|
||||||
nghttp2_stream_test.c \
|
nghttp2_stream_test.c \
|
||||||
|
|
@ -38,7 +38,7 @@ OBJECTS = main.c nghttp2_pq_test.c nghttp2_map_test.c nghttp2_queue_test.c \
|
||||||
nghttp2_gzip_test.c
|
nghttp2_gzip_test.c
|
||||||
|
|
||||||
HFILES = nghttp2_pq_test.h nghttp2_map_test.h nghttp2_queue_test.h \
|
HFILES = nghttp2_pq_test.h nghttp2_map_test.h nghttp2_queue_test.h \
|
||||||
nghttp2_buffer_test.h nghttp2_zlib_test.h nghttp2_session_test.h \
|
nghttp2_buffer_test.h nghttp2_session_test.h \
|
||||||
nghttp2_frame_test.h nghttp2_stream_test.h nghttp2_hd_test.h \
|
nghttp2_frame_test.h nghttp2_stream_test.h nghttp2_hd_test.h \
|
||||||
nghttp2_npn_test.h nghttp2_gzip_test.h nghttp2_test_helper.h
|
nghttp2_npn_test.h nghttp2_gzip_test.h nghttp2_test_helper.h
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,6 @@
|
||||||
#include "nghttp2_map_test.h"
|
#include "nghttp2_map_test.h"
|
||||||
#include "nghttp2_queue_test.h"
|
#include "nghttp2_queue_test.h"
|
||||||
#include "nghttp2_buffer_test.h"
|
#include "nghttp2_buffer_test.h"
|
||||||
#include "nghttp2_zlib_test.h"
|
|
||||||
#include "nghttp2_session_test.h"
|
#include "nghttp2_session_test.h"
|
||||||
#include "nghttp2_frame_test.h"
|
#include "nghttp2_frame_test.h"
|
||||||
#include "nghttp2_stream_test.h"
|
#include "nghttp2_stream_test.h"
|
||||||
|
|
@ -73,7 +72,6 @@ int main(int argc, char* argv[])
|
||||||
!CU_add_test(pSuite, "queue", test_nghttp2_queue) ||
|
!CU_add_test(pSuite, "queue", test_nghttp2_queue) ||
|
||||||
!CU_add_test(pSuite, "buffer", test_nghttp2_buffer) ||
|
!CU_add_test(pSuite, "buffer", test_nghttp2_buffer) ||
|
||||||
!CU_add_test(pSuite, "buffer_reader", test_nghttp2_buffer_reader) ||
|
!CU_add_test(pSuite, "buffer_reader", test_nghttp2_buffer_reader) ||
|
||||||
!CU_add_test(pSuite, "zlib", test_nghttp2_zlib) ||
|
|
||||||
!CU_add_test(pSuite, "npn", test_nghttp2_npn) ||
|
!CU_add_test(pSuite, "npn", test_nghttp2_npn) ||
|
||||||
!CU_add_test(pSuite, "session_recv", test_nghttp2_session_recv) ||
|
!CU_add_test(pSuite, "session_recv", test_nghttp2_session_recv) ||
|
||||||
!CU_add_test(pSuite, "session_recv_invalid_stream_id",
|
!CU_add_test(pSuite, "session_recv_invalid_stream_id",
|
||||||
|
|
|
||||||
|
|
@ -1,71 +0,0 @@
|
||||||
/*
|
|
||||||
* nghttp2 - HTTP/2.0 C Library
|
|
||||||
*
|
|
||||||
* Copyright (c) 2012 Tatsuhiro Tsujikawa
|
|
||||||
*
|
|
||||||
* 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 "nghttp2_zlib_test.h"
|
|
||||||
|
|
||||||
#include <CUnit/CUnit.h>
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#include "nghttp2_zlib.h"
|
|
||||||
|
|
||||||
void test_nghttp2_zlib(void)
|
|
||||||
{
|
|
||||||
nghttp2_zlib deflater, inflater;
|
|
||||||
const char msg[] =
|
|
||||||
"GET /chat HTTP/1.1\r\n"
|
|
||||||
"Host: server.example.com\r\n"
|
|
||||||
"Upgrade: websocket\r\n"
|
|
||||||
"Connection: Upgrade\r\n"
|
|
||||||
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
||||||
"Origin: http://example.com\r\n"
|
|
||||||
"Sec-WebSocket-Protocol: chat, superchat\r\n"
|
|
||||||
"Sec-WebSocket-Version: 13\r\n"
|
|
||||||
"\r\n";
|
|
||||||
uint8_t inflatebuf[sizeof(msg)];
|
|
||||||
nghttp2_buffer buf;
|
|
||||||
uint8_t *deflatebuf;
|
|
||||||
size_t deflatebuf_max;
|
|
||||||
ssize_t deflatebuf_len;
|
|
||||||
nghttp2_buffer_init(&buf, 4096);
|
|
||||||
|
|
||||||
CU_ASSERT(0 == nghttp2_zlib_deflate_hd_init(&deflater, 1, 0));
|
|
||||||
CU_ASSERT(0 == nghttp2_zlib_inflate_hd_init(&inflater, 0));
|
|
||||||
|
|
||||||
deflatebuf_max = nghttp2_zlib_deflate_hd_bound(&deflater, sizeof(msg));
|
|
||||||
deflatebuf = malloc(deflatebuf_max);
|
|
||||||
|
|
||||||
CU_ASSERT(0 < (deflatebuf_len = nghttp2_zlib_deflate_hd
|
|
||||||
(&deflater, deflatebuf, deflatebuf_max,
|
|
||||||
(const uint8_t*)msg, sizeof(msg))));
|
|
||||||
CU_ASSERT(sizeof(msg) == nghttp2_zlib_inflate_hd
|
|
||||||
(&inflater, &buf, deflatebuf, deflatebuf_len));
|
|
||||||
free(deflatebuf);
|
|
||||||
nghttp2_buffer_serialize(&buf, inflatebuf);
|
|
||||||
|
|
||||||
nghttp2_zlib_deflate_free(&deflater);
|
|
||||||
nghttp2_zlib_inflate_free(&inflater);
|
|
||||||
|
|
||||||
nghttp2_buffer_free(&buf);
|
|
||||||
}
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
/*
|
|
||||||
* nghttp2 - HTTP/2.0 C Library
|
|
||||||
*
|
|
||||||
* Copyright (c) 2012 Tatsuhiro Tsujikawa
|
|
||||||
*
|
|
||||||
* 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 NGHTTP2_ZLIB_TEST_H
|
|
||||||
#define NGHTTP2_ZLIB_TEST_H
|
|
||||||
|
|
||||||
void test_nghttp2_zlib(void);
|
|
||||||
|
|
||||||
#endif /* NGHTTP2_ZLIB_TEST_H */
|
|
||||||
Loading…
Reference in New Issue