Added http2 supports.

Author: matyhtf

config.m4

@@ -261,6 +261,7 @@ if test "$PHP_SWOOLE" != "no"; then
         swoole_buffer.c \
         swoole_table.c \
         swoole_http_server.c \
+     	swoole_http_v2_server.c \
         swoole_websocket_server.c \
         swoole_http_client.c \
         swoole_mysql.c \

include/http2.h

@@ -55,6 +55,16 @@ enum swHttp2FrameType
     SW_HTTP2_TYPE_CONTINUATION = 9,
 };
 
+enum swHttp2FrameFlag
+{
+    SW_HTTP2_FLAG_NONE = 0x00,
+    SW_HTTP2_FLAG_ACK_FLAG = 0x01,
+    SW_HTTP2_FLAG_END_STREAM = 0x01,
+    SW_HTTP2_FLAG_END_HEADERS = 0x04,
+    SW_HTTP2_FLAG_PADDED = 0x08,
+    SW_HTTP2_FLAG_PRIORITY = 0x20,
+};
+
 #define SW_HTTP2_FRAME_HEADER_SIZE            9
 #define SW_HTTP2_RST_STREAM_SIZE              4
 #define SW_HTTP2_PRIORITY_SIZE                5
@@ -93,6 +103,28 @@ static sw_inline uint32_t swHttp2_get_length(char *buf)
 int swHttp2_get_frame_length(swProtocol *protocol, swConnection *conn, char *buf, uint32_t length);
 int swHttp2_send_setting_frame(swProtocol *protocol, swConnection *conn);
 
+
+/**
+ +-----------------------------------------------+
+ |                 Length (24)                   |
+ +---------------+---------------+---------------+
+ |   Type (8)    |   Flags (8)   |
+ +-+-------------+---------------+-------------------------------+
+ |R|                 Stream Identifier (31)                      |
+ +=+=============================================================+
+ |                   Frame Payload (0...)                      ...
+ +---------------------------------------------------------------+
+ */
+static void sw_inline swHttp2_set_frame_header(char *buffer, int type, int length, int flags, int stream_id)
+{
+    buffer[0] = length >> 16;
+    buffer[1] = length >> 8;
+    buffer[2] = length;
+    buffer[3] = type;
+    buffer[4] = flags;
+    *(int*) (buffer + 5) = htonl(stream_id);
+}
+
 #ifdef __cplusplus
 }
 #endif

include/swoole.h

@@ -1012,7 +1012,9 @@ static inline int swoole_strrnpos(char *haystack, char *needle, uint32_t length)
     return -1;
 }
 
+int swoole_itoa(char *buf, long value);
 void swoole_dump_bin(char *data, char type, int size);
+void swoole_dump_hex(uchar *data, int outlen);
 int swoole_type_size(char type);
 int swoole_mkdir_recursive(const char *dir);
 char* swoole_dirname(char *file);

package.xml

@@ -101,6 +101,7 @@
 			<file role="src" name="swoole_table.c" />
 			<file role="src" name="swoole_buffer.c" />
 			<file role="src" name="swoole_http_server.c" />
+			<file role="src" name="swoole_http_v2_server.c" />
 			<file role="src" name="swoole_http_client.c" />
 			<file role="src" name="swoole_http.h" />
 			<file role="src" name="swoole_websocket_server.c" />

src/core/base.c

@@ -155,6 +155,25 @@ void swoole_dump_bin(char *data, char type, int size)
     printf("\n");
 }
 
+void swoole_dump_hex(uchar *data, int outlen)
+{
+    int i;
+
+    for (i = 0; i < outlen; ++i)
+    {
+        if ((i & 0x0fu) == 0)
+        {
+            printf("%08zX: ", i);
+        }
+        printf("%02X ", data[i]);
+        if (((i + 1) & 0x0fu) == 0)
+        {
+            printf("\n");
+        }
+    }
+    printf("\n");
+}
+
 /**
  * Recursive directory creation
  */
