diff options
| author | Jim Jagielski <jim@apache.org> | 2013-01-28 13:09:39 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2013-01-28 13:09:39 +0000 |
| commit | 9457a827f2c8a48a01b47a27dc8abddb23e36b0b (patch) | |
| tree | 0fb459e2c4369422764868e1235ebf8c77052289 /include | |
| parent | 145be25c0dcbf73882945fbdefc315f2113a0ec5 (diff) | |
| download | httpd-9457a827f2c8a48a01b47a27dc8abddb23e36b0b.tar.gz | |
Merge r1422549, r1422712 from trunk:
add new ap_bin2hex() utility function
remove unnecessary cast
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1439390 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 3 | ||||
| -rw-r--r-- | include/httpd.h | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index b412941a49..2efda87e94 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -400,6 +400,7 @@ * 20120211.8 (2.4.3-dev) Add sticky_separator to proxy_balancer_shared struct. * 20120211.9 (2.4.4-dev) Add fgrab() to ap_slotmem_provider_t. * 20120211.10 (2.4.4-dev) Add in bal_persist field to proxy_server_conf + * 20120211.11 (2.4.4-dev) Add ap_bin2hex() */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ @@ -407,7 +408,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120211 #endif -#define MODULE_MAGIC_NUMBER_MINOR 10 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 11 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/httpd.h b/include/httpd.h index f18f789d9d..70eb06f983 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -2209,6 +2209,14 @@ AP_DECLARE(void) ap_get_sload(ap_sload_t *ld); */ AP_DECLARE(void) ap_get_loadavg(ap_loadavg_t *ld); +/** + * Convert binary data into a hex string + * @param src pointer to the data + * @param srclen length of the data + * @param dest pointer to buffer of length (2 * srclen + 1). The resulting + * string will be NUL-terminated. + */ +AP_DECLARE(void) ap_bin2hex(const void *src, apr_size_t srclen, char *dest); #define AP_NORESTART APR_OS_START_USEERR + 1 |