View | Details | Raw Unified | Return to bug 260182 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/ports/current/lighttpd/Makefile (+1 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME?=	lighttpd
3
PORTNAME?=	lighttpd
4
PORTVERSION=	1.4.62
4
PORTVERSION=	1.4.62
5
PORTREVISION=	1
5
CATEGORIES?=	www
6
CATEGORIES?=	www
6
MASTER_SITES?=	https://download.lighttpd.net/lighttpd/releases-1.4.x/
7
MASTER_SITES?=	https://download.lighttpd.net/lighttpd/releases-1.4.x/
7
8
(-)/usr/ports/current/lighttpd/files/lighttpd.in (-1 / +1 lines)
Lines 47-53 Link Here
47
47
48
command=%%PREFIX%%/sbin/lighttpd
48
command=%%PREFIX%%/sbin/lighttpd
49
stop_postcmd=stop_postcmd
49
stop_postcmd=stop_postcmd
50
#restart_precmd="lighttpd_checkconfig"
50
restart_precmd="lighttpd_checkconfig"
51
graceful_precmd="lighttpd_checkconfig"
51
graceful_precmd="lighttpd_checkconfig"
52
graceful_cmd="lighttpd_graceful"
52
graceful_cmd="lighttpd_graceful"
53
gracefulstop_cmd="lighttpd_gracefulstop"
53
gracefulstop_cmd="lighttpd_gracefulstop"
(-)/usr/ports/current/lighttpd/files/patch-h2.c (+11 lines)
Line 0 Link Here
1
--- src/h2.c.orig	2021-12-02 04:53:23 UTC
2
+++ src/h2.c
3
@@ -2573,7 +2573,7 @@ h2_init_stream (request_st * const h2r, connection * c
4
   #ifdef HAVE_PCRE
5
     if (srv->config_captures)
6
         memcpy(r->cond_match, h2r->cond_match,
7
-               srv->config_captures * sizeof(cond_match_t));
8
+               srv->config_captures * sizeof(cond_match_t *));
9
   #endif
10
     /*(see request_config_reset() and request_reset_ex())*/
11
     r->server_name = h2r->server_name;
(-)/usr/ports/current/lighttpd/files/patch-reqpool.c (+19 lines)
Line 0 Link Here
1
--- src/reqpool.c.orig	2021-12-02 04:53:23 UTC
2
+++ src/reqpool.c
3
@@ -67,6 +67,7 @@ request_init_data (request_st * const r, connection * 
4
 
5
   #ifdef HAVE_PCRE
6
     if (srv->config_captures) {/*(save 128b per con if no regex conditions)*/
7
+        r->cond_captures = srv->config_captures;
8
         r->cond_match = calloc(srv->config_captures, sizeof(cond_match_t *));
9
         force_assert(NULL != r->cond_match);
10
         r->cond_match_data = calloc(srv->config_captures, sizeof(cond_match_t));
11
@@ -232,7 +233,7 @@ request_free_data (request_st * const r)
12
     free(r->cond_cache);
13
   #ifdef HAVE_PCRE
14
     if (r->cond_match_data) {
15
-        for (int i = 0, used = r->con->srv->config_captures; i < used; ++i) {
16
+	for (int i = 0, used = r->cond_captures; i < used; ++i) {
17
           #ifdef HAVE_PCRE2_H
18
             if (r->cond_match_data[i].match_data)
19
                 pcre2_match_data_free(r->cond_match_data[i].match_data);
(-)/usr/ports/current/lighttpd/files/patch-request.h (+10 lines)
Line 0 Link Here
1
--- src/request.h.orig	2021-12-02 04:53:23 UTC
2
+++ src/request.h
3
@@ -194,6 +194,7 @@ struct request_st {
4
     struct chunkqueue reqbody_queue; /*(might use tempfiles)*/
5
 
6
     struct stat_cache_entry *tmp_sce; /*(value valid only in sequential code)*/
7
+    int cond_captures;
8
 };
9
 
10
 

Return to bug 260182