From 84a9b978e7a502e3d93e2d757af67f8f303cb615 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 15 Jan 2025 11:51:28 +0000 Subject: [PATCH] svn merge -c 1910518,1910847,1912477,1918297 ^/httpd/httpd/trunk . *) Easy patches: synch 2.4.x and trunk - ab: Increase MAX_CONCURRENCY hard limit (from 20K to 200K) - ab: Fix X509 * leak - dav/fs/dbm.c: Remove error message references to "property" databases - httpd.h: Fix comment git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923142 13f79535-47bb-0310-9956-ffa450edef68 Conflict:delete non-existent file STATUS Reference:https://github.com/apache/httpd/commit/84a9b978e7a502e3d93e2d757af67f8f303cb615 --- include/httpd.h | 2 +- modules/dav/fs/dbm.c | 4 ++-- support/ab.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/httpd.h b/include/httpd.h index 61e02a9..3ee836a 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -1114,7 +1114,7 @@ struct request_rec { */ int double_reverse; /** Request flags associated with this request. Use - * AP_REQUEST_GET_FLAGS() and AP_REQUEST_SET_FLAGS() to access + * AP_REQUEST_GET_BNOTE() and AP_REQUEST_SET_BNOTE() to access * the elements of this field. */ ap_request_bnotes_t bnotes; diff --git a/modules/dav/fs/dbm.c b/modules/dav/fs/dbm.c index 347d75d..39ab4ad 100644 --- a/modules/dav/fs/dbm.c +++ b/modules/dav/fs/dbm.c @@ -100,7 +100,7 @@ static dav_error * dav_fs_dbm_error(dav_db *db, apr_pool_t *p, /* There might not be a if we had problems creating it. */ if (db == NULL) { errcode = 1; - errstr = "Could not open property database."; + errstr = "Could not open database."; if (APR_STATUS_IS_EDSOOPEN(status)) ap_log_error(APLOG_MARK, APLOG_CRIT, status, ap_server_conf, APLOGNO(00576) "The DBM driver could not be loaded"); @@ -147,7 +147,7 @@ dav_error * dav_dbm_open_direct(apr_pool_t *p, const char *pathname, int ro, "mod_dav_fs: The DBM library '%s' could not be loaded: %s", err->reason, err->msg); return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 1, status, - "Could not load library for property database."); + "Could not load library for database."); } if ((status = apr_dbm_open2(&file, driver, pathname, ro ? APR_DBM_READONLY : APR_DBM_RWCREATE, diff --git a/support/ab.c b/support/ab.c index 3aa2660..eb8845c 100644 --- a/support/ab.c +++ b/support/ab.c @@ -292,7 +292,7 @@ struct data { #define ap_max(a,b) (((a)>(b))?(a):(b)) #define ap_round_ms(a) ((apr_time_t)((a) + 500)/1000) #define ap_double_ms(a) ((double)(a)/1000.0) -#define MAX_CONCURRENCY 20000 +#define MAX_CONCURRENCY 200000 /* --------------------- GLOBALS ---------------------------- */ @@ -748,6 +748,7 @@ static void ssl_proceed_handshake(struct connection *c) SSL_get_version(c->ssl), SSL_CIPHER_get_name(ci), pk_bits, sk_bits); + if (cert) X509_free(cert); } #if OPENSSL_VERSION_NUMBER >= 0x10002000L if (ssl_tmp_key == NULL) { -- 2.33.0