From: Stefan Eissing <icing@apache.org>
Date: Thu, 28 Jan 2016 16:29:47 +0000 (+0000)
Subject: backport of r1718514,1721313
X-Git-Tag: 2.4.19~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbb0b15fcc5f88213a1a963fc381e4f394a1dc04;p=thirdparty%2Fapache%2Fhttpd.git

backport of r1718514,1721313

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1727399 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index eae1d9e9076..a00a76f77ca 100644
--- a/STATUS
+++ b/STATUS
@@ -112,13 +112,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_ssl: Constify + save a few bytes in conf pool when parsing SSLRequire
-     mod_nw_ssl: Save a few bytes in conf pool when processing 'NWSSLTrustedCerts'
-     trunk patch: http://svn.apache.org/r1718514
-                  http://svn.apache.org/r1721313 (untested because I don't have this system)
-     2.4.x patch: trunk works
-     +1: jailletc36, jim, icing
-     
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c
index d34430023e4..8e392a7f01c 100644
--- a/modules/arch/netware/mod_nw_ssl.c
+++ b/modules/arch/netware/mod_nw_ssl.c
@@ -404,7 +404,7 @@ static int SSLize_Socket(SOCKET socketHnd, char *key, request_rec *r)
     ulFlag = SO_TLS_ENABLE;
     rcode = WSAIoctl(socketHnd, SO_TLS_SET_FLAGS, &ulFlag,
                      sizeof(unsigned long), NULL, 0, NULL, NULL, NULL);
-    if(rcode) {
+    if (rcode) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, APLOGNO(02126)
                      "Error: %d with WSAIoctl(SO_TLS_SET_FLAGS, SO_TLS_ENABLE)",
                      WSAGetLastError());
@@ -635,7 +635,7 @@ static const char *set_trusted_certs(cmd_parms *cmd, void *dummy, char *arg)
 {
     char **ptr = (char **)apr_array_push(certlist);
 
-    *ptr = apr_pstrdup(cmd->pool, arg);
+    *ptr = arg;
     return NULL;
 }
 
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index e68e6d230df..746f16698d2 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -1295,7 +1295,7 @@ const char *ssl_cmd_SSLRequire(cmd_parms *cmd,
     }
 
     require = apr_array_push(dc->aRequirement);
-    require->cpExpr = apr_pstrdup(cmd->pool, arg);
+    require->cpExpr = arg;
     require->mpExpr = info;
 
     return NULL;
diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index a70208aa41d..ef12f1aaac9 100644
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -385,7 +385,7 @@ typedef enum {
  * Define the SSL requirement structure
  */
 typedef struct {
-    char           *cpExpr;
+    const char     *cpExpr;
     ap_expr_info_t *mpExpr;
 } ssl_require_t;