Skip to content
  1. May 31, 2018
    • Christophe Jaillet's avatar
      Fix typo · 36dee519
      Christophe Jaillet authored
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832644 13f79535-47bb-0310-9956-ffa450edef68
      36dee519
    • Joe Orton's avatar
      Merge r1769718, r1785943, r1786110, r1786119 from trunk: · 9e419e1c
      Joe Orton authored
      add an <IfFile> config section like <IfDefine>
      
      It allows a non httpd config file to be used as a marker directly in
      httpd.conf without hiding logic in a script in front of apachectl
      to do test -f and pass extra -D's.
      
      This is something we've had in IBM's httpd distro for a little bit and
      hadn't remembered to share. I've seen some questions/config files come
      up in a few places lately that would benefit from this as an option.
      
      Remove duplicate implementations of conditional section function.  No
      functional change.
      
      * server/core.c (start_cond_section): Factor out from start_if*.
        Adjust to use apr_strmemdup.
        (test_ifmod_section, test_iffile_section, test_ifdefine_section):
        Move container-specific tests into callbacks from start_if*.
        (core_cmds): Adjust <IfFile, <IfDefine, <IfModule to use
        start_cond_section with callbacks.
      
      Add <IfDirective> and <IfSection>:
      
      * server/core.c
        (test_ifdirective_section, test_ifsection_section): New callbacks.
        (core_cmds): Define new directives.
      
      * include/http_config.h, server/config.c (ap_exists_directive):
        New function.
      
      * include/ap_mmn.h: Bump MMN minor for above.
      
      * docs/manual/mod/core.xml: Add docs.
      
      * server/core.c (start_cond_section): Comment & variable name fixes,
        no functional change.
      
      Submitted by: covener, jorton
      Reviewed by: jorton, ylavic, covener
      
      
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832623 13f79535-47bb-0310-9956-ffa450edef68
      9e419e1c
    • Jim Jagielski's avatar
      Add in userland change notice · 178e3f40
      Jim Jagielski authored
      
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832612 13f79535-47bb-0310-9956-ffa450edef68
      178e3f40
    • Jim Jagielski's avatar
      Merge r1828890, r1832500 from trunk: · fd40a2da
      Jim Jagielski authored
      mod_proxy_balancer: Add hot spare member type and corresponding flag (R). Hot spare members are
      used as drop-in replacements for unusable workers in the same load balancer set. This differs
      from hot standbys which are only used when all workers in a set are unusable. PR 61140.
      
      
      mod_proxy_balancer: follow up to r1828890: indentation and 80 col.
      
      
      Submitted by: jhriggs, ylavic
      Reviewed by: jhriggs, jim, ylavic
      
      
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832609 13f79535-47bb-0310-9956-ffa450edef68
      fd40a2da
  2. May 30, 2018
    • Jim Jagielski's avatar
      Merge r1341905, r1342065, r1341930, r1345147, r1344712, r1814465 from trunk: · 40bb4ca3
      Jim Jagielski authored
      suexec: Add support for logging to syslog as an alternative to a
      logfile.
      
      * support/suexec.c (err_output) [AP_LOG_SYSLOG]: Log to syslog.
        (main): Close syslog fd if open, before execv.  Add -V output
        for AP_LOG_SYSLOG.
      
      * configure.in: Add --with-suexec-syslog argument; allow
        --without-suexec-logfile to omit definition of AP_LOG_EXEC.
      
      
      suexec: Support use of setgid/setuid capability bits on Linux, a
      weaker set of privileges than the full setuid/setgid root binary.
      
      * configure.in: Add --enable-suexec-capabilites flag.
      
      * Makefile.in: If configured, use setcap instead of chmod 7555 on
        installed suexec binary.
      
      * modules/arch/unix/mod_unixd.c (unixd_pre_config): Drop test for
        setuid bit if capability bits are used.
      
      * docs/manual/: Add docs.
      
      
      * docs/manual/suexec.html.en: Update for syslog logging.
      
      
      * configure.in: Correct handling of --with-suexec-logfile in r1341905,
        thanks to rpluem.
      
      
      * support/suexec.c: Define AP_LOG_FACILITY.
        (err_output): Use AP_LOG_FACILITY for syslog facility.
      
      Suggested by: kbrand
      
      
      * configure.in: Fix help text for --with-suexec-syslog.
      
      Submitted by: jorton
      Reviewed by: jorton, ylavic, jim
      
      
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832565 13f79535-47bb-0310-9956-ffa450edef68
      40bb4ca3
  3. May 29, 2018
  4. Apr 26, 2018
  5. Apr 18, 2018
  6. Apr 09, 2018
  7. Mar 26, 2018
  8. Mar 24, 2018
  9. Mar 23, 2018
  10. Mar 20, 2018
  11. Mar 17, 2018
  12. Mar 15, 2018
  13. Mar 10, 2018
  14. Mar 09, 2018
    • Joe Orton's avatar
      Merge r1617913 from trunk: · e4de5adb
      Joe Orton authored
      * support/ab.c: Fix crash caused by integer overflow when printing stats with
      lot of requests (for example -n 500000000).
      
      Submitted by: jkaluza
      Reviewed by: jorton, jim, ylavic
      
      
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826310 13f79535-47bb-0310-9956-ffa450edef68
      e4de5adb
    • Joe Orton's avatar
      Merge r1667676, r1826207 from trunk: · cc6357f0
      Joe Orton authored
      * mod_access_compat, mod_authz_host: Handle '#' character.
      For mod_access_compat, disable '#' in hostname completely.
      For mod_authz_host, treat '#' as a comment and ignore everything after that.
      This allows better handling of admin errors like
      'Require host localhost# Add example.com later'.
      
      * modules/aaa/mod_authz_host.c (host_check_authorization): Simplify
        comment stripping in "Require host"; log a warning if a comment is
        used in 'Require host', or an error if the expression is empty with
        the comment stripped. (Currently in 2.4, #comment part is parsed)
      
      Submitted by: jkaluza, jorton
      Reviewed by: jorton, jim, ylavic
      
      
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826309 13f79535-47bb-0310-9956-ffa450edef68
      cc6357f0