Skip to content
  1. Nov 11, 2013
    • Jim Jagielski's avatar
      Merge r1529559, r1531505 from trunk: · 174380b1
      Jim Jagielski authored 
      Fix PR 55397: dav_resource->uri treated as an unparsed uri.

The change made for PR 54611 caused this field to be treated as
unescaped.  mod_dav_svn however, provided escaped URIs.  Essentially
breaking support for paths with non-URI safe characters in SVN.

Adjust the code so that dav_resource->uri is assumed to be escaped and
adjust mod_dav_fs so that it uses escaped URIs in this field.

* modules/dav/fs/repos.c
  (dav_fs_get_resource): Use the unparsed_uri to contruct the resource uri.

* modules/dav/main/mod_dav.c
  (dav_xml_escape_uri): Do not uri escape, just handle xml escaping.
  (dav_created): Assume that locn if provided is escaped.
  (dav_method_copymove, dav_method_bind): Use the unparsed_uri on the request
    when calling dav_created() to adjust to locn assuming it is escaped.

* modules/dav/main/mod_dav.h
  (dav_resource): Document that uri is escaped.


Followup to r1529559: mod_dav_fs: Fix encoding of hrefs in PROPFIND response.

Previous commit missed encoding the names of the children of the PROPFIND
request when the depth wasn't 0.

* modules/dav/fs/repos.c
  (dav_fs_append_uri): New function
  (dav_fs_walker): Use dav_fs_append_uri() and adjust length calculations to
    use the encoded length.


Submitted by: breser
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1540730 13f79535-47bb-0310-9956-ffa450edef68
      174380b1
    • Jim Jagielski's avatar
      Merge r1528718 from trunk: · fe79d791
      Jim Jagielski authored 
      mod_dav: Fix PR 55306.

Makes mod_dav no longer require that the lock token be provided when the
source of a COPY is locked.  The prior behavior was in violating of
RFC 4918 which says that the lock token is only required on resources
that may be modified by the method.

* modules/dav/main/mod_dav.h
  (DAV_VALIDATE_NO_MODIFY): New flag to be passed to dav_validate_* functions.

* modules/dav/main/mod_dav.c
  (dav_method_copymove): Use the new flag when calling dav_validate_request()
    on the COPY source.

* modules/dav/main/util.c
  (dav_validate_resource_state): Use the flag to decide to ignore if the lock
    token is not provided.

Submitted by: breser
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1540728 13f79535-47bb-0310-9956-ffa450edef68
      fe79d791
    • Jim Jagielski's avatar
      Merge r834378, r835046, r1040304, r1040373, r1090645, r1294306, r1509872,... · 058a25cd
      Jim Jagielski authored 
      Merge r834378, r835046, r1040304, r1040373, r1090645, r1294306, r1509872, r1308862, r1509875 from trunk:

enable support for ECC keys and ECDH ciphers.  Tested against
OpenSSL 1.0.0b3.  [Vipul Gupta vipul.gupta sun.com, Sander Temme]


* Use correct #ifndef's to compile again on openssl 0.9.8 and fix compiler
  warnings.

Noted by: sf


Removed unused var.


Stop warning, init should be an int.


Remove unused variable


Initialize EC temporary key on server startup, as for DH and
RSA. This fixes a race condition that could lead to a crash with threaded
MPMs.


Mention ECC support

Submitted by: sctemme, rpluem, fuankg, drh, sf, sf, sf, jim, sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1540727 13f79535-47bb-0310-9956-ffa450edef68
      058a25cd
    • Jim Jagielski's avatar
      Note T&R (possible) this week · 1ec5de16
      Jim Jagielski authored 
      
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1540725 13f79535-47bb-0310-9956-ffa450edef68
      1ec5de16
  3. Oct 30, 2013
  5. Oct 21, 2013
  7. Oct 20, 2013
  9. Oct 19, 2013
  11. Oct 16, 2013
  13. Oct 13, 2013
  15. Oct 03, 2013
  17. Sep 03, 2013
  19. Aug 21, 2013
  21. Aug 19, 2013
  23. Aug 16, 2013
  25. Aug 12, 2013
  27. Aug 10, 2013
  29. Aug 09, 2013
  31. Aug 08, 2013
  33. Aug 03, 2013
  35. Aug 02, 2013
  37. Jul 27, 2013
  39. Jul 26, 2013
  41. Jul 25, 2013