Author: wrowe Date: Sun Nov 21 10:50:51 2004 New Revision: 106104 Modified: httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp Log:
Replace two depreciated constructs which aren't available in httpd-2.1/apr-1.0 Code now builds under httpd-2.1-dev, however, lib names must be replaced with libapr-1.lib libaprutil-1.lib. Will attempt build target rules to accomplish this, but versioning will be prickly, if we want to keep avoiding having to generate .rc files. Modified: httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp?view=diff&rev=106104&p1=httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp&r1=106103&p2=httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp&r2=106104 ============================================================================== --- httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp (original) +++ httpd/mod_aspdotnet/trunk/Apache.Web/WorkerRequest.cpp Sun Nov 21 10:50:51 2004 @@ -370,12 +370,15 @@ return rv; } - APR_BRIGADE_FOREACH(bucket, bb) { + while (!APR_BRIGADE_EMPTY(bb)) { + bucket = APR_BRIGADE_FIRST(bb); if (bucket->type == dummy_eos_bucket->type) { *seen_eos = 1; + apr_bucket_delete(bucket); break; } if (bucket->type == dummy_flush_bucket->type) { + apr_bucket_delete(bucket); continue; } const char *data; @@ -394,6 +397,9 @@ curptr += len; size -= len; } + // if (*overflow) above, might prefer to split this bucket, + // but we were dumping the bb anyways + apr_bucket_delete(bucket); } apr_brigade_cleanup(bb); } @@ -478,12 +484,15 @@ void *startptr = static_cast<void __nogc*>(lockbuff); curptr = static_cast<char __nogc*>(startptr); } - APR_BRIGADE_FOREACH(bucket, bb) { + while (!APR_BRIGADE_EMPTY(bb)) { + bucket = APR_BRIGADE_FIRST(bb); if (bucket->type == dummy_eos_bucket->type) { seen_eos = 1; + apr_bucket_delete(bucket); break; } if (bucket->type == dummy_flush_bucket->type) { + apr_bucket_delete(bucket); continue; } const char *data; @@ -504,6 +513,9 @@ curptr += len; size -= len; } + // if (len > size) above, we overflowed, might prefer to + // split this bucket, but we were dumping the bb anyways + apr_bucket_delete(bucket); } apr_brigade_cleanup(bb); #ifdef _DEBUG Modified: httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp?view=diff&rev=106104&p1=httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp&r1=106103&p2=httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp&r2=106104 ============================================================================== --- httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp (original) +++ httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp Sun Nov 21 10:50:51 2004 @@ -513,7 +513,7 @@ static int asp_net_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp) { - apr_pool_t *process = apr_pool_get_parent(pconf); + apr_pool_t *process = apr_pool_parent_get(pconf); // Recover or create the global, persistant configuration // Setup and teardown can take a considerable amount of time,