@@ -736,6 +755,36 @@ static char *swoole_kmp_search(char *haystack, size_t haylen, char *needle, uint
     return NULL;
 }
 
+int swoole_itoa(char *buf, long value)
+{
+    long i = 0, j;
+    long sign_mask;
+    unsigned long nn;
+
+    sign_mask = value >> sizeof(long) * 8 - 1;
+    nn = (value + sign_mask) ^ sign_mask;
+    do
+    {
+        buf[i++] = nn % 10 + '0';
+    } while (nn /= 10);
+
+    buf[i] = '-';
+    i += sign_mask & 1;
+    buf[i] = '\0';
+
+    int s_len = i;
+    char swap;
+
+    for (i = 0, j = s_len - 1; i < j; ++i, --j)
+    {
+        swap = buf[i];
+        buf[i] = buf[j];
+        buf[j] = swap;
+    }
+    buf[s_len] = 0;
+    return s_len;
+}
+
 char *swoole_kmp_strnstr(char *haystack, char *needle, uint32_t length)
 {
     if (!haystack || !needle)

src/core/string.c

@@ -99,6 +99,25 @@ int swString_append(swString *str, swString *append_str)
     return SW_OK;
 }
 
+int swString_append_int(swString *str, int value)
+{
+    char buf[16];
+    int s_len = swoole_itoa(buf, value);
+
+    int new_size = str->length + s_len;
+    if (new_size > str->size)
+    {
+        if (swString_extend(str, swoole_size_align(new_size * 2, sysconf(_SC_PAGESIZE))) < 0)
+        {
+            return SW_ERR;
+        }
+    }
+
+    memcpy(str->str + str->length, buf, s_len);
+    str->length += s_len;
+    return SW_OK;
+}
+
 int swString_append_ptr(swString *str, char *append_str, int length)
 {
     int new_size = str->length + length;

src/protocol/Http2.c

@@ -18,15 +18,6 @@
 #include "Connection.h"
 #include "http2.h"
 
-int swHttp2_get_frame_length(swProtocol *protocol, swConnection *conn, char *buf, uint32_t length)
-{
-    if (length < SW_HTTP2_FRAME_HEADER_SIZE)
-    {
-        return 0;
-    }
-    return swHttp2_get_length(buf) + SW_HTTP2_FRAME_HEADER_SIZE;
-}
-
 int swHttp2_parse_frame(swProtocol *protocol, swConnection *conn, char *data, uint32_t length)
 {
     int wait_body = 0;
@@ -77,3 +68,37 @@ int swHttp2_send_setting_frame(swProtocol *protocol, swConnection *conn)
     return swConnection_send(conn, setting_frame, SW_HTTP2_FRAME_HEADER_SIZE, 0);
 }
 
+/**
+ +-----------------------------------------------+
+ |                 Length (24)                   |
+ +---------------+---------------+---------------+
+ |   Type (8)    |   Flags (8)   |
+ +-+-------------+---------------+-------------------------------+
+ |R|                 Stream Identifier (31)                      |
+ +=+=============================================================+
+ |                   Frame Payload (0...)                      ...
+ +---------------------------------------------------------------+
+ */
+int swHttp2_get_frame_length(swProtocol *protocol, swConnection *conn, char *buf, uint32_t length)
+{
+    if (length < SW_HTTP2_FRAME_HEADER_SIZE)
+    {
+        return 0;
+    }
+    return swHttp2_get_length(buf) + SW_HTTP2_FRAME_HEADER_SIZE;
+}
+
+/**
+ +---------------+
+ |Pad Length? (8)|
+ +-+-------------+-----------------------------------------------+
+ |E|                 Stream Dependency? (31)                     |
+ +-+-------------+-----------------------------------------------+
+ |  Weight? (8)  |
+ +-+-------------+-----------------------------------------------+
+ |                   Header Block Fragment (*)                 ...
+ +---------------------------------------------------------------+
+ |                           Padding (*)                       ...
+ +---------------------------------------------------------------+
+ */
+

swoole_http.h

@@ -22,6 +22,25 @@
 #include "thirdparty/php_http_parser.h"
 #include "thirdparty/multipart_parser.h"
 
+#ifdef SW_USE_HTTP2
+#include <nghttp2/nghttp2.h>
+#endif
+
+enum http_callback_type
+{
+    HTTP_CALLBACK_onRequest = 0,
+    HTTP_CALLBACK_onHandShake = 1,
+};
+
+enum http_response_flag
+{
+    HTTP_RESPONSE_SERVER           = 1u << 1,
+    HTTP_RESPONSE_CONNECTION       = 1u << 2,
+    HTTP_RESPONSE_CONTENT_LENGTH   = 1u << 3,
+    HTTP_RESPONSE_DATE             = 1u << 4,
+    HTTP_RESPONSE_CONTENT_TYPE     = 1u << 5,
+};
+
 typedef struct
 {
     enum php_http_method method;
@@ -65,25 +84,22 @@ typedef struct
 
     uint32_t end :1;
     uint32_t send_header :1;
-    uint32_t chunk :1;
-    uint32_t keepalive :1;
-
     uint32_t gzip_enable :1;
     uint32_t gzip_level :4;
-
-    uint32_t request_read :1;
-    uint32_t current_header_name_allocated :1;
-    uint32_t content_sender_initialized :1;
-
+    uint32_t chunk :1;
+    uint32_t keepalive :1;
     uint32_t http2 :1;
 
+    uint8_t priority;
+    uint32_t stream_id;
+
     http_request request;
     http_response response;
 
 #if PHP_MAJOR_VERSION >= 7
     struct
     {
-        zval zrequest_object;
+        zval zobject;
         zval zrequest;
         zval zserver;
         zval zheader;
@@ -95,12 +111,31 @@ typedef struct
     } request_stack;
     struct
     {
-        zval zresponse_object;
+        zval zobject;
         zval zheader;
         zval zcookie;
     } response_stack;
 #endif
 
+} http_context;
+
+typedef struct _swoole_http_client
+{
+    int fd;
+
+    uint32_t request_read :1;
+    uint32_t current_header_name_allocated :1;
+    uint32_t content_sender_initialized :1;
+    uint32_t http2 :1;
+
+#ifdef SW_USE_HTTP2
+    swHashMap *streams;
+    nghttp2_hd_inflater *deflater;
+    nghttp2_hd_inflater *inflater;
+#endif
+
+    http_context context;
+
     php_http_parser parser;
 	multipart_parser *mt_parser;
 
@@ -114,12 +149,24 @@ typedef struct
 
 } swoole_http_client;
 
+/**
+ * WebSocket
+ */
 int swoole_websocket_onMessage(swEventData *req);
 int swoole_websocket_onHandshake(swoole_http_client *client);
 void swoole_websocket_onOpen(swoole_http_client *client);
 void swoole_websocket_onReuqest(swoole_http_client *client);
 int swoole_websocket_isset_onMessage(void);
-void swoole_http_request_free(swoole_http_client *client TSRMLS_DC);
+/**
+ * Http Context
+ */
+http_context* swoole_http_context_new(swoole_http_client* client TSRMLS_DC);
+void swoole_http_context_free(http_context *ctx TSRMLS_DC);
+/**
+ * Http v2
+ */
+int swoole_http2_onFrame(swoole_http_client *client, swEventData *req);
+int swoole_http2_do_response(http_context *ctx, swString *body);
 
 extern zend_class_entry swoole_http_server_ce;
 extern zend_class_entry *swoole_http_server_class_entry_ptr;
@@ -133,4 +180,6 @@ extern zend_class_entry *swoole_http_request_class_entry_ptr;
 extern swString *swoole_http_buffer;
 extern swString *swoole_zlib_buffer;
 
+extern zval* php_sw_http_server_callbacks[2];
+
 #endif /* SWOOLE_HTTP_H_ */