You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2003/01/13 18:35:23 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_io.c
wrowe 2003/01/13 09:35:23
Modified: modules/ssl Tag: APACHE_2_0_BRANCH ssl_engine_io.c
Log:
Backport 1.101, jwoolley's commit...
Fix some possibly-uninitialized variables.
Revision Changes Path
No revision
No revision
1.100.2.1 +14 -10 httpd-2.0/modules/ssl/ssl_engine_io.c
Index: ssl_engine_io.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_io.c,v
retrieving revision 1.100
retrieving revision 1.100.2.1
diff -u -r1.100 -r1.100.2.1
--- ssl_engine_io.c 7 Nov 2002 06:26:48 -0000 1.100
+++ ssl_engine_io.c 13 Jan 2003 17:35:22 -0000 1.100.2.1
@@ -401,7 +401,7 @@
char *c, apr_size_t *len)
{
apr_size_t actual = 0;
- apr_status_t status;
+ apr_status_t status = APR_SUCCESS;
while (!APR_BRIGADE_EMPTY(bb)) {
apr_bucket *b = APR_BRIGADE_FIRST(bb);
@@ -450,9 +450,7 @@
c += consume;
actual += consume;
- }
- if (b->start >= 0) {
if (consume >= b->length) {
/* This physical bucket was consumed */
apr_bucket_delete(b);
@@ -463,6 +461,9 @@
b->length -= consume;
}
}
+ else if (b->length == 0) {
+ apr_bucket_delete(b);
+ }
/* This could probably be actual == *len, but be safe from stray
* photons. */
@@ -955,13 +956,6 @@
type = "abortive";
}
else switch (sslconn->shutdown_type) {
- case SSL_SHUTDOWN_TYPE_UNSET:
- case SSL_SHUTDOWN_TYPE_STANDARD:
- /* send close notify, but don't wait for clients close notify
- (standard compliant and safe, so it's the DEFAULT!) */
- shutdown_type = SSL_RECEIVED_SHUTDOWN;
- type = "standard";
- break;
case SSL_SHUTDOWN_TYPE_UNCLEAN:
/* perform no close notify handshake at all
(violates the SSL/TLS standard!) */
@@ -973,6 +967,16 @@
(standard compliant, but usually causes connection hangs) */
shutdown_type = 0;
type = "accurate";
+ break;
+ default:
+ /*
+ * case SSL_SHUTDOWN_TYPE_UNSET:
+ * case SSL_SHUTDOWN_TYPE_STANDARD:
+ */
+ /* send close notify, but don't wait for clients close notify
+ (standard compliant and safe, so it's the DEFAULT!) */
+ shutdown_type = SSL_RECEIVED_SHUTDOWN;
+ type = "standard";
break;
}