VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-29 12:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

svn merge -c 1910518,1910847,1912477,1918297 ^/httpd/httpd/trunk .

Browse Source 
*) 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
This commit is contained in:
Jim Jagielski
2025-01-15 11:51:28 +00:00
parent 4c8fb018a8
commit 84a9b978e7
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
STATUS
View File

@ -157,19 +157,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
*) 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
trunk patch:
- https://svn.apache.org/r1910518
https://svn.apache.org/r1910847
https://svn.apache.org/r1912477
https://svn.apache.org/r1918297
2.4.x patch: svn merge -c 1910518,1910847,1912477,1918297 ^/httpd/httpd/trunk .
+1: jailletc36, jim, ylavic
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]

2
include/httpd.h
View File

@ -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;

4
modules/dav/fs/dbm.c
View File

@ -100,7 +100,7 @@ static dav_error * dav_fs_dbm_error(dav_db *db, apr_pool_t *p,
/* There might not be a <db> 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,

3
support/ab.c
View File

@ -297,7 +297,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 ---------------------------- */
@ -764,6 +764,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) {