Skip to content
  1. Jun 15, 2014
  3. Jun 14, 2014
  5. Jun 13, 2014
  7. Jun 12, 2014
  9. Jun 11, 2014
  11. Jun 10, 2014
  13. Jun 09, 2014
  15. Jun 05, 2014
  17. Jun 04, 2014
  19. Jun 03, 2014
  21. Jun 01, 2014
  23. May 31, 2014
  25. May 30, 2014
    • Jim Jagielski's avatar
      Merge r1592511, r1592514 from trunk: · 4874a63c
      Jim Jagielski authored 
      reformat only (get rid of unnecessary block scope)

Clarify an existing requirement of the server_portstr parameter
to ap_proxy_determine_connection(): it must be a buffer of at
least one byte in size.

(And don't bother with using strcpy in order to zap a string.)

Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1598605 13f79535-47bb-0310-9956-ffa450edef68
      4874a63c
    • Jim Jagielski's avatar
      Merge r1591328, r1594643, r1594648 from trunk: · 90dc8619
      Jim Jagielski authored 
      mod_cache: Preserve non-cacheable headers forwarded from an origin 304
           response. PR 55547.

When mod_cache asks for a revalidation of a stale entry and the origin responds
with a 304 (not that stale), the module strips the non-cacheable headers from
the origin response and merges the stale headers to update the cache.

The problem is that mod_cache won't forward the non-cacheable headers to the
client, for example if the 304 response contains both Set-Cookie and
'Cache-Control: no-cache="Set-Cookie"' headers, or CacheIgnoreHeaders is used.


mod_cache: follow up to r1591328.

Define the cache_merge_headers_out() function to merge r->err_headers_out into
r->headers_out and add the ones from r->content_type/encoding if available.
Use it in ap_cache_cacheable_headers_out() where the same is done and in
cache_save_filter() where this has to be done before updating the entry.


mod_cache: follow up to r1594643.

Avoid table lookup if not necessary (fast path first).

Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1598604 13f79535-47bb-0310-9956-ffa450edef68
      90dc8619