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 2006/01/13 15:22:58 UTC
svn commit: r368732 - in /httpd/httpd/branches/2.2.x:
modules/ssl/ssl_scache_dc.c support/ab.c
Author: jorton
Date: Fri Jan 13 06:22:55 2006
New Revision: 368732
URL: http://svn.apache.org/viewcvs?rev=368732&view=rev
Log:
Merge r349415 from trunk:
* modules/ssl/ssl_scache_dc.c (ssl_scache_dc_retrieve): Fix warning
with OpenSSL 0.9.8a.
* support/ab.c (ssl_print_cb, ssl_print_cert_info): Fix warnings with
OpenSSL 0.9.8a.
Reviewed by: jorton, jerenkrantz, wrowe
Modified:
httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_dc.c
httpd/httpd/branches/2.2.x/support/ab.c
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_dc.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_dc.c?rev=368732&r1=368731&r2=368732&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_dc.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_scache_dc.c Fri Jan 13 06:22:55 2006
@@ -127,7 +127,7 @@
unsigned char der[SSL_SESSION_MAX_DER];
unsigned int der_len;
SSL_SESSION *pSession;
- unsigned char *pder = der;
+ MODSSL_D2I_SSL_SESSION_CONST unsigned char *pder = der;
SSLModConfigRec *mc = myModConfig(s);
DC_CTX *ctx = mc->tSessionCacheDataTable;
Modified: httpd/httpd/branches/2.2.x/support/ab.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/support/ab.c?rev=368732&r1=368731&r2=368732&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/ab.c (original)
+++ httpd/httpd/branches/2.2.x/support/ab.c Fri Jan 13 06:22:55 2006
@@ -383,14 +383,14 @@
if (out == NULL) return(ret);
if (cmd == (BIO_CB_READ|BIO_CB_RETURN)) {
- BIO_printf(out,"read from %08X [%08lX] (%d bytes => %ld (0x%X))\n",
- bio,argp,argi,ret,ret);
+ BIO_printf(out,"read from %p [%p] (%d bytes => %ld (0x%lX))\n",
+ bio, argp, argi, ret, ret);
BIO_dump(out,(char *)argp,(int)ret);
return(ret);
}
else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN)) {
- BIO_printf(out,"write to %08X [%08lX] (%d bytes => %ld (0x%X))\n",
- bio,argp,argi,ret,ret);
+ BIO_printf(out,"write to %p [%p] (%d bytes => %ld (0x%lX))\n",
+ bio, argp, argi, ret, ret);
BIO_dump(out,(char *)argp,(int)ret);
}
return ret;
@@ -485,7 +485,7 @@
X509_NAME *dn;
char buf[1024];
- BIO_printf(bio, "Certificate version: %d\n", X509_get_version(cert)+1);
+ BIO_printf(bio, "Certificate version: %ld\n", X509_get_version(cert)+1);
BIO_printf(bio,"Valid from: ");
ASN1_UTCTIME_print(bio, X509_get_notBefore(cert));
BIO_printf(bio,"\n");