Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix building against PCRE 8.30.

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1243176 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 95f6789147f624c98e35ff4c51edf3af2d7b3f43 1 parent d215d86
Rainer Jung authored
Showing with 5 additions and 3 deletions.
  1. +2 −1  include/ap_mmn.h
  2. +1 −1  include/ap_regex.h
  3. +2 −1  server/util_pcre.c
View
3  include/ap_mmn.h
@@ -392,12 +392,13 @@
* 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();
* 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" */
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20120204
+#define MODULE_MAGIC_NUMBER_MAJOR 20120211
#endif
#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
View
2  include/ap_regex.h
@@ -88,7 +88,7 @@ enum {
/* The structure representing a compiled regular expression. */
typedef struct {
void *re_pcre;
- apr_size_t re_nsub;
+ int re_nsub;
apr_size_t re_erroffset;
} ap_regex_t;
View
3  server/util_pcre.c
@@ -139,7 +139,8 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t * preg, const char *pattern, int cflags)
if (preg->re_pcre == NULL)
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;
}
Please sign in to comment.
Something went wrong with that request. Please try again.