Google Git
Sign in
apache / httpd / refs/heads/2.2.x-merge-http-strict
commit478b3fe508349a7a3745611bff279e62cf9a39ac[log] [tgz]
authorJoe Orton <jorton@apache.org>Fri Feb 17 18:14:47 2017 +0000
committerJoe Orton <jorton@apache.org>Fri Feb 17 18:14:47 2017 +0000
tree6f20fa0211a0bc68b699159d02087c6e370d29a7
parentebd99cf87b9d869c541b08ac53e836e14b4d34a6 [diff]
Merge r1783440 from 2.2.x:

* server/core.c (merge_core_server_configs): Fix merging of
  HttpProtocolOptions from global to vhost context.

Reviewed by: jorton, wrowe, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1783441 13f79535-47bb-0310-9956-ffa450edef68
1 file changed
tree: 6f20fa0211a0bc68b699159d02087c6e370d29a7
  1. build/
  2. docs/
  3. include/
  4. modules/
  5. os/
  6. server/
  7. srclib/
  8. support/
  9. test/
  10. .gdbinit
  11. ABOUT_APACHE
  12. acinclude.m4
  13. Apache.dsw
  14. BuildAll.dsp
  15. BuildBin.dsp
  16. buildconf
  17. CHANGES
  18. config.layout
  19. configure.in
  20. emacs-style
  21. httpd.dep
  22. httpd.dsp
  23. httpd.mak
  24. INSTALL
  25. InstallBin.dsp
  26. LAYOUT
  27. libhttpd.dep
  28. libhttpd.dsp
  29. libhttpd.mak
  30. LICENSE
  31. Makefile.in
  32. Makefile.win
  33. NOTICE
  34. NWGNUmakefile
  35. README
  36. README-win32.txt
  37. README.platforms
  38. ROADMAP
  39. STATUS
  40. VERSIONING