www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-01 07:26:57 +03:00
Code Activity

BZ 52623: Fix building against PCRE 8.30.

Browse Source 
PCRE dropped support for pcre_info() which is
deprecated since a long time. Use pcre_fullinfo()
instead, which exists since version 3.0 of PCRE.

Patch provided by Ruediger Pluem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1243176 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Jung
2012-02-11 22:45:37 +00:00
parent 9a0981b88d
commit 0415804814
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/ap_mmn.h
View File

@ -392,12 +392,13 @@
* 20120201.0 (2.5.0-dev) Bump MODULE_MAGIC_COOKIE to "AP25"! * 20120201.0 (2.5.0-dev) Bump MODULE_MAGIC_COOKIE to "AP25"!
* 20120204.0 (2.5.0-dev) Remove ap_create_core_ctx(), ap_core_ctx_get_bb(); * 20120204.0 (2.5.0-dev) Remove ap_create_core_ctx(), ap_core_ctx_get_bb();
* add insert_network_bucket hook, AP_DECLINED * add insert_network_bucket hook, AP_DECLINED
* 20120211.0 (2.5.0-dev) Change re_nsub in ap_regex_t from apr_size_t to int.
*/ */
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
#ifndef MODULE_MAGIC_NUMBER_MAJOR #ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20120204 #define MODULE_MAGIC_NUMBER_MAJOR 20120211
#endif #endif
#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ #define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */

2
include/ap_regex.h
View File

@ -88,7 +88,7 @@ enum {
/* The structure representing a compiled regular expression. */ /* The structure representing a compiled regular expression. */
typedef struct { typedef struct {
void *re_pcre; void *re_pcre;
apr_size_t re_nsub; int re_nsub;
apr_size_t re_erroffset; apr_size_t re_erroffset;
} ap_regex_t; } ap_regex_t;

3
server/util_pcre.c
View File

@ -139,7 +139,8 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t * preg, const char *pattern, int cflags)
if (preg->re_pcre == NULL) if (preg->re_pcre == NULL)
return AP_REG_INVARG; return AP_REG_INVARG;
preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub));
return 0; return 0;
} }