You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by gr...@apache.org on 2006/08/05 09:38:18 UTC
svn commit: r428972 - in /httpd/mod_python/trunk:
lib/python/mod_python/__init__.py src/include/mpversion.h src/mod_python.c
Author: grahamd
Date: Sat Aug 5 00:38:17 2006
New Revision: 428972
URL: http://svn.apache.org/viewvc?rev=428972&view=rev
Log:
(MODPYTHON-63) Fixes to code previously set down for handling <Directory ~>
and <DirectoryMatch> as it wasn't decoding configuration correctly and in
case of <DirectoryMatch> could cause Apache to crash.
Modified:
httpd/mod_python/trunk/lib/python/mod_python/__init__.py
httpd/mod_python/trunk/src/include/mpversion.h
httpd/mod_python/trunk/src/mod_python.c
Modified: httpd/mod_python/trunk/lib/python/mod_python/__init__.py
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/lib/python/mod_python/__init__.py?rev=428972&r1=428971&r2=428972&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/__init__.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/__init__.py Sat Aug 5 00:38:17 2006
@@ -20,5 +20,5 @@
__all__ = ["apache", "cgihandler", "psp",
"publisher", "util", "python22"]
-version = "3.3.0-dev-20060803"
+version = "3.3.0-dev-20060805"
Modified: httpd/mod_python/trunk/src/include/mpversion.h
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/src/include/mpversion.h?rev=428972&r1=428971&r2=428972&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/include/mpversion.h (original)
+++ httpd/mod_python/trunk/src/include/mpversion.h Sat Aug 5 00:38:17 2006
@@ -1,5 +1,5 @@
#define MPV_MAJOR 3
#define MPV_MINOR 3
#define MPV_PATCH 0
-#define MPV_BUILD 20060803
-#define MPV_STRING "3.3.0-dev-20060803"
+#define MPV_BUILD 20060805
+#define MPV_STRING "3.3.0-dev-20060805"
Modified: httpd/mod_python/trunk/src/mod_python.c
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/src/mod_python.c?rev=428972&r1=428971&r2=428972&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/mod_python.c (original)
+++ httpd/mod_python/trunk/src/mod_python.c Sat Aug 5 00:38:17 2006
@@ -963,27 +963,26 @@
directory = ap_getword_conf(p, &arg);
- if (!strcmp(cmd->path, "~")) {
- regex = ap_pregcomp(p, directory, AP_REG_EXTENDED|USE_ICASE);
+ if (!strcmp(directory, "~")) {
directory = ap_getword_conf(p, &arg);
+ regex = ap_pregcomp(p, cmd->path, AP_REG_EXTENDED|USE_ICASE);
} else if (ap_is_matchexp(directory)) {
d_is_fnmatch = 1;
}
} else if ((context = find_parent(directive, "<DirectoryMatch"))) {
- regex = ap_pregcomp(p, directory, AP_REG_EXTENDED|USE_ICASE);
-
arg = context->args;
endp = ap_strrchr_c(arg, '>');
arg = apr_pstrndup(p, arg, endp - arg);
directory = ap_getword_conf(p, &arg);
+ regex = ap_pregcomp(p, directory, AP_REG_EXTENDED|USE_ICASE);
}
else if (cmd->config_file != NULL) {
/* cmd->config_file is NULL when in main Apache
* configuration file as the file is completely
* read in before the directive is processed as
* EXEC_ON_READ is not set in req_override field
- * of command_struct table entry. Thus now then
+ * of command_struct table entry. Thus know then
* we are being used in a .htaccess file. */
directory = ap_make_dirstr_parent(p, directive->filename);