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

diff --git a/STATUS b/STATUS
index f3defd261e5138d0292c784b98cb933e12cf3f2c..13f07c20c4d69ddc105a551c789f2516dbd8277b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 ]

diff --git a/include/httpd.h b/include/httpd.h
index 21a91f37241dbdcdc7261c049166ed4cb8005649..6c7484fc040b4420b4707b0240466b635615b517 100644 (file)
--- 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 347d75d8c59661274faf314fdcf9990c3f14e430..39ab4adc58195d46bc581daefdddf4a605511dbc 100644 (file)
--- 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 <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,

diff --git a/support/ab.c b/support/ab.c
index 6709cd1db6c4913bac6112d366148143587817b3..bee3812d9f4101be6fc8086d66c7ce38ed2fa2be 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -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) {