Attachment 575064 Details for Bug 809730 – proposed patch

[patch] proposed patch

mod_limitipconn-httpd24.patch (text/plain), 1.44 KB, created by Jan Kaluža on 2012-04-04 08:38:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kaluža

Created: 2012-04-04 08:38:49 UTC

Size: 1.44 KB

patch

obsolete

>diff --git a/mod_limitipconn.c b/mod_limitipconn.c
>index d8d2f9a..6262797 100644
>--- a/mod_limitipconn.c
>+++ b/mod_limitipconn.c
>@@ -33,6 +33,8 @@ module AP_MODULE_DECLARE_DATA limitipconn_module;
> 
> static int server_limit, thread_limit;
> 
>+static const char *default_content_type = "text/plain";
>+
> typedef struct {
>     signed int limit;       /* max number of connections per IP */
> 
>@@ -104,7 +106,7 @@ static int check_limit(request_rec *r, limitipconn_config *cfg)
>         return DECLINED;
>     }
> 
>-    address = r->connection->remote_ip;
>+    address = r->useragent_ip;
> 
>     /* Only check the MIME-type if we have MIME-type stuff in our config.
>        The extra subreq can be quite expensive. */
>@@ -116,7 +118,7 @@ static int check_limit(request_rec *r, limitipconn_config *cfg)
> 
>         /* If there's no Content-type, use the default. */
>         if (!content_type) {
>-            content_type = ap_default_type(r);
>+            content_type = default_content_type;
>         }
> 
>         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
>@@ -160,7 +162,7 @@ static int check_limit(request_rec *r, limitipconn_config *cfg)
>      * this IP address */
>     for (i = 0; i < server_limit; ++i) {
>       for (j = 0; j < thread_limit; ++j) {
>-        ws_record = ap_get_scoreboard_worker(i, j);
>+        ws_record = ap_get_scoreboard_worker_from_indexes(i, j);
>         switch (ws_record->status) {
>             case SERVER_BUSY_READ:
>             case SERVER_BUSY_WRITE:

Actions: View | Diff

Attachments on bug 809730: 575064