Commit c973368e authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Create wrapper API for apr_random; 

use in mod_lbmethod_heartbeat and mod_serf to
- replace some needles use of apr_generate_random_bytes
- remove code duplication


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1171247 13f79535-47bb-0310-9956-ffa450edef68
parent a92758b3

CHANGES

+2 −0
Changes for CHANGES: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ Changes with Apache 2.3.15 
     PR 51714. [Stefan Fritsch, Jim Jagielski, Ruediger Pluem, Eric Covener,

     <lowprio20 gmail.com>]



  *) core: Add convenience API for apr_random. [Stefan Fritsch]



  *) core: Add MaxRangeOverlaps and MaxRangeReversals directives to control

     the number of overlapping and reversing ranges (respectively) permitted

     before returning the entire resource, with a default limit of 20.

include/ap_mmn.h

+2 −1
Changes for include/ap_mmn.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ 
 * 20110724.4 (2.3.15-dev) add max_ranges to core_dir_config

 * 20110724.5 (2.3.15-dev) add ap_set_accept_ranges()

 * 20110724.6 (2.3.15-dev) add max_overlaps and max_reversals to core_dir_config

 * 20110724.7 (2.3.15-dev) add ap_random_insecure_bytes(), ap_random_pick()

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -358,7 +359,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20110724

#endif

#define MODULE_MAGIC_NUMBER_MINOR 6                    /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 7                    /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

include/httpd.h

+20 −0
Changes for include/httpd.h: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2067,6 +2067,26 @@ AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c); 


#endif



/**

 * Generate pseudo random bytes.

 * This is a convenience interface to apr_random. It is cheaper but less

 * secure than apr_generate_random_bytes().

 * @param buf where to store the bytes

 * @param size number of bytes to generate

 * @note ap_random_insecure_bytes() is thread-safe, it uses a mutex on

 *       threaded MPMs.

 */

APR_DECLARE(void) ap_random_insecure_bytes(void *buf, apr_size_t size);



/**

 * Get a pseudo random number in a range.

 * @param min low end of range

 * @param max high end of range

 * @return a number in the range

 */

APR_DECLARE(apr_uint32_t) ap_random_pick(apr_uint32_t min, apr_uint32_t max);





#define AP_NORESTART APR_OS_START_USEERR + 1



#ifdef __cplusplus

include/mod_core.h

+3 −0
Changes for include/mod_core.h: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ AP_DECLARE_NONSTD(int) ap_send_http_trace(request_rec *r); 
 */

AP_DECLARE(int) ap_send_http_options(request_rec *r);



/* Used for multipart/byteranges boundary string */

extern AP_DECLARE_DATA const char *ap_multipart_boundary;



#ifdef __cplusplus

}

#endif

modules/http/http_core.c

+6 −0
Changes for modules/http/http_core.c: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ AP_DECLARE_DATA ap_filter_rec_t *ap_chunk_filter_handle; 
AP_DECLARE_DATA ap_filter_rec_t *ap_http_outerror_filter_handle;

AP_DECLARE_DATA ap_filter_rec_t *ap_byterange_filter_handle;



AP_DECLARE_DATA const char *ap_multipart_boundary;



/* If we are using an MPM That Supports Async Connections,

 * use a different processing function

 */
@@ -255,9 +257,13 @@ static int http_send_options(request_rec *r) 


static int http_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)

{

    apr_uint64_t val;

    if (ap_mpm_query(AP_MPMQ_IS_ASYNC, &async_mpm) != APR_SUCCESS) {

        async_mpm = 0;

    }

    ap_random_insecure_bytes(&val, sizeof(val));

    ap_multipart_boundary = apr_psprintf(p, "%0" APR_UINT64_T_HEX_FMT, val);



    return OK;

}