Split ENV: handling between the request_rec section and the

non-request_rec/conn_rec section. This makes the code fit the
comments.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1001795 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index c05ed06403ca3a73679c731ee2f6452aab56e93f..5e14ff5da01ca4e4859c4d0c3692febccf2a4186 100644 (file)
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -183,6 +183,11 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r,
                 result = r->ap_auth_type;
             else if (strcEQ(var, "THE_REQUEST"))
                 result = r->the_request;
+            else if (strlen(var) > 4 && strcEQn(var, "ENV:", 4)) {
+                result = apr_table_get(r->notes, var+4);
+                if (result == NULL)
+                    result = apr_table_get(r->subprocess_env, var+4);
+            }
             break;
         }
     }
@@ -255,13 +260,7 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r,
         }
         /* all other env-variables from the parent Apache process */
         else if (strlen(var) > 4 && strcEQn(var, "ENV:", 4)) {
-            if (r != NULL) {
-                result = apr_table_get(r->notes, var+4);
-                if (result == NULL)
-                    result = apr_table_get(r->subprocess_env, var+4);
-            }
-            if (result == NULL)
-                result = getenv(var+4);
+            result = getenv(var+4);
         }
     }