You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2003/09/16 15:37:33 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_vars.c
trawick 2003/09/16 06:37:33
Modified: . Tag: APACHE_2_0_BRANCH STATUS CHANGES
modules/ssl Tag: APACHE_2_0_BRANCH ssl_engine_vars.c
Log:
merge this fix from 2.1-dev:
*) mod_ssl: Fix a problem setting variables that represent the
client certificate chain. PR 21371
PR: 21371
Reviewed by: nd, jorton
Revision Changes Path
No revision
No revision
1.751.2.471 +1 -6 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.470
retrieving revision 1.751.2.471
diff -u -r1.751.2.470 -r1.751.2.471
--- STATUS 16 Sep 2003 13:01:06 -0000 1.751.2.470
+++ STATUS 16 Sep 2003 13:37:32 -0000 1.751.2.471
@@ -239,11 +239,6 @@
nd replies: Sure. 1.53 fixes that.
+1: fielding, nd, jerenkrantz, erikabele
- * mod_ssl: Fix a problem setting variables that represent the
- client certificate chain. PR 21371
- modules/ssl/ssl_engine_vars.c: r1.24
- +1: trawick, nd, jorton
-
* mod_ssl: Fix segfaults after renegotiation failure. PR 21370
modules/ssl/ssl_engine_io.c: r1.110
modules/ssl/ssl_engine_kernel.c: r1.196
1.988.2.153 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.152
retrieving revision 1.988.2.153
diff -u -r1.988.2.152 -r1.988.2.153
--- CHANGES 16 Sep 2003 01:00:06 -0000 1.988.2.152
+++ CHANGES 16 Sep 2003 13:37:32 -0000 1.988.2.153
@@ -1,5 +1,8 @@
Changes with Apache 2.0.48
+ *) mod_ssl: Fix a problem setting variables that represent the
+ client certificate chain. PR 21371 [Jeff Trawick]
+
*) Unix: Handle permissions settings for flock-based mutexes in
unixd_set_global|proc_mutex_perms(). Allow the functions to be
called for any type of mutex. PR 20312 [Jeff Trawick]
No revision
No revision
1.22.2.2 +1 -1 httpd-2.0/modules/ssl/ssl_engine_vars.c
Index: ssl_engine_vars.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_vars.c,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- ssl_engine_vars.c 3 Feb 2003 17:31:53 -0000 1.22.2.1
+++ ssl_engine_vars.c 16 Sep 2003 13:37:33 -0000 1.22.2.2
@@ -290,7 +290,7 @@
}
else if (ssl != NULL && strlen(var) > 18 && strcEQn(var, "CLIENT_CERT_CHAIN_", 18)) {
sk = SSL_get_peer_cert_chain(ssl);
- result = ssl_var_lookup_ssl_cert_chain(p, sk, var+17);
+ result = ssl_var_lookup_ssl_cert_chain(p, sk, var+18);
}
else if (ssl != NULL && strcEQ(var, "CLIENT_VERIFY")) {
result = ssl_var_lookup_ssl_cert_verify(p, c);