Skip to content
GitLab
  1. 12 Feb, 2013 1 commit
  3. 06 Feb, 2013 2 commits
  5. 27 Jan, 2013 1 commit
  7. 22 Jan, 2013 3 commits
    • Jim Jagielski's avatar
      Merge r1387110, r1387444, r1387979, r1387607, r1387693, r1407085, r1421953 from trunk: · f6fbd867
      Jim Jagielski authored 
      Persist local balancer-manager changes across restart/graceful.


Use identifying server_rec info when we know we have
unique and useful data :)


fix clang warning (dead initialization)


Log whether or not the restore from shm actually
resulted in a match of shm data, or whether it
was stale.


and this one as well... persist isn't inherited


better logging for re-use/use of shm

Allow for searching w/i shm slots for a specific worker and balancer
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1436919 13f79535-47bb-0310-9956-ffa450edef68
      f6fbd867
    • Jim Jagielski's avatar
      Merge r1392120, r1392122, r1392150 from trunk: · f9ea653b
      Jim Jagielski authored 
      Fix shell errors when trying to AC_MSG_RESULT() for --with-module.
(The change to IFS hosed any AC_MSG_foo() invocations.)

It is easy enough to reorder the reset of IFS and the AC_MSG_RESULT()
invocation, but there's a big stretch of shell code where AC_MSG_foo()
might be useful someday, so get rid of the commas at the start and
leave IFS alone and AC_MSG_foo() at will.


fix bug in r1392120: replace ALL commas

--with-module: Fix failure to integrate them into some existing
module directories.

modules/config?.m4 needs to run after the modules/*/config?.m4.
Otherwise, modules.mk as created for --with-module gets wiped
out first.

PR: 40097

Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1436908 13f79535-47bb-0310-9956-ffa450edef68
      f9ea653b
    • Joe Orton's avatar
      Merge 1436401 from trunk: · c37e15eb
      Joe Orton authored 
      * support/htcacheclean.c (main): Ensure -p was used before attempting
  to process URL arguments.

Reviewed by: jorton, rpluem, rjung


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1436846 13f79535-47bb-0310-9956-ffa450edef68
      c37e15eb
  9. 21 Jan, 2013 2 commits
  11. 15 Jan, 2013 1 commit
  13. 13 Jan, 2013 2 commits
  15. 10 Jan, 2013 1 commit
  17. 09 Jan, 2013 2 commits
  19. 08 Jan, 2013 3 commits
  21. 01 Jan, 2013 1 commit
  23. 17 Dec, 2012 2 commits
  25. 16 Dec, 2012 4 commits
  27. 14 Dec, 2012 1 commit
  29. 11 Dec, 2012 4 commits
    • Jim Jagielski's avatar
      Merge r1392345, r1392346 from trunk: · c3eaa8b1
      Jim Jagielski authored 
      Bring XML output up to snuff for balancer-manager

and allow the xml param
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420135 13f79535-47bb-0310-9956-ffa450edef68
      c3eaa8b1
    • Rainer Jung's avatar
      Start refactoring of htpasswd and htdbm · 46bd8d94
      Rainer Jung authored 
      - Move many common code parts into separate source file. This adds some
  of htpasswd's recent improvements to htdbm.
- Rework salt generation to use the full 48bit of entropy for MD5
  Previously, it would only generate 2^32 different salts on a given
  platform.
- Use apr_getopt().
Submitted by: sf
Backport of r1395253 from trunk.

Add passwd_common.c build support for Windows and Netware
Submitted by: sf
Backport of r1395254 from trunk.

Add support for bcrypt (requires apr-util 1.5 or higher).
PR: 49288
Submitted by: sf
Backport of r1395255 from trunk.

Optionally read passwords from stdin as more secure alternative to -b.
PR: 40243
Submitted by: Adomas Paltanavicius <adomas paltanavicius gmail com>, sf
Backport of r1395256 from trunk.
Submitted by: Adomas Paltanavicius <adomas paltanavicius gmail com>, sf

Removed __func__ usage which is c99.
Submitted by: sf
Backport of r1395792 from trunk.

All of the above backported by: sf
All of the above reviewed by: sf, gsmith, rjung

fix unresolved external symbol __imp__UuidCreate error
Submitted by: gsmith
Backported by: gsmith
Reviewed by: gsmith, rjung
Backport of r1419084 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420084 13f79535-47bb-0310-9956-ffa450edef68
      46bd8d94
    • Rainer Jung's avatar
      mod_auth_form: Support the expr parser in the · 802a2a41
      Rainer Jung authored 
      AuthFormLoginRequiredLocation, AuthFormLoginSuccessLocation
and AuthFormLogoutLocation directives.

mod_auth_form: Make sure 500 Internal Server Error is
returned should an error occur while parsing an expression.

Submitted by: minfrin
Backported by: minfrin
Reviewed by: minfrin, sf, rjung

Backports of r1388648 and r1418721 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420071 13f79535-47bb-0310-9956-ffa450edef68
      802a2a41
    • Rainer Jung's avatar
      Add support for TLS-SRP (Secure Remote Password key exchange · 2edb79a3
      Rainer Jung authored 
      for TLS, RFC 5054).
Including some improvements as suggested by Kaspar

PR: 51075
Submitted by: Quinn Slack <sqs cs stanford edu>, Christophe Renou,
              Peter Sylvester
Backported by: sf
Reviewed by: sf, minfrin, rjung

Backports of r1347980 and r1348653 form trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420057 13f79535-47bb-0310-9956-ffa450edef68
      2edb79a3
  31. 09 Dec, 2012 4 commits
  33. 06 Dec, 2012 1 commit
  35. 04 Dec, 2012 3 commits
  37. 03 Dec, 2012 2 commits