httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_config.c ssl_private.h
Date Thu, 03 Jun 2004 09:28:12 GMT
jorton      2004/06/03 02:28:12

  Modified:    .        CHANGES
               docs/conf ssl-std.conf.in
               modules/ssl ssl_engine_config.c ssl_private.h
  Log:
  Drop support for the "CompatEnvVars" argument to SSLOptions, which was
  never implemented in 2.0 and never needed to be.
  
  * docs/ssl/ssl-std.conf.in: Remove CompatEnvVars examples.
  
  * modules/ssl/ssl_engine_config.c (ssl_cmd_SSLOptions): Don't allow
  the CompatEnvVars argument.
  
  * modules/ssl/ssl_private.h: Remove SSL_OPT_COMPATENVVARS macro.
  
  Revision  Changes    Path
  1.1502    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1501
  retrieving revision 1.1502
  diff -d -w -u -r1.1501 -r1.1502
  --- CHANGES	2 Jun 2004 23:12:31 -0000	1.1501
  +++ CHANGES	3 Jun 2004 09:28:11 -0000	1.1502
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_ssl: Drop support for the CompatEnvVars argument to
  +     SSLOptions, which was never actually implemented in 2.0.
  +     [Joe Orton]
  +
     *) Fix bug in mod_deflate that unconditionally sent deflate'd output
        even when Accept-Encoding is not present.  [Justin Erenkrantz]
   
  
  
  
  1.6       +1 -5      httpd-2.0/docs/conf/ssl-std.conf.in
  
  Index: ssl-std.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/ssl-std.conf.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -d -w -u -r1.5 -r1.6
  --- ssl-std.conf.in	4 Jan 2004 15:04:54 -0000	1.5
  +++ ssl-std.conf.in	3 Jun 2004 09:28:12 -0000	1.6
  @@ -188,10 +188,6 @@
   #     because the extraction step is an expensive operation and is usually
   #     useless for serving static content. So one usually enables the
   #     exportation for CGI and SSI requests only.
  -#   o CompatEnvVars:
  -#     This exports obsolete environment variables for backward compatibility
  -#     to Apache-SSL 1.x, mod_ssl 2.0.x, Sioux 1.0 and Stronghold 2.x. Use this
  -#     to provide compatibility to existing CGI scripts.
   #   o StrictRequire:
   #     This denies access when "SSLRequireSSL" or "SSLRequire" applied even
   #     under a "Satisfy any" situation, i.e. when it applies access is denied
  @@ -199,7 +195,7 @@
   #   o OptRenegotiate:
   #     This enables optimized SSL connection renegotiation handling when SSL
   #     directives are used in per-directory context. 
  -#SSLOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
  +#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
   <Files ~ "\.(cgi|shtml|phtml|php3?)$">
       SSLOptions +StdEnvVars
   </Files>
  
  
  
  1.92      +0 -3      httpd-2.0/modules/ssl/ssl_engine_config.c
  
  Index: ssl_engine_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_config.c,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -d -w -u -r1.91 -r1.92
  --- ssl_engine_config.c	17 May 2004 18:57:39 -0000	1.91
  +++ ssl_engine_config.c	3 Jun 2004 09:28:12 -0000	1.92
  @@ -1074,9 +1074,6 @@
           if (strcEQ(w, "StdEnvVars")) {
               opt = SSL_OPT_STDENVVARS;
           }
  -        else if (strcEQ(w, "CompatEnvVars")) {
  -            opt = SSL_OPT_COMPATENVVARS;
  -        }
           else if (strcEQ(w, "ExportCertData")) {
               opt = SSL_OPT_EXPORTCERTDATA;
           }
  
  
  
  1.5       +1 -2      httpd-2.0/modules/ssl/ssl_private.h
  
  Index: ssl_private.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_private.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -d -w -u -r1.4 -r1.5
  --- ssl_private.h	27 May 2004 09:20:00 -0000	1.4
  +++ ssl_private.h	3 Jun 2004 09:28:12 -0000	1.5
  @@ -189,12 +189,11 @@
   #define SSL_OPT_NONE           (0)
   #define SSL_OPT_RELSET         (1<<0)
   #define SSL_OPT_STDENVVARS     (1<<1)
  -#define SSL_OPT_COMPATENVVARS  (1<<2)
   #define SSL_OPT_EXPORTCERTDATA (1<<3)
   #define SSL_OPT_FAKEBASICAUTH  (1<<4)
   #define SSL_OPT_STRICTREQUIRE  (1<<5)
   #define SSL_OPT_OPTRENEGOTIATE (1<<6)
  -#define SSL_OPT_ALL            (SSL_OPT_STDENVVARS|SSL_OPT_COMPATENVVAR|SSL_OPT_EXPORTCERTDATA|SSL_OPT_FAKEBASICAUTH|SSL_OPT_STRICTREQUIRE|SSL_OPT_OPTRENEGOTIATE)
  +#define SSL_OPT_ALL            (SSL_OPT_STDENVVARS|SSL_OPT_EXPORTCERTDATA|SSL_OPT_FAKEBASICAUTH|SSL_OPT_STRICTREQUIRE|SSL_OPT_OPTRENEGOTIATE)
   typedef int ssl_opt_t;
   
   /*
  
  
  

Mime
View raw message