Skip to content
  1. Apr 30, 2013
    • 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. Apr 27, 2013
  5. Apr 26, 2013
  7. Apr 15, 2013
  9. Apr 09, 2013
  11. Mar 11, 2013
  13. Feb 27, 2013
  15. Feb 26, 2013
  17. Feb 18, 2013
  19. Feb 12, 2013
  21. Feb 06, 2013
  23. Jan 27, 2013
  25. Jan 22, 2013
  27. Jan 21, 2013
  29. Jan 15, 2013
  31. Jan 13, 2013
  33. Jan 10, 2013
  35. Jan 09, 2013
  37. Jan 08, 2013
    • 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