www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Fix a 64-bit porting issue.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98747 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Madhusudan Mathihalli
2003-02-21 20:12:24 +00:00
parent 08290ad770
commit 88ac014cc0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/ssl/ssl_engine_io.c
View File

@@ -479,8 +479,9 @@ static apr_status_t brigade_consume(apr_bucket_brigade *bb,
/* /*
* this is the function called by SSL_read() * 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); bio_filter_in_ctx_t *inctx = (bio_filter_in_ctx_t *)(bio->ptr);
apr_read_type_e block = inctx->block; apr_read_type_e block = inctx->block;
SSLConnRec *sslconn = myConnConfig(inctx->f->c); SSLConnRec *sslconn = myConnConfig(inctx->f->c);
@@ -536,13 +537,13 @@ static int bio_filter_in_read(BIO *bio, char *in, int inl)
inctx->rc = brigade_consume(inctx->bb, block, in, &inl); inctx->rc = brigade_consume(inctx->bb, block, in, &inl);
if (inctx->rc == APR_SUCCESS) { if (inctx->rc == APR_SUCCESS) {
return inl; return (int)inl;
} }
if (APR_STATUS_IS_EAGAIN(inctx->rc) if (APR_STATUS_IS_EAGAIN(inctx->rc)
|| APR_STATUS_IS_EINTR(inctx->rc)) { || APR_STATUS_IS_EINTR(inctx->rc)) {
BIO_set_retry_read(bio); BIO_set_retry_read(bio);
return inl; return (int)inl;
} }
/* Unexpected errors and APR_EOF clean out the brigade. /* Unexpected errors and APR_EOF clean out the brigade.
@@ -555,7 +556,7 @@ static int bio_filter_in_read(BIO *bio, char *in, int inl)
/* Provide the results of this read pass, /* Provide the results of this read pass,
* without resetting the BIO retry_read flag * without resetting the BIO retry_read flag
*/ */
return inl; return (int)inl;
} }
return -1; return -1;