Checkout Tools
  • last updated 1 hour ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 1843298 is being indexed.

Add CHANGES entry
Add CHANGES entry
Correctly merge r1836287, backported in 2.4.x in r1836288.

(unless I missed something, the function is also called 'ap_directory_walk' in 2.4.x)

This is only a comment update.

On the 2.4.x branch: Propose the mod_brotli/mod_deflate 304 handling

fix (r1843242) for backport.

mod_session_cookie: avoid adding the Set-Cookie header

in both r->headers_out and r->err_headers_out

to avoid duplication.

In session_cookie_save it seems that ap_cookie_write is called

with r->headers_out and r->err_headers_out, ending up in the same

Set-Cookie header on both tables and eventually duplicated in the

HTTP response. I took Emmanuel's patch and trimmed out the bits

that remove the header only from r->err_headers_out (leaving it

to do the work on both tables) as attempt to change this bit of code

in the most conservative way as possible. Sending a commit for

a broader review.

PR: 60910,56098,55278

mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified

responses allowing these modules to properly set or fix-up the response

headers such as Vary or ETag.

This change follows up on r1837056 that disabled that special handling and

thus resulted in a potential violation of RFC7232, 4.1:

The server generating a 304 response MUST generate any of the following

header fields that would have been sent in a 200 (OK) response to the

same request: Cache-Control, Content-Location, Date, ETag, Expires,

and Vary.)


Vote, promote.
update transformation

ran `build bootstrap` and rebuild transformation. sorry for the noise.

  1. … 277 more files in changeset.
move es and fr targets to *.utf8 extension. Update transformation

    • ?
    • ?
  1. … 871 more files in changeset.
Fix xml validation error

Update doc for building docs.

- Prepare for a java 1.2+ to a java 8+ transition

- Use 2.4.x as an example, instead of 2.2.x

- remove reference to sun (this is more or less 10 years old now!)

- add a missing formatting `...`

Add changes, docs for DefaultStateDir and DavLockDB default change.

* modules/dav/fs/mod_dav_fs.c (dav_fs_create_server_config): Use

statedir-relative default lock database path.

Define "state directory" for storing persistent child-writable state,

with default from config.layout, configurable via DefaultStateDir.

* server/core.c (set_state_dir, ap_state_dir_relative):

New functions.

* config.layout, acinclude.m4,, Define

statedir variables, drop davlockdb.

* include/ Define DEFAULT_REL_STATEDIR,


* include/ap_mmn.h: Bump MMN minor.

* modules/cache/mod_cache_disk.c (write_headers): Handle

mkdir_structure error case. Fixes Coverity warning.

* server/protocol.c (ap_rvputs): Call va_end before returning in the

error case, as required by C89/POSIX stdarg.h - Coverity warns for


* modules/ldap/util_ldap_cache_mgr.c (util_ald_create_caches): Destroy

rather than leak caches if all three cannot be allocated (Coverity

warning). Remove unnecessary pointer.

promote w/ 3

Backport votes

* modules/filters/mod_deflate.c

(deflate_out_filter): Fix typo setting output note. (Coverity warning)

(deflate_in_filter): Fix redundant assignment. (clang warning)

* modules/mappers/mod_negotiation.c (set_language_quality): Remove

redundant branch (warning from Coverity).

* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey): Remove

redundant assignment (clang warning).

* modules/slotmem/mod_slotmem_shm.c (restore_slotmem): Remove

redundant assignment (clang warning), the apr_file_eof(fp)=>APR_EOF

case assigns rv to APR_EOF and then to APR_SUCCESS after already.

* modules/proxy/ajp_header.c (sc_for_req_header): Zero-initialize

buffer to avoid potential (harmless) memcmp comparison against

garbage stack data later. (clang warning).


Backport of r1842640 from trunk.

Remove garbage.

Backport of r1842639 from trunk.