Add 2 new options: add_header_date and add_header_server (#46)

Author: remittor

fastwsgi.py

@@ -6,6 +6,8 @@
 import _fastwsgi
 from pkg_resources import get_distribution
 
+__version__ = get_distribution("fastwsgi").version
+
 LL_DISABLED    = 0
 LL_FATAL_ERROR = 1
 LL_CRIT_ERROR  = 2
@@ -21,10 +23,12 @@ def __init__(self):
         self.app = None
         self.host = "0.0.0.0"
         self.port = 5000
-        self.backlog = 1024
+        self.backlog = 2048
         self.loglevel = LL_ERROR
-        self.hook_sigint = 2
-        self.allow_keepalive = 1
+        self.hook_sigint = 2            # 0 = ignore Ctrl-C; 1 = stop server on Ctrl-C; 2 = halt process on Ctrl-C
+        self.allow_keepalive = True
+        self.add_header_date = True
+        self.add_header_server = "FastWSGI/{}".format(__version__)
         self.max_content_length = None  # def value: 999999999
         self.max_chunk_size = None      # def value: 256 KiB
         self.read_buffer_size = None    # def value: 64 KiB

fastwsgi/common.c

@@ -47,12 +47,16 @@ int64_t get_env_int(const char * name)
 
 int64_t get_obj_attr_int(PyObject * obj, const char * name)
 {
+    int64_t hr = 0;
     PyObject * attr = PyObject_GetAttrString(obj, name);
+    FIN_IF(!attr, LLONG_MIN);  // error
+    FIN_IF(attr == Py_True, 1);
+    FIN_IF(attr == Py_False, 0);
+    FIN_IF(!PyLong_CheckExact(attr), LLONG_MIN);
+    hr = PyLong_AsSsize_t(attr);
+fin:
     Py_XDECREF(attr);
-    if (!attr || !PyLong_CheckExact(attr)) {
-        return LLONG_MIN;
-    }    
-    return PyLong_AsSsize_t(attr);
+    return hr;
 }
 
 const char * get_obj_attr_str(PyObject * obj, const char * name)

fastwsgi/request.c

@@ -708,6 +708,7 @@ int build_response(client_t * client, int flags, int status, const void * header
     PyObject * asgi_dict = NULL;
     int64_t body_size = _body_size;
     bool resp_date_present = false;
+    bool resp_server_present = false;
 
     if (flags & RF_HEADERS_WSGI) {
         response = (StartResponse *)headers;
@@ -792,8 +793,19 @@ int build_response(client_t * client, int flags, int status, const void * header
                 if (strcasecmp(key, "Date") == 0)
                     resp_date_present = true;
 
+            bool is_header_server = false;
+            if (key_len == 6)
+                if (strcasecmp(key, "Server") == 0) {
+                    is_header_server = true;
+                    resp_server_present = true;
+                }
+
             xbuf_add(head, key, key_len);
             xbuf_add(head, ": ", 2);
+            if (is_header_server && g_srv.add_header_server > 0) {
+                xbuf_add(head, g_srv.header_server, g_srv.add_header_server);
+                xbuf_add(head, " ", 1);
+            }
             xbuf_add(head, val, val_len);
             xbuf_add(head, "\r\n", 2);
 
@@ -807,13 +819,18 @@ int build_response(client_t * client, int flags, int status, const void * header
         xbuf_add_str(head, (const char *)headers);
     }
 
-    if (!resp_date_present) {
+    if (!resp_date_present && g_srv.add_header_date) {
         char * date_str;
         int date_len = get_asctime(&date_str);
         xbuf_add(head, "Date: ", 6);
         xbuf_add(head, date_str, date_len);
         xbuf_add(head, "\r\n", 2);
     }
+    if (!resp_server_present && g_srv.add_header_server > 0) {
+        xbuf_add(head, "Server: ", 8);
+        xbuf_add(head, g_srv.header_server, g_srv.add_header_server);
+        xbuf_add(head, "\r\n", 2);
+    }
 
     if ((flags & RF_SET_KEEP_ALIVE) != 0 && client->srv->allow_keepalive) {
         xbuf_add_str(head, "Connection: keep-alive\r\n");

fastwsgi/server.c

@@ -815,6 +815,14 @@ PyObject * init_server(PyObject * Py_UNUSED(self), PyObject * server)
     rv = get_obj_attr_int(server, "allow_keepalive");
     g_srv.allow_keepalive = (rv == 0) ? 0 : 1;
 
+    rv = get_obj_attr_int(server, "add_header_date");
+    g_srv.add_header_date = (rv == 0) ? 0 : 1;
+
+    const char * srvname = get_obj_attr_str(server, "add_header_server");
+    if (srvname && srvname[0]) {
+        strncpy(g_srv.header_server, srvname, sizeof(g_srv.header_server) - 1);
+        g_srv.add_header_server = (int)strlen(g_srv.header_server);
+    }
     rv = get_obj_attr_int(server, "max_content_length");
     if (rv == LLONG_MIN) {
         rv = get_env_int("FASTWSGI_MAX_CONTENT_LENGTH");

fastwsgi/server.h

@@ -47,6 +47,9 @@ typedef struct {
     int hook_sigint;   // 0 - ignore SIGINT, 1 - handle SIGINT, 2 - handle SIGINT with halt prog
     uv_signal_t signal;
     int allow_keepalive;
+    int add_header_date;
+    int add_header_server;
+    char header_server[80];
     size_t read_buffer_size;
     uint64_t max_content_length;
     size_t max_chunk_size;