From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 18 Mar 2019 09:17:50 +0000 (+0000)
Subject: * Revert r1855741 which committed other stuff as well.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=680bfc6596b9a89bcee60f31c7e9cb6c61bd5c9d;p=apache

* Revert r1855741 which committed other stuff as well.

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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index b08cd96f7e..9a2e746040 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -491,17 +491,6 @@ static SSLConnRec *ssl_init_connection_ctx(conn_rec *c,
 {
     SSLConnRec *sslconn = myConnConfig(c);
 
-    /* Reinit dc in any case because it may be r->per_dir_config scoped
-     * and thus a caller like mod_proxy needs to update it per request.
-     */
-    if (per_dir_config) {
-        sslconn->dc = ap_get_module_config(per_dir_config, &ssl_module);
-    }
-    else {
-        sslconn->dc = ap_get_module_config(c->base_server->lookup_defaults,
-                                           &ssl_module);
-    }
-
     if (!sslconn) {
         sslconn = apr_pcalloc(c->pool, sizeof(*sslconn));
 
@@ -519,6 +508,17 @@ static SSLConnRec *ssl_init_connection_ctx(conn_rec *c,
         myConnConfigSet(c, sslconn);
     }
 
+    /* Reinit dc in any case because it may be r->per_dir_config scoped
+     * and thus a caller like mod_proxy needs to update it per request.
+     */
+    if (per_dir_config) {
+        sslconn->dc = ap_get_module_config(per_dir_config, &ssl_module);
+    }
+    else {
+        sslconn->dc = ap_get_module_config(c->base_server->lookup_defaults,
+                                           &ssl_module);
+    }
+
     return sslconn;
 }
 
diff --git a/server/request.c b/server/request.c
index a448fa7af5..052e20b3dd 100644
--- a/server/request.c
+++ b/server/request.c
@@ -195,9 +195,7 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
     ap_getparents(r->uri);     /* OK --- shrinking transformations... */
     if (sconf->merge_slashes != AP_CORE_CONFIG_OFF) { 
         ap_no2slash(r->uri);
-        if (r->parsed_uri.path) {
-            ap_no2slash(r->parsed_uri.path);
-        }
+        ap_no2slash(r->parsed_uri.path);
      }
 
     /* All file subrequests are a huge pain... they cannot bubble through the
diff --git a/server/util.c b/server/util.c
index 8633c6294a..89c5abef80 100644
--- a/server/util.c
+++ b/server/util.c
@@ -573,10 +573,6 @@ AP_DECLARE(void) ap_no2slash_ex(char *name, int is_fs_path)
 
     char *d, *s;
 
-    if (!name || !*name) {
-        return;
-    }
-
     s = d = name;
 
 #ifdef HAVE_UNC_PATHS