You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2005/10/18 17:20:51 UTC
svn commit: r326121 [4/4] - in /httpd/httpd/branches/mod_version_for_2.0.x:
./ build/rpm/ docs/manual/ssl/ docs/manual/style/ docs/manual/style/latex/
docs/manual/vhosts/ include/ modules/ssl/ server/ server/mpm/worker/
Modified: httpd/httpd/branches/mod_version_for_2.0.x/include/ap_release.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/include/ap_release.h?rev=326121&r1=326120&r2=326121&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/include/ap_release.h (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/include/ap_release.h Tue Oct 18 08:20:25 2005
@@ -36,7 +36,7 @@
#define AP_SERVER_MAJORVERSION_NUMBER 2
#define AP_SERVER_MINORVERSION_NUMBER 0
-#define AP_SERVER_PATCHLEVEL_NUMBER 55
+#define AP_SERVER_PATCHLEVEL_NUMBER 56
#define AP_SERVER_ADD_STRING "-dev"
/* keep old macros as well */
Modified: httpd/httpd/branches/mod_version_for_2.0.x/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/ssl/ssl_engine_io.c?rev=326121&r1=326120&r2=326121&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/modules/ssl/ssl_engine_io.c Tue Oct 18 08:20:25 2005
@@ -1403,6 +1403,7 @@
filter_ctx = apr_palloc(c->pool, sizeof(ssl_filter_ctx_t));
+ filter_ctx->nobuffer = 0;
filter_ctx->pOutputFilter = ap_add_output_filter(ssl_io_filter,
filter_ctx, NULL, c);
Modified: httpd/httpd/branches/mod_version_for_2.0.x/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/ssl/ssl_engine_kernel.c?rev=326121&r1=326120&r2=326121&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/modules/ssl/ssl_engine_kernel.c Tue Oct 18 08:20:25 2005
@@ -406,8 +406,8 @@
(!(verify_old & SSL_VERIFY_PEER) &&
(verify & SSL_VERIFY_PEER)) ||
- (!(verify_old & SSL_VERIFY_PEER_STRICT) &&
- (verify & SSL_VERIFY_PEER_STRICT)))
+ (!(verify_old & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) &&
+ (verify & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)))
{
renegotiate = TRUE;
/* optimization */
Modified: httpd/httpd/branches/mod_version_for_2.0.x/server/core.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/server/core.c?rev=326121&r1=326120&r2=326121&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/server/core.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/server/core.c Tue Oct 18 08:20:25 2005
@@ -4493,9 +4493,10 @@
static int core_pre_connection(conn_rec *c, void *csd)
{
core_net_rec *net = apr_palloc(c->pool, sizeof(*net));
- apr_status_t rv;
#ifdef AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
+ apr_status_t rv;
+
/* BillS says perhaps this should be moved to the MPMs. Some OSes
* allow listening socket attributes to be inherited by the
* accept sockets which means this call only needs to be made
Modified: httpd/httpd/branches/mod_version_for_2.0.x/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/server/mpm/worker/worker.c?rev=326121&r1=326120&r2=326121&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/server/mpm/worker/worker.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/server/mpm/worker/worker.c Tue Oct 18 08:20:25 2005
@@ -574,8 +574,7 @@
int process_slot = ti->pid;
apr_pool_t *tpool = apr_thread_pool_get(thd);
void *csd = NULL;
- apr_pool_t *ptrans; /* Pool for per-transaction stuff */
- apr_pool_t *recycled_pool = NULL;
+ apr_pool_t *ptrans = NULL; /* Pool for per-transaction stuff */
int n;
apr_pollfd_t *pollset;
apr_status_t rv;
@@ -604,8 +603,11 @@
if (listener_may_exit) break;
if (!have_idle_worker) {
+ /* the following pops a recycled ptrans pool off a stack
+ * if there is one, in addition to reserving a worker thread
+ */
rv = ap_queue_info_wait_for_idler(worker_queue_info,
- &recycled_pool);
+ &ptrans);
if (APR_STATUS_IS_EOF(rv)) {
break; /* we've been signaled to die now */
}
@@ -682,17 +684,15 @@
}
got_fd:
if (!listener_may_exit) {
- /* create a new transaction pool for each accepted socket */
- if (recycled_pool == NULL) {
+ if (ptrans == NULL) {
+ /* we can't use a recycled transaction pool this time.
+ * create a new transaction pool */
apr_allocator_t *allocator;
apr_allocator_create(&allocator);
apr_allocator_max_free_set(allocator, ap_max_mem_free);
apr_pool_create_ex(&ptrans, NULL, NULL, allocator);
apr_allocator_owner_set(allocator, ptrans);
- }
- else {
- ptrans = recycled_pool;
}
apr_pool_tag(ptrans, "transaction");
rv = lr->accept_func(&csd, lr, ptrans);