You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2020/02/11 13:16:38 UTC
svn commit: r1873905 - in /httpd/httpd/branches/2.4.x: ./ STATUS
include/ap_mmn.h include/ap_regex.h server/core.c server/util_pcre.c
Author: jim
Date: Tue Feb 11 13:16:38 2020
New Revision: 1873905
URL: http://svn.apache.org/viewvc?rev=1873905&view=rev
Log:
Merge r1873747 from trunk:
factor out default regex flags
Submitted by: covener
Reviewed by: covener, minfrin, jorton
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/include/ap_mmn.h
httpd/httpd/branches/2.4.x/include/ap_regex.h
httpd/httpd/branches/2.4.x/server/core.c
httpd/httpd/branches/2.4.x/server/util_pcre.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1873747
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1873905&r1=1873904&r2=1873905&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Feb 11 13:16:38 2020
@@ -133,12 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- *) factor out default regex flags:
- trunk patch: http://svn.apache.org/r1873747
- 2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-reg_default.diff
- (MMN, ap_regex.h conflicts)
- +1: covener, minfrin, jorton
-
*) factor out chunked TE checks
trunk patch: http://svn.apache.org/r1873748
2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-chunk.diff
Modified: httpd/httpd/branches/2.4.x/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_mmn.h?rev=1873905&r1=1873904&r2=1873905&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_mmn.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_mmn.h Tue Feb 11 13:16:38 2020
@@ -531,6 +531,7 @@
* 20120211.88 (2.4.40-dev) Add ap_dir_nofnmatch() and ap_dir_fnmatch().
* 20120211.89 (2.4.42-dev) Add add dns_pool to proxy_conn_pool and define
* AP_VOLATILIZE_T.
+ * 20120211.90 (2.4.42-dev) AP_REG_DEFAULT macro in ap_regex.h
*/
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -538,7 +539,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20120211
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 89 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 90 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
Modified: httpd/httpd/branches/2.4.x/include/ap_regex.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_regex.h?rev=1873905&r1=1873904&r2=1873905&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_regex.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_regex.h Tue Feb 11 13:16:38 2020
@@ -86,6 +86,8 @@ extern "C" {
#define AP_REG_MATCH "MATCH_" /** suggested prefix for ap_regname */
+#define AP_REG_DEFAULT (AP_REG_DOTALL|AP_REG_DOLLAR_ENDONLY)
+
/* Error values: */
enum {
AP_REG_ASSERT = 1, /** internal error ? */
Modified: httpd/httpd/branches/2.4.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?rev=1873905&r1=1873904&r2=1873905&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core.c (original)
+++ httpd/httpd/branches/2.4.x/server/core.c Tue Feb 11 13:16:38 2020
@@ -4944,7 +4944,7 @@ static int core_pre_config(apr_pool_t *p
apr_pool_cleanup_register(pconf, NULL, reset_config_defines,
apr_pool_cleanup_null);
- ap_regcomp_set_default_cflags(AP_REG_DOLLAR_ENDONLY);
+ ap_regcomp_set_default_cflags(AP_REG_DEFAULT);
mpm_common_pre_config(pconf);
Modified: httpd/httpd/branches/2.4.x/server/util_pcre.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util_pcre.c?rev=1873905&r1=1873904&r2=1873905&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/util_pcre.c (original)
+++ httpd/httpd/branches/2.4.x/server/util_pcre.c Tue Feb 11 13:16:38 2020
@@ -120,8 +120,7 @@ AP_DECLARE(void) ap_regfree(ap_regex_t *
* Compile a regular expression *
*************************************************/
-static int default_cflags = AP_REG_DOTALL |
- AP_REG_DOLLAR_ENDONLY;
+static int default_cflags = AP_REG_DEFAULT;
AP_DECLARE(int) ap_regcomp_get_default_cflags(void)
{