*) Easy patches: synch 2.4.x and trunk
- mod_dav: save a few cycles
- mod_{ssl,md}: init_stapling_status hooks should return an int
- util_md5: avoid temporary stack result in ap_md5_binary()
- mod_proxy_balancer: Add a missing </tr>
- mod_md: get_stapling_status hooks should return an int
- mod_session: Improve a message about SessionExpiryUpdateInterval values
trunk patch:
http://svn.apache.org/r1837388
http://svn.apache.org/r1876549
http://svn.apache.org/r1877551
http://svn.apache.org/r1882210
http://svn.apache.org/r1882399
http://svn.apache.org/r1883414
2.4.x patch: svn merge -c
1837388,
1876549,
1877551,
1882210,
1882399,
1883414 ^/httpd/httpd/trunk .
+1: jailletc36, ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1885610 13f79535-47bb-0310-9956-
ffa450edef68
-*- coding: utf-8 -*-
Changes with Apache 2.4.47
+ *) Synch 2.4.x and trunk
+ - mod_dav: save a few cycles
+ - mod_{ssl,md}: init_stapling_status hooks should return an int
+ - util_md5: avoid temporary stack result in ap_md5_binary()
+ - mod_proxy_balancer: Add a missing </tr>
+ - mod_md: get_stapling_status hooks should return an int
+ - mod_session: Improve a message about SessionExpiryUpdateInterval values
+ [Christophe Jaillet]
+
*) mod_proxy_fcgi: Honor "SetEnv proxy-sendcl" to forward a chunked
Transfer-Encoding from the client, spooling the request body when needed
to provide a Content-Length to the backend. PR 57087. [Yann Ylavic]
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- *) Easy patches: synch 2.4.x and trunk
- - mod_dav: save a few cycles
- - mod_{ssl,md}: init_stapling_status hooks should return an int
- - util_md5: avoid temporary stack result in ap_md5_binary()
- - mod_proxy_balancer: Add a missing </tr>
- - mod_md: get_stapling_status hooks should return an int
- - mod_session: Improve a message about SessionExpiryUpdateInterval values
- trunk patch:
- http://svn.apache.org/r1837388
- http://svn.apache.org/r1876549
- http://svn.apache.org/r1877551
- http://svn.apache.org/r1882210
- http://svn.apache.org/r1882399
- http://svn.apache.org/r1883414
- 2.4.x patch: svn merge -c 1837388,1876549,1877551,1882210,1882399,1883414 ^/httpd/httpd/trunk .
- +1: jailletc36, ylavic, minfrin
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
range = apr_pstrdup(r->pool, range_c);
if (strncasecmp(range, "bytes ", 6) != 0
- || (dash = ap_strchr(range, '-')) == NULL
- || (slash = ap_strchr(range, '/')) == NULL) {
+ || (dash = ap_strchr(range + 6, '-')) == NULL
+ || (slash = ap_strchr(range + 6, '/')) == NULL) {
/* malformed header */
return -1;
}
&& md_config_geti(sc, MD_CONFIG_STAPLE_OTHERS));
}
-apr_status_t md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p,
+int md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p,
X509 *cert, X509 *issuer)
{
md_srv_conf_t *sc;
return DECLINED;
}
-apr_status_t md_ocsp_get_stapling_status(unsigned char **pder, int *pderlen,
+int md_ocsp_get_stapling_status(unsigned char **pder, int *pderlen,
conn_rec *c, server_rec *s, X509 *cert)
{
md_srv_conf_t *sc;
#define mod_md_md_ocsp_h
-apr_status_t md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p,
- X509 *cert, X509 *issuer);
+int md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p,
+ X509 *cert, X509 *issuer);
-apr_status_t md_ocsp_get_stapling_status(unsigned char **pder, int *pderlen,
- conn_rec *c, server_rec *s, X509 *cert);
+int md_ocsp_get_stapling_status(unsigned char **pder, int *pderlen,
+ conn_rec *c, server_rec *s, X509 *cert);
/**
* Start watchdog for retrieving/updating ocsp status.
ap_rvputs(r, balancer->s->vpath, "</td>\n", NULL);
ap_rprintf(r, "<td>%s</td>\n",
!balancer->s->inactive ? "Yes" : "No");
- ap_rputs("</table>\n<br />", r);
+ ap_rputs("</tr>\n</table>\n<br />", r);
ap_rputs("\n\n<table><tr>"
"<th>Worker URL</th>"
"<th>Route</th><th>RouteRedir</th>"
conf->expiry_update_time = atoi(arg);
if (conf->expiry_update_time < 0) {
- return "SessionExpiryUpdateInterval must be positive or nul";
+ return "SessionExpiryUpdateInterval must be zero (disable) or a positive value";
}
conf->expiry_update_time = apr_time_from_sec(conf->expiry_update_time);
conf->expiry_update_set = 1;
return 1;
}
- if (ssl_run_init_stapling_status(s, p, x, issuer) == APR_SUCCESS) {
+ if (ssl_run_init_stapling_status(s, p, x, issuer) == OK) {
/* Someone's taken over or mod_ssl's own implementation is not enabled */
if (mctx->stapling_enabled != TRUE) {
SSL_CTX_set_tlsext_status_cb(mctx->ssl_ctx, stapling_cb);
{
apr_md5_ctx_t my_md5;
unsigned char hash[APR_MD5_DIGESTSIZE];
- char result[2 * APR_MD5_DIGESTSIZE + 1];
+ char *result;
/*
* Take the MD5 hash of the string argument.
apr_md5_update(&my_md5, buf, (unsigned int)length);
apr_md5_final(hash, &my_md5);
- ap_bin2hex(hash, APR_MD5_DIGESTSIZE, result);
-
- return apr_pstrndup(p, result, APR_MD5_DIGESTSIZE*2);
+ result = apr_palloc(p, 2 * APR_MD5_DIGESTSIZE + 1);
+ ap_bin2hex(hash, APR_MD5_DIGESTSIZE, result); /* sets final '\0' */
+ return result;
}
AP_DECLARE(char *) ap_md5(apr_pool_t *p, const unsigned char *string)