From 4315fbbc25b8ed39d2ed6e03584efcbc9328d5e7 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 7 Dec 2015 12:30:11 +0000 Subject: [PATCH] Merge r1715273 from trunk: Save a few bytes in conf pool. Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1718333 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 5 ----- modules/ssl/ssl_engine_config.c | 6 ++---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/STATUS b/STATUS index 965543d0fa..72097d8ac0 100644 --- a/STATUS +++ b/STATUS @@ -112,11 +112,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_ssl: Save a few bytes in conf pool. - trunk patch: http://svn.apache.org/r1715273 - 2.4.x patch: trunk patches work - +1: jailletc36, ylavic, jim - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c index e5c70f39fc..e68e6d230d 100644 --- a/modules/ssl/ssl_engine_config.c +++ b/modules/ssl/ssl_engine_config.c @@ -832,8 +832,7 @@ const char *ssl_cmd_SSLCertificateFile(cmd_parms *cmd, return err; } - *(const char **)apr_array_push(sc->server->pks->cert_files) = - apr_pstrdup(cmd->pool, arg); + *(const char **)apr_array_push(sc->server->pks->cert_files) = arg; return NULL; } @@ -849,8 +848,7 @@ const char *ssl_cmd_SSLCertificateKeyFile(cmd_parms *cmd, return err; } - *(const char **)apr_array_push(sc->server->pks->key_files) = - apr_pstrdup(cmd->pool, arg); + *(const char **)apr_array_push(sc->server->pks->key_files) = arg; return NULL; } -- 2.40.0