You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jw...@apache.org on 2002/04/30 05:47:31 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_log.c ssl_scache_shmcb.c
jwoolley 02/04/29 20:47:31
Modified: . CHANGES
modules/ssl ssl_engine_log.c ssl_scache_shmcb.c
Log:
- Sync with modssl 2.8.8-1.3.24
- Also a minor change to add more useful error
logging for shmcb startup failures
Revision Changes Path
1.746 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.745
retrieving revision 1.746
diff -u -d -u -r1.745 -r1.746
--- CHANGES 29 Apr 2002 19:55:49 -0000 1.745
+++ CHANGES 30 Apr 2002 03:47:31 -0000 1.746
@@ -1,5 +1,10 @@
Changes with Apache 2.0.37
+ *) Synced with remaining changes from mod_ssl 2.8.8-1.3.24:
+ - Avoid SIGBUS on sparc machines with SHMCB session caches
+ - Allow whitespace between the pipe and the name of the
+ program in SSLLog "| /path/to/program". [Cliff Woolley]
+
*) Introduce mod_ext_filter and mod_deflate experimental modules
to the Win32 build (zlib sources must be in srclib\zlib.)
[William Rowe]
1.18 +2 -0 httpd-2.0/modules/ssl/ssl_engine_log.c
Index: ssl_engine_log.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_log.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -u -r1.17 -r1.18
--- ssl_engine_log.c 13 Apr 2002 12:02:38 -0000 1.17
+++ ssl_engine_log.c 30 Apr 2002 03:47:31 -0000 1.18
@@ -97,6 +97,8 @@
return;
else if (sc->log_file_name[0] == '|') {
szLogFile = sc->log_file_name + 1;
+ while (*szLogFile == ' ' || *szLogFile == '\t')
+ szLogFile++;
if ((pl = ap_open_piped_log(p, szLogFile)) == NULL) {
ssl_log(s, SSL_LOG_ERROR|SSL_ADD_ERRNO,
"Cannot open reliable pipe to SSL logfile filter %s", szLogFile);
1.11 +7 -6 httpd-2.0/modules/ssl/ssl_scache_shmcb.c
Index: ssl_scache_shmcb.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_shmcb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -u -r1.10 -r1.11
--- ssl_scache_shmcb.c 29 Mar 2002 07:12:01 -0000 1.10
+++ ssl_scache_shmcb.c 30 Apr 2002 03:47:31 -0000 1.11
@@ -269,13 +269,10 @@
/* This is necessary simply so that the size passed to memset() is not a
* compile-time constant, preventing the compiler from optimising it. */
-#if 0
-/* XXX: this isn't used, is it needed? */
static void shmcb_safe_clear(void *ptr, size_t size)
{
memset(ptr, 0, size);
}
-#endif
/* Underlying functions for session-caching */
static BOOL shmcb_init_memory(server_rec *, void *, unsigned int);
@@ -385,8 +382,10 @@
mc->nSessionCacheDataSize,
mc->szSessionCacheDataFile,
mc->pPool)) != APR_SUCCESS) {
+ char buf[100];
ssl_log(s, SSL_LOG_ERROR,
- "Cannot allocate shared memory: %d", rv);
+ "Cannot allocate shared memory: (%d)%s", rv,
+ apr_strerror(rv, buf, sizeof(buf)));
ssl_die();
}
@@ -394,8 +393,10 @@
apr_shm_baseaddr_get(mc->pSessionCacheDataMM),
mc->nSessionCacheDataSize,
mc->pPool)) != APR_SUCCESS) {
+ char buf[100];
ssl_log(s, SSL_LOG_ERROR,
- "Cannot initialize rmm: %d", rv);
+ "Cannot initialize rmm: (%d)%s", rv,
+ apr_strerror(rv, buf, sizeof(buf)));
ssl_die();
}
@@ -1179,7 +1180,7 @@
"internal error");
return FALSE;
}
- memset(idx, 0, sizeof(SHMCBIndex));
+ shmcb_safe_clear(idx, sizeof(SHMCBIndex));
shmcb_set_safe_time(&(idx->expires), expiry_time);
shmcb_set_safe_uint(&(idx->offset), new_offset);