View | Details | Raw Unified | Return to bug 43755
Collapse All | Expand All

(-)httpd-2.2.6/modules/ssl/ssl_engine_config.c (+3 lines)
Lines 1130-1135 const char *ssl_cmd_SSLOptions(cmd_parms Link Here
1130 
        else if (strcEQ(w, "OptRenegotiate")) {
 1130 
        else if (strcEQ(w, "OptRenegotiate")) {
1131 
            opt = SSL_OPT_OPTRENEGOTIATE;
 1131 
            opt = SSL_OPT_OPTRENEGOTIATE;
1132 
        }
 1132 
        }
1133 
        else if (strcEQ(w, "NoClientVerifyEnvVars")) {
1134 
            opt = SSL_OPT_NOCLIENTVERIFYENVVAR;
1135 
        }
1133 
        else {
 1136 
        else {
1134 
            return apr_pstrcat(cmd->pool,
 1137 
            return apr_pstrcat(cmd->pool,
1135 
                               "SSLOptions: Illegal option '", w, "'",
 1138 
                               "SSLOptions: Illegal option '", w, "'",
(-)httpd-2.2.6/modules/ssl/ssl_engine_kernel.c (-1 / +7 lines)
Lines 1022-1028 int ssl_hook_Fixup(request_rec *r) Link Here
1022 
    if (dc->nOptions & SSL_OPT_STDENVVARS) {
 1022 
    if (dc->nOptions & SSL_OPT_STDENVVARS) {
1023 
        for (i = 0; ssl_hook_Fixup_vars[i]; i++) {
 1023 
        for (i = 0; ssl_hook_Fixup_vars[i]; i++) {
1024 
            var = (char *)ssl_hook_Fixup_vars[i];
 1024 
            var = (char *)ssl_hook_Fixup_vars[i];
1025 
            val = ssl_var_lookup(r->pool, r->server, r->connection, r, var);
 1025 

            

            

              
              

              1026
              
				/* If option NoVerifyClientEnvVars defined, skip the SSL_CLIENT_VERIFY environment variable */

            

            


              1027
              
				if (!(strEQ(var, "SSL_CLIENT_VERIFY") && (dc->nOptions & SSL_OPT_NOCLIENTVERIFYENVVAR))) {

            

            


              1028
              
	            val = ssl_var_lookup(r->pool, r->server, r->connection, r, var);

            

            


              1029
              
				} else {

            

            


              1030
              
					val = NULL;

            

            


              1031
              
				}

            

        

          1026
          
            if (!strIsEmpty(val)) {

          1032
          
            if (!strIsEmpty(val)) {

        

        

          1027
          
                apr_table_setn(env, var, val);

          1033
          
                apr_table_setn(env, var, val);

        

        

          1028
          
            }

          1034
          
            }

        



(-)httpd-2.2.6/modules/ssl/ssl_private.h
      (+1 lines)




  

    
      
            Lines 199-204
          typedef int ssl_algo_t;
      
      
        Link Here
      
    
  

        

          199
          
#define SSL_OPT_FAKEBASICAUTH  (1<<4)

          199
          
#define SSL_OPT_FAKEBASICAUTH  (1<<4)

        

        

          200
          
#define SSL_OPT_STRICTREQUIRE  (1<<5)

          200
          
#define SSL_OPT_STRICTREQUIRE  (1<<5)

        

        

          201
          
#define SSL_OPT_OPTRENEGOTIATE (1<<6)

          201
          
#define SSL_OPT_OPTRENEGOTIATE (1<<6)

        

            

              
              
              202
              
#define SSL_OPT_NOCLIENTVERIFYENVVAR (1<<7)

            

        

          202
          
#define SSL_OPT_ALL            (SSL_OPT_STDENVVARS|SSL_OPT_EXPORTCERTDATA|SSL_OPT_FAKEBASICAUTH|SSL_OPT_STRICTREQUIRE|SSL_OPT_OPTRENEGOTIATE)

          203
          
#define SSL_OPT_ALL            (SSL_OPT_STDENVVARS|SSL_OPT_EXPORTCERTDATA|SSL_OPT_FAKEBASICAUTH|SSL_OPT_STRICTREQUIRE|SSL_OPT_OPTRENEGOTIATE)

        

        

          203
          
typedef int ssl_opt_t;

          204
          
typedef int ssl_opt_t;

        

        

          204
          

          205
          

        






  

  Return to bug 43755