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 2001/08/02 07:25:53 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_ds.c ssl_engine_init.c ssl_scache_dbm.c ssl_util_ssl.c
wrowe 01/08/01 22:25:53
Modified: modules/test mod_test_util_uri.c
modules/ssl ssl_engine_ds.c ssl_engine_init.c
ssl_scache_dbm.c ssl_util_ssl.c
Log:
Adapt to changed declaration of apr_pool_sub_make()
Revision Changes Path
1.11 +1 -1 httpd-2.0/modules/test/mod_test_util_uri.c
Index: mod_test_util_uri.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/test/mod_test_util_uri.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_test_util_uri.c 2001/05/22 01:31:09 1.10
+++ mod_test_util_uri.c 2001/08/02 05:25:53 1.11
@@ -207,7 +207,7 @@
}
*strp = 0;
- sub = apr_pool_sub_make(r->pool);
+ apr_pool_sub_make(&sub, r->pool, NULL);
status = apr_uri_parse_components(sub, input_uri, &result);
if (status == APR_SUCCESS) {
#define CHECK(f) \
1.6 +4 -2 httpd-2.0/modules/ssl/ssl_engine_ds.c
Index: ssl_engine_ds.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_ds.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ssl_engine_ds.c 2001/07/19 16:08:01 1.5
+++ ssl_engine_ds.c 2001/08/02 05:25:53 1.6
@@ -76,7 +76,8 @@
if ((a = (ssl_ds_array *)apr_palloc(p, sizeof(ssl_ds_array))) == NULL)
return NULL;
a->pPool = p;
- if ((a->pSubPool = apr_pool_sub_make(p, NULL)) == NULL)
+ apr_pool_sub_make(&a->pSubPool, p, NULL);
+ if (a->pSubPool == NULL)
return NULL;
a->aData = apr_array_make(a->pSubPool, 2, size);
return a;
@@ -130,7 +131,8 @@
if ((t = (ssl_ds_table *)apr_palloc(p, sizeof(ssl_ds_table))) == NULL)
return NULL;
t->pPool = p;
- if ((t->pSubPool = apr_pool_sub_make(p, NULL)) == NULL)
+ apr_pool_sub_make(&t->pSubPool, p, NULL);
+ if (t->pSubPool == NULL)
return NULL;
t->aKey = apr_array_make(t->pSubPool, 2, MAX_STRING_LEN);
t->aData = apr_array_make(t->pSubPool, 2, size);
1.9 +1 -1 httpd-2.0/modules/ssl/ssl_engine_init.c
Index: ssl_engine_init.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ssl_engine_init.c 2001/07/31 03:40:47 1.8
+++ ssl_engine_init.c 2001/08/02 05:25:53 1.9
@@ -904,7 +904,7 @@
* is remains in memory for the complete operation time of
* the server.
*/
- p = apr_pool_sub_make(pp, NULL);
+ apr_pool_sub_make(&p, pp, NULL);
/*
* Start with a empty stack/list where new
1.7 +4 -2 httpd-2.0/modules/ssl/ssl_scache_dbm.c
Index: ssl_scache_dbm.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_dbm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ssl_scache_dbm.c 2001/07/30 21:30:28 1.6
+++ ssl_scache_dbm.c 2001/08/02 05:25:53 1.7
@@ -116,7 +116,8 @@
SSLModConfigRec *mc = myModConfig(s);
apr_pool_t *p;
- if ((p = apr_pool_sub_make(mc->pPool, NULL)) != NULL) {
+ apr_pool_sub_make(&p, mc->pPool, NULL)
+ if (p != NULL) {
/* the correct way */
unlink(apr_pstrcat(p, mc->szSessionCacheDataFile, SSL_DBM_FILE_SUFFIX_DIR, NULL));
unlink(apr_pstrcat(p, mc->szSessionCacheDataFile, SSL_DBM_FILE_SUFFIX_PAG, NULL));
@@ -328,7 +329,8 @@
ssl_mutex_on(s);
for (;;) {
/* allocate the key array in a memory sub pool */
- if ((p = apr_pool_sub_make(mc->pPool, NULL)) == NULL)
+ apr_pool_sub_make(&p, mc->pPool, NULL)
+ if (p == NULL)
break;
if ((keylist = apr_palloc(p, sizeof(dbmkey)*KEYMAX)) == NULL) {
apr_pool_destroy(p);
1.8 +1 -1 httpd-2.0/modules/ssl/ssl_util_ssl.c
Index: ssl_util_ssl.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util_ssl.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ssl_util_ssl.c 2001/07/31 03:16:55 1.7
+++ ssl_util_ssl.c 2001/08/02 05:25:53 1.8
@@ -420,7 +420,7 @@
char *fullname;
BOOL ok;
- sp = apr_pool_sub_make(p, NULL);
+ apr_pool_sub_make(&sp, p, NULL);
if (apr_dir_open(&dir, pathname, sp)) != APR_SUCCESS) {
apr_pool_destroy(sp);
return FALSE;