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 jg...@apache.org on 2006/01/10 23:40:11 UTC
svn commit: r367821 - in /httpd/mod_python/trunk/src: include/mpversion.h
mod_python.c
Author: jgallacher
Date: Tue Jan 10 14:40:09 2006
New Revision: 367821
URL: http://svn.apache.org/viewcvs?rev=367821&view=rev
Log:
Fixed PythonAutoReload directive problem.
Ref MODPYTHON-106
Modified:
httpd/mod_python/trunk/src/include/mpversion.h
httpd/mod_python/trunk/src/mod_python.c
Modified: httpd/mod_python/trunk/src/include/mpversion.h
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/include/mpversion.h?rev=367821&r1=367820&r2=367821&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/include/mpversion.h (original)
+++ httpd/mod_python/trunk/src/include/mpversion.h Tue Jan 10 14:40:09 2006
@@ -1,5 +1,5 @@
#define MPV_MAJOR 3
#define MPV_MINOR 2
#define MPV_PATCH 6
-#define MPV_BUILD 20051229
-#define MPV_STRING "3.2.6-dev-20051229"
+#define MPV_BUILD 20060110
+#define MPV_STRING "3.2.6-dev-20060110"
Modified: httpd/mod_python/trunk/src/mod_python.c
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/mod_python.c?rev=367821&r1=367820&r2=367821&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/mod_python.c (original)
+++ httpd/mod_python/trunk/src/mod_python.c Tue Jan 10 14:40:09 2006
@@ -815,7 +815,7 @@
*/
static const char *python_directive_flag(void * mconfig,
- char *key, int val)
+ char *key, int val, int set)
{
py_config *conf;
@@ -825,7 +825,12 @@
apr_table_set(conf->directives, key, "1");
}
else {
- apr_table_unset(conf->directives, key);
+ if (set) {
+ apr_table_set(conf->directives, key, "0");
+ }
+ else {
+ apr_table_unset(conf->directives, key);
+ }
}
return NULL;
@@ -1501,13 +1506,13 @@
*/
static const char *directive_PythonDebug(cmd_parms *cmd, void *mconfig,
int val) {
- const char *rc = python_directive_flag(mconfig, "PythonDebug", val);
+ const char *rc = python_directive_flag(mconfig, "PythonDebug", val, 0);
if (!rc) {
py_config *conf = ap_get_module_config(cmd->server->module_config,
&python_module);
- return python_directive_flag(conf, "PythonDebug", val);
+ return python_directive_flag(conf, "PythonDebug", val, 0);
}
return rc;
}
@@ -1520,12 +1525,12 @@
*/
static const char *directive_PythonEnablePdb(cmd_parms *cmd, void *mconfig,
int val) {
- const char *rc = python_directive_flag(mconfig, "PythonEnablePdb", val);
+ const char *rc = python_directive_flag(mconfig, "PythonEnablePdb", val, 0);
if (!rc) {
py_config *conf = ap_get_module_config(cmd->server->module_config,
&python_module);
- return python_directive_flag(conf, "PythonEnablePdb", val);
+ return python_directive_flag(conf, "PythonEnablePdb", val, 0);
}
return rc;
}
@@ -1539,12 +1544,12 @@
static const char *directive_PythonInterpPerDirective(cmd_parms *cmd,
void *mconfig, int val) {
- const char *rc = python_directive_flag(mconfig, "PythonInterpPerDirective", val);
+ const char *rc = python_directive_flag(mconfig, "PythonInterpPerDirective", val, 0);
if (!rc) {
py_config *conf = ap_get_module_config(cmd->server->module_config,
&python_module);
- return python_directive_flag(conf, "PythonInterpPerDirective", val);
+ return python_directive_flag(conf, "PythonInterpPerDirective", val, 0);
}
return rc;
}
@@ -1558,7 +1563,7 @@
static const char *directive_PythonInterpPerDirectory(cmd_parms *cmd,
void *mconfig, int val) {
- return python_directive_flag(mconfig, "PythonInterpPerDirectory", val);
+ return python_directive_flag(mconfig, "PythonInterpPerDirectory", val, 0);
}
/**
@@ -1570,12 +1575,12 @@
static const char *directive_PythonAutoReload(cmd_parms *cmd,
void *mconfig, int val) {
- const char *rc = python_directive_flag(mconfig, "PythonAutoReload", val);
+ const char *rc = python_directive_flag(mconfig, "PythonAutoReload", val, 1);
if (!rc) {
py_config *conf = ap_get_module_config(cmd->server->module_config,
&python_module);
- return python_directive_flag(conf, "PythonAutoReload", val);
+ return python_directive_flag(conf, "PythonAutoReload", val, 1);
}
return rc;
}