You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@apache.org on 2003/02/21 21:12:25 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_io.c
madhum 2003/02/21 12:12:25
Modified: modules/ssl ssl_engine_io.c
Log:
Fix a 64-bit porting issue.
Revision Changes Path
1.104 +5 -4 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.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- ssl_engine_io.c 3 Feb 2003 17:53:12 -0000 1.103
+++ ssl_engine_io.c 21 Feb 2003 20:12:24 -0000 1.104
@@ -479,8 +479,9 @@
/*
* this is the function called by SSL_read()
*/
-static int bio_filter_in_read(BIO *bio, char *in, int inl)
+static int bio_filter_in_read(BIO *bio, char *in, int inlen)
{
+ apr_size_t inl = inlen;
bio_filter_in_ctx_t *inctx = (bio_filter_in_ctx_t *)(bio->ptr);
apr_read_type_e block = inctx->block;
SSLConnRec *sslconn = myConnConfig(inctx->f->c);
@@ -536,13 +537,13 @@
inctx->rc = brigade_consume(inctx->bb, block, in, &inl);
if (inctx->rc == APR_SUCCESS) {
- return inl;
+ return (int)inl;
}
if (APR_STATUS_IS_EAGAIN(inctx->rc)
|| APR_STATUS_IS_EINTR(inctx->rc)) {
BIO_set_retry_read(bio);
- return inl;
+ return (int)inl;
}
/* Unexpected errors and APR_EOF clean out the brigade.
@@ -555,7 +556,7 @@
/* Provide the results of this read pass,
* without resetting the BIO retry_read flag
*/
- return inl;
+ return (int)inl;
}
return -1;