Skip to content
GitLab
  1. 21 Nov, 2016 4 commits
    • Jim Jagielski's avatar
      Propose backport, · cde7eae6
      Jim Jagielski authored 
      
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1770759 13f79535-47bb-0310-9956-ffa450edef68
      cde7eae6
    • Jim Jagielski's avatar
      Merge r1752331, r1752332, r1752333 from trunk: · fc6d7f45
      Jim Jagielski authored 
      CMake: use CMAKE_REQUIRED_INCLUDES to find APR macros

When using CMake with Visual Studio on Windows, invoking the
CHECK_SYMBOL_EXISTS macro with the full paths to the include files seems
to always result in failure.

Instead, use the documented CMAKE_REQUIRED_INCLUDES variable to set the
include directory, and pass only the headers' base names to
CHECK_SYMBOL_EXISTS.

CMake: use generator expressions to find output files

Multi-configuration generators, like Visual Studio, use a different
output directory (Debug, Release, etc.) for each configuration. To find
the output files reliably, switch to using generator expressions instead
of hardcoding the file paths for PDBs, export files, etc.

CMake: quote installation paths

Deal with installation paths with spaces in them (e.g. "C:\Program
Files") by quoting the arguments to perl and xcopy.
Submitted by: jchampion
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1770674 13f79535-47bb-0310-9956-ffa450edef68
      fc6d7f45
    • Jim Jagielski's avatar
      Merge r1769332 from trunk: · 6c41094a
      Jim Jagielski authored 
      ssl: clear the error queue before SSL_read/write/accept()

If other modules or libraries do not clear the OpenSSL error queue after
a failed operation, other code that relies on SSL_get_error() -- in
particular, code that deals with SSL_ERROR_WANT_READ/WRITE logic -- will
malfunction later on. To prevent this, explicitly clear the error queue
before calls like SSL_read/write/accept().

PR: 60223
Submitted by: Paul Spangler <paul.spangler ni.com>
Submitted by: jchampion
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1770673 13f79535-47bb-0310-9956-ffa450edef68
      6c41094a
    • Jim Jagielski's avatar
      Merge r1698334 from trunk: · 26ae36eb
      Jim Jagielski authored 
      Avoid adding duplicate subequest filters, as they would not be stripped
properly during an ap_internal_fast_redirect.


Submitted by: covener
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1770672 13f79535-47bb-0310-9956-ffa450edef68
      26ae36eb
  3. 20 Nov, 2016 1 commit
  5. 19 Nov, 2016 3 commits
  7. 17 Nov, 2016 2 commits
  9. 16 Nov, 2016 1 commit
  11. 15 Nov, 2016 4 commits
  13. 14 Nov, 2016 8 commits
  15. 13 Nov, 2016 2 commits
  17. 11 Nov, 2016 5 commits
  19. 10 Nov, 2016 2 commits
  21. 09 Nov, 2016 2 commits
  23. 07 Nov, 2016 1 commit
  25. 04 Nov, 2016 4 commits
  27. 03 Nov, 2016 1 commit