Skip to content
GitLab
  1. 30 Apr, 2013 3 commits
    • Jim Jagielski's avatar
      Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214,... · 9580a375
      Jim Jagielski authored 
      Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214, r1406760, r1418648 from trunk:

Update transformations.


syntax for mod_b*.xml and mod_c*.xml

mod_cache_socache: New cache implementation backed by mod_socache
that replaces mod_mem_cache removed from httpd v2.2.


Windows build for mod_cache_socache added in r1388660


Fix the return values on mod_cache_socache's store_headers() implementation
to return APR errors codes and not DECLINED. We are committed to using this
implementation by this point, and any error should force us to stand down.
Submitted by: trawick
Reviewed by: minfrin


Apply proper APLOGNO codes for mod_cache_socache.


Added mod_cache_socache to NetWare build.


* Ensure that nkey is initialized.

mod_cache_socache: Don't clean up too soon. If we do, revalidated requests
lose their bodies.

Submitted by: minfrin, humbedooh, minfrin, gsmith, minfrin, minfrin, fuankg, rpluem, minfrin
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477652 13f79535-47bb-0310-9956-ffa450edef68
      9580a375
    • Jim Jagielski's avatar
      Merge r1465116 from trunk: · 72d818c5
      Jim Jagielski authored 
      htpasswd: Add -v option to verify a password

htpasswd and htdbm could use some more refactoring...

Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477651 13f79535-47bb-0310-9956-ffa450edef68
      72d818c5
    • Jim Jagielski's avatar
      Merge r1387603, r1388029, r1420124, r1421288, r1421912, r1422943, r1422980,... · e49a8c9c
      Jim Jagielski authored 
      Merge r1387603, r1388029, r1420124, r1421288, r1421912, r1422943, r1422980, r1430575, r1439404 from trunk:

wtf are we doing merging in these from the parent??
These are server specific!


OK, enable/allow previous broken, bad behavior iff the user
really, really wants it. And warn that b-m isn't recommended
in those cases.

rjung's suggestions...

inherit inherit


Use inherit_set to let the global server set
the default for all vhosts.

Otherwise inherit would need to be disabled
redundantly in each vhost.


restrict inherit control to those fields that "require" it...

Redfine - we are just worried about balancers and workers, so have the directive clear about that.

Naming


ProxyPassInherit directive
Submitted by: jim, rjung, jim, jim, jim, jim
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477649 13f79535-47bb-0310-9956-ffa450edef68
      e49a8c9c
  3. 27 Apr, 2013 5 commits
  5. 26 Apr, 2013 4 commits
  7. 15 Apr, 2013 1 commit
  9. 09 Apr, 2013 3 commits
  11. 11 Mar, 2013 1 commit
  13. 27 Feb, 2013 1 commit
  15. 26 Feb, 2013 1 commit
  17. 18 Feb, 2013 4 commits
  19. 12 Feb, 2013 1 commit
  21. 06 Feb, 2013 2 commits
  23. 27 Jan, 2013 1 commit
  25. 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
  27. 21 Jan, 2013 2 commits
  29. 15 Jan, 2013 1 commit
  31. 13 Jan, 2013 2 commits
  33. 10 Jan, 2013 1 commit
  35. 09 Jan, 2013 2 commits
  37. 08 Jan, 2013 2 commits
    • Jim Jagielski's avatar
      Merge r1331110 from trunk: · 9f19cf21
      Jim Jagielski authored 
      Replace use of apr_file_write() with apr_file_write_full() to prevent
incomplete writes.

Add comments in some places where error handling/logging is missing.

PR: 53131.
Submitted by: Nicolas Viennot <apache viennot biz>, Stefan Fritsch

Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1430514 13f79535-47bb-0310-9956-ffa450edef68
      9f19cf21
    • Jim Jagielski's avatar
      Merge r1422937 from trunk: · eeec9bc7
      Jim Jagielski authored 
      ab: add the possibility to define a socket timeout (-s timeout)
[Guido Serra <zeph fsfe org>]

Also some changes In usage():
- reword -t option to be more clear with the new -s
- add missing -q
- add the new -s option
- reword some options to better match online documentation

ab.xml claimed that -s was already there, but nothing in the code looks like that.
So, I guess it only landed on the online doc...
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1430300 13f79535-47bb-0310-9956-ffa450edef68
      eeec9bc7