svn commit: r1001795 - /httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c

[sf...@apache.org]

Author: sf
Date: Mon Sep 27 16:07:55 2010
New Revision: 1001795

URL: http://svn.apache.org/viewvc?rev=1001795&view=rev
Log:
Split ENV: handling between the request_rec section and the
non-request_rec/conn_rec section. This makes the code fit the
comments.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c?rev=1001795&r1=1001794&r2=1001795&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c Mon Sep 27 16:07:55 2010
@@ -183,6 +183,11 @@ char *ssl_var_lookup(apr_pool_t *p, serv
                 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, serv
         }
         /* 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);
         }
     }