diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2010-02-12 13:39:26 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2010-02-12 13:39:26 +0000 |
| commit | f61b1800d56835416a6021b8e4ae7f1d594a6cf9 (patch) | |
| tree | 5e6d90659c2ae04bdd26d33be79d1a7fae85e173 /www/mod_encoding | |
| parent | da194ca15edb5d507814816f3c459396a01e0441 (diff) | |
| download | ports-f61b1800d56835416a6021b8e4ae7f1d594a6cf9.tar.gz ports-f61b1800d56835416a6021b8e4ae7f1d594a6cf9.zip | |
- Fix segfault on amd64
PR: ports/133411
Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
Approved by: maintainer timeout (edwin; 11 months)
Notes
Notes:
svn path=/head/; revision=249664
Diffstat (limited to 'www/mod_encoding')
| -rw-r--r-- | www/mod_encoding/files/apache22_patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/www/mod_encoding/files/apache22_patch b/www/mod_encoding/files/apache22_patch index f268ca19f0f6..73e3a696de11 100644 --- a/www/mod_encoding/files/apache22_patch +++ b/www/mod_encoding/files/apache22_patch @@ -78,7 +78,7 @@ #include <http_log.h> #include <http_protocol.h> #include <http_request.h> -+/* #include <ap_compat.h> */ ++#include <apr_strings.h> +/* #include <iconv_hook/iconv.h> */ +#include <regex.h> @@ -241,8 +241,9 @@ if (*args && (arg = ap_getword_conf_nc(cmd->pool, &args))) { - LOG(APLOG_DEBUG, cmd->server, "add_client_encoding: agent: %s", arg); - *(void **)ap_push_array(conf->client_encoding) = +- ap_pregcomp(cmd->pool, arg, REG_EXTENDED|REG_ICASE|REG_NOSUB); + *(void **)apr_array_push(conf->client_encoding) = - ap_pregcomp(cmd->pool, arg, REG_EXTENDED|REG_ICASE|REG_NOSUB); ++ ap_pregcomp(cmd->pool, arg, AP_REG_EXTENDED|AP_REG_ICASE|AP_REG_NOSUB); } /* register list of possible encodings from above useragent */ |