Merge r630858 from trunk:

* modules/ssl/ssl_engine_init.c (ssl_init_FindCAList): Cast return
value of sk_X509_NAME_set_cmp_func to void, to avoid warnings with
recent version of OpenSSL.

Submitted by: jorton
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index 17bbf0f699bc4eef30e086103b19d35513fb8f36..eccb122911191284f6c63c74074147938f3e2247 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -87,11 +87,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_ssl: backport of r630858. Mentioned by Peter Sylvester.
-   Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=630858
-   2.2.x Patch: trunk patch applies (with offset -22 lines).
-   +1: fuankg, rpluem, 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_init.c b/modules/ssl/ssl_engine_init.c
index 17a9c86d65874e6dd416cefe6e58b643b17ac3bc..259254a95ca9f3cacc7d637781ad525e494f6d3d 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -1213,7 +1213,7 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s,
     /*
      * Cleanup
      */
-    sk_X509_NAME_set_cmp_func(ca_list, NULL);
+    (void) sk_X509_NAME_set_cmp_func(ca_list, NULL);
 
     return ca_list;
 }