Fix segfault on connection error

Author: joelwurtz

src/ngx_http_redirectionio_module.c

@@ -431,7 +431,7 @@ static char *ngx_http_redirectionio_merge_conf(ngx_conf_t *cf, void *parent, voi
                 RIO_MIN_CONNECTIONS,
                 RIO_KEEP_CONNECTIONS,
                 RIO_MAX_CONNECTIONS,
-                RIO_TIMEOUT,
+                RIO_DEFAULT_TIMEOUT,
                 conf,
                 ngx_http_redirectionio_pool_construct,
                 ngx_http_redirectionio_pool_destruct
@@ -448,7 +448,7 @@ static char *ngx_http_redirectionio_merge_conf(ngx_conf_t *cf, void *parent, voi
             RIO_MIN_CONNECTIONS,
             RIO_KEEP_CONNECTIONS,
             RIO_MAX_CONNECTIONS,
-            RIO_TIMEOUT,
+            RIO_DEFAULT_TIMEOUT,
             conf,
             ngx_http_redirectionio_pool_construct,
             ngx_http_redirectionio_pool_destruct
@@ -507,7 +507,7 @@ static void ngx_http_redirectionio_write_match_action_handler(ngx_event_t *wev)
     r = c->data;
     ctx = ngx_http_get_module_ctx(r, ngx_http_redirectionio_module);
 
-    ngx_add_timer(c->read, RIO_TIMEOUT);
+    ngx_add_timer(c->read, RIO_DEFAULT_TIMEOUT);
     ctx->read_handler = ngx_http_redirectionio_read_match_action_handler;
 
     ngx_http_redirectionio_protocol_send_match(c, r, ctx, &ctx->project_key);

src/ngx_http_redirectionio_module.h

@@ -15,7 +15,7 @@
 #define RIO_MIN_CONNECTIONS 0
 #define RIO_KEEP_CONNECTIONS 10
 #define RIO_MAX_CONNECTIONS 10
-#define RIO_TIMEOUT 100
+#define RIO_DEFAULT_TIMEOUT 100
 
 #define API_NOT_CALLED  0
 #define API_WAITING     1

src/ngx_http_redirectionio_module_pool.c

@@ -165,11 +165,12 @@ void ngx_http_redirectionio_read_handler(ngx_event_t *rev) {
 
     if (rev->timedout) {
         ctx->connection_error = 1;
-        ctx->read_handler(rev, NULL);
         ctx->resource->peer.connection->read->handler = ngx_http_redirectionio_dummy_handler;
 
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "[redirectionio] connection timeout while reading, skipping module for this request");
 
+        ctx->read_handler(rev, NULL);
+
         return;
     }
 
@@ -179,7 +180,6 @@ void ngx_http_redirectionio_read_handler(ngx_event_t *rev) {
 
         if (rv != NGX_OK) {
             ctx->connection_error = 1;
-            ctx->read_handler(rev, NULL);
             ctx->resource->peer.connection->read->handler = ngx_http_redirectionio_dummy_handler;
 
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "[redirectionio] connection error while reading length, skipping module for this request");
@@ -188,6 +188,8 @@ void ngx_http_redirectionio_read_handler(ngx_event_t *rev) {
                 ngx_del_timer(rev);
             }
 
+            ctx->read_handler(rev, NULL);
+
             return;
         }
 
@@ -202,13 +204,14 @@ void ngx_http_redirectionio_read_handler(ngx_event_t *rev) {
 
     if (rv != NGX_OK) {
         ctx->connection_error = 1;
-        ctx->read_handler(rev, NULL);
         ctx->resource->peer.connection->read->handler = ngx_http_redirectionio_dummy_handler;
 
         if (rev->timer_set) {
             ngx_del_timer(rev);
         }
 
+        ctx->read_handler(rev, NULL);
+
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "[redirectionio] connection error while reading string: %d, skipping module for this request", rv);
 
         return;