You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2003/12/02 15:11:20 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_init.c ssl_engine_log.c
jorton 2003/12/02 06:11:20
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
modules/ssl Tag: APACHE_2_0_BRANCH ssl_engine_init.c
ssl_engine_log.c
Log:
Backport from HEAD:
* ssl_engine_log.c (ssl_log_ssl_error): Use the thread-safe
interface for retrieving error strings.
* mod_ssl.c (ssl_cleanup_pre_config): Don't free the error strings,
since they can't be loaded again once.
Revision Changes Path
No revision
No revision
1.988.2.185 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.184
retrieving revision 1.988.2.185
diff -u -u -r1.988.2.184 -r1.988.2.185
--- CHANGES 25 Nov 2003 17:23:30 -0000 1.988.2.184
+++ CHANGES 2 Dec 2003 14:11:19 -0000 1.988.2.185
@@ -1,5 +1,8 @@
Changes with Apache 2.0.49
+ *) mod_ssl: Use human-readable OpenSSL error strings in logs; use
+ thread-safe interface for retrieving error strings. [Joe Orton]
+
*) mod_expires: Initialize ExpiresDefault to NULL instead of "" to
avoid reporting an Internal Server error if it is used without
having been set in the httpd.conf file. PR: 23748, 24459
1.751.2.567 +1 -7 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.566
retrieving revision 1.751.2.567
diff -u -u -r1.751.2.566 -r1.751.2.567
--- STATUS 2 Dec 2003 13:15:01 -0000 1.751.2.566
+++ STATUS 2 Dec 2003 14:11:19 -0000 1.751.2.567
@@ -87,12 +87,6 @@
modules/ssl/ssl_util.c: r1.40
+1: jorton, trawick, stoddard
- * Fix logging of human-readable error strings in mod_ssl, and use the
- thread-safe interface for retrieving them.
- modules/ssl/ssl_engine_log.c: r1.23
- modules/ssl/mod_ssl.c: r1.88
- +1: jorton, trawick, stoddard
-
* Prevent mod_proxy from sending an invalid status-line to clients
in some cases.
modules/proxy/proxy_http.c: r1.172
No revision
No revision
1.106.2.6 +0 -1 httpd-2.0/modules/ssl/ssl_engine_init.c
Index: ssl_engine_init.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
retrieving revision 1.106.2.5
retrieving revision 1.106.2.6
diff -u -u -r1.106.2.5 -r1.106.2.6
--- ssl_engine_init.c 16 May 2003 18:12:18 -0000 1.106.2.5
+++ ssl_engine_init.c 2 Dec 2003 14:11:20 -0000 1.106.2.6
@@ -1260,7 +1260,6 @@
/*
* Try to kill the internals of the SSL library.
*/
- ERR_free_strings();
ERR_remove_state(0);
EVP_cleanup();
1.21.2.2 +3 -2 httpd-2.0/modules/ssl/ssl_engine_log.c
Index: ssl_engine_log.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_log.c,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -u -r1.21.2.1 -r1.21.2.2
--- ssl_engine_log.c 3 Feb 2003 17:31:53 -0000 1.21.2.1
+++ ssl_engine_log.c 2 Dec 2003 14:11:20 -0000 1.21.2.2
@@ -118,8 +118,9 @@
unsigned long e;
while ((e = ERR_get_error())) {
- char *err, *annotation;
- err = ERR_error_string(e, NULL);
+ char err[256], *annotation;
+
+ ERR_error_string_n(e, err, sizeof err);
annotation = ssl_log_annotation(err);
if (annotation) {
Re: cvs commit: httpd-2.0/modules/ssl ssl_engine_init.c
ssl_engine_log.c
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Tuesday, December 02, 2003 14:11:20 +0000 jorton@apache.org wrote:
> jorton 2003/12/02 06:11:20
>
> Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
> modules/ssl Tag: APACHE_2_0_BRANCH ssl_engine_init.c
> ssl_engine_log.c
> Log:
> Backport from HEAD:
>
> * ssl_engine_log.c (ssl_log_ssl_error): Use the thread-safe
> interface for retrieving error strings.
>
> * mod_ssl.c (ssl_cleanup_pre_config): Don't free the error strings,
> since they can't be loaded again once.
Please use the reviewed by lines for backported commits. Thanks! -- justin