forked from pool/apache2-mod_security2
Petr Gajdos
57568dbaa7
Fix build in TW OBS-URL: https://build.opensuse.org/request/show/505247 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_security2?expand=0&rev=73
74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
Index: modsecurity-2.9.0/apache2/mod_security2.c
|
|
===================================================================
|
|
--- modsecurity-2.9.0.orig/apache2/mod_security2.c
|
|
+++ modsecurity-2.9.0/apache2/mod_security2.c
|
|
@@ -457,17 +457,13 @@ static void store_tx_context(modsec_rec
|
|
* Creates a new transaction context.
|
|
*/
|
|
static modsec_rec *create_tx_context(request_rec *r) {
|
|
- apr_allocator_t *allocator = NULL;
|
|
modsec_rec *msr = NULL;
|
|
|
|
msr = (modsec_rec *)apr_pcalloc(r->pool, sizeof(modsec_rec));
|
|
if (msr == NULL) return NULL;
|
|
|
|
- apr_allocator_create(&allocator);
|
|
- apr_allocator_max_free_set(allocator, 1024);
|
|
- apr_pool_create_ex(&msr->mp, r->pool, NULL, allocator);
|
|
+ apr_pool_create(&msr->mp, r->pool);
|
|
if (msr->mp == NULL) return NULL;
|
|
- apr_allocator_owner_set(allocator, msr->mp);
|
|
|
|
msr->modsecurity = modsecurity;
|
|
msr->r = r;
|
|
Index: modsecurity-2.9.0/apache2/msc_reqbody.c
|
|
===================================================================
|
|
--- modsecurity-2.9.0.orig/apache2/msc_reqbody.c
|
|
+++ modsecurity-2.9.0/apache2/msc_reqbody.c
|
|
@@ -88,7 +88,7 @@ apr_status_t modsecurity_request_body_st
|
|
* to allocate structures from (not data, which is allocated
|
|
* via malloc).
|
|
*/
|
|
- apr_pool_create(&msr->msc_reqbody_mp, NULL);
|
|
+ apr_pool_create(&msr->msc_reqbody_mp, msr->mp);
|
|
|
|
/* Initialise request body processors, if any. */
|
|
|
|
Index: modsecurity-2.9.0/apache2/msc_status_engine.c
|
|
===================================================================
|
|
--- modsecurity-2.9.0.orig/apache2/msc_status_engine.c
|
|
+++ modsecurity-2.9.0/apache2/msc_status_engine.c
|
|
@@ -37,6 +37,8 @@
|
|
#if (defined(__linux__) || defined(__gnu_linux__))
|
|
#include <linux/if.h>
|
|
#include <linux/sockios.h>
|
|
+#include <sys/ioctl.h>
|
|
+#include <netdb.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_UTSNAME_H
|
|
#include <sys/utsname.h>
|
|
Index: modsecurity-2.9.0/apache2/msc_remote_rules.c
|
|
===================================================================
|
|
--- modsecurity-2.9.0.orig/apache2/msc_remote_rules.c
|
|
+++ modsecurity-2.9.0/apache2/msc_remote_rules.c
|
|
@@ -792,6 +792,7 @@ next:
|
|
"compilation.";
|
|
return -1;
|
|
#endif
|
|
+ return -1;
|
|
}
|
|
|
|
|
|
Index: modsecurity-2.9.0/apache2/msc_util.c
|
|
===================================================================
|
|
--- modsecurity-2.9.0.orig/apache2/msc_util.c
|
|
+++ modsecurity-2.9.0/apache2/msc_util.c
|
|
@@ -18,6 +18,7 @@
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
+#include <arpa/inet.h>
|
|
|
|
#include "msc_release.h"
|
|
#include "msc_util.h"
|