Skip to content
GitLab
  1. 15 Jun, 2014 3 commits
  3. 14 Jun, 2014 2 commits
  5. 13 Jun, 2014 2 commits
  7. 12 Jun, 2014 1 commit
  9. 11 Jun, 2014 1 commit
  11. 10 Jun, 2014 7 commits
  13. 09 Jun, 2014 2 commits
  15. 05 Jun, 2014 2 commits
  17. 04 Jun, 2014 5 commits
  19. 03 Jun, 2014 7 commits
  21. 01 Jun, 2014 2 commits
  23. 31 May, 2014 2 commits
  25. 30 May, 2014 4 commits
    • 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
    • Jim Jagielski's avatar
      Merge r1594625 from trunk: · b5f05fdd
      Jim Jagielski authored 
      mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:" scheme.
                    PR55320.

Submitted by: Alex Liu <alex.leo.ca gmail.com>
Committed by: ylavic

Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1598603 13f79535-47bb-0310-9956-ffa450edef68
      b5f05fdd
    • Jim Jagielski's avatar
      xforms · eab1cb4a
      Jim Jagielski authored 
      
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1598602 13f79535-47bb-0310-9956-ffa450edef68
      eab1cb4a