Author: rjung
Date: Fri Jun 22 08:52:47 2007
New Revision: 549854
URL: http://svn.apache.org/viewvc?view=rev&rev=549854
Log:
Make order of option processing a little more logic.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=549854&r1=549853&r2=549854
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Fri Jun 22 08:52:47
2007
@@ -1723,10 +1723,7 @@
return ap_pstrcat(cmd->pool, "JkOptions: Illegal option '-", w,
"': ForwardURI* options can not be disabled",
NULL);
- if (!strcasecmp(w, "ForwardKeySize")) {
- opt = JK_OPT_FWDKEYSIZE;
- }
- else if (!strcasecmp(w, "ForwardURICompat")) {
+ if (!strcasecmp(w, "ForwardURICompat")) {
opt = JK_OPT_FWDURICOMPAT;
mask = JK_OPT_FWDURIMASK;
}
@@ -1759,6 +1756,9 @@
}
else if (!strcasecmp(w, "ForwardSSLCertChain")) {
opt = JK_OPT_FWDCERTCHAIN;
+ }
+ else if (!strcasecmp(w, "ForwardKeySize")) {
+ opt = JK_OPT_FWDKEYSIZE;
}
else
return ap_pstrcat(cmd->pool, "JkOptions: Illegal option '", w,
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=549854&r1=549853&r2=549854
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Fri Jun 22 08:52:47
2007
@@ -1754,10 +1754,7 @@
return apr_pstrcat(cmd->pool, "JkOptions: Illegal option '-", w,
"': ForwardURI* options can not be disabled",
NULL);
- if (!strcasecmp(w, "ForwardKeySize")) {
- opt = JK_OPT_FWDKEYSIZE;
- }
- else if (!strcasecmp(w, "ForwardURICompat")) {
+ if (!strcasecmp(w, "ForwardURICompat")) {
opt = JK_OPT_FWDURICOMPAT;
mask = JK_OPT_FWDURIMASK;
}
@@ -1790,6 +1787,9 @@
}
else if (!strcasecmp(w, "ForwardSSLCertChain")) {
opt = JK_OPT_FWDCERTCHAIN;
+ }
+ else if (!strcasecmp(w, "ForwardKeySize")) {
+ opt = JK_OPT_FWDKEYSIZE;
}
else
return apr_pstrcat(cmd->pool, "JkOptions: Illegal option '", w,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
