1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-25 10:59:28 +03:00
Commit Graph

230 Commits

Author SHA1 Message Date
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
Jim Jagielski
5d2fae4818 No functional change: simple detabbing of indented code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:05:51 +00:00
Ruediger Pluem
7ab2d56e75 * Fix a null pointer dereference in dav_method_mkcol during the handling of
errors from dav_auto_checkin.

Submitted by: Ghassan Misherghi <ghassanm ucdavis.edu>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@331041 13f79535-47bb-0310-9956-ffa450edef68
2005-11-05 22:37:30 +00:00
Joe Orton
d451ccc45a Fix handling of unknown state tokens in If headers:
* modules/dav/main/mod_dav.h: Add dav_if_unknown to dav_if_state_type
enum.

* modules/dav/main/util.c (dav_add_if_state): Set returned type to
dav_if_unknown for an unknown state token.
(dav_validate_resource_state): Evaluate dav_if_unknown to fail
match unless in a Not condition.

PR: 37288


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@329562 13f79535-47bb-0310-9956-ffa450edef68
2005-10-30 13:25:28 +00:00
Ian Holsman
8c1e315d3f Doxygen fixup / cleanup
submited by: Neale Ranns neale ranns.org
reviewed by: Ian Holsman



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 23:03:59 +00:00
Andreas Steinmetz
727af3e82b fix 64bit build warnings in modules/dav
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239422 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 15:45:00 +00:00
William A. Rowe Jr
20d06d7a06 Reintroduce stack frame construction with /Oy- (removal was implied by /O2).
This makes binaries far easier to debug, during operation and for post-crash
  .dmp analysis.  Do not alter /Gs optimizations per brane.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +00:00
Bradley Nicholes
ac399ec581 Update the NetWare dav.imp export/import file according to the DAV_DECLARE's in mod_dav.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160907 13f79535-47bb-0310-9956-ffa450edef68
2005-04-11 15:45:12 +00:00
Bradley Nicholes
0deb91474f Update the mod_dav import file for NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160636 13f79535-47bb-0310-9956-ffa450edef68
2005-04-08 23:03:45 +00:00
Justin Erenkrantz
427bc9ae45 * modules/dav/main/mod_dav.h: Wrap all public functions in
DAV_DECLARE or DAV_DECLARE_NONSTD.
* modules/dav/main/liveprop.c, modules/dav/main/props.c,
  modules/dav/main/util_lock.c, modules/dav/main/mod_dav.c,
  modules/dav/main/std_liveprop.c, modules/dav/main/util.c:
  Update function definitions.

Submitted by: Branko Čibej <brane xbc.nu>
Reviewed by:  Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155345 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 16:57:14 +00:00
Sander Striker
8062861efc Improve interaction with caches in mod_dav.
* modules/dav/main/mod_dav.c

  (dav_method_get): Check for conditionals.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153754 13f79535-47bb-0310-9956-ffa450edef68
2005-02-14 09:46:19 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
William A. Rowe Jr
d962fcfc8b FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME!
Bumped mmn, and ap module cookie, for this function rename.

  It's not a deprecation, as ap_http_method would be a lovely function
  name sometime in the future: to determine what the function name implies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 05:33:44 +00:00
Bradley Nicholes
804ff9ab22 Allow APR to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
2004-11-30 00:12:39 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
André Malo
2aa48e4f1a use new apr_strtoff function to parse PUT ranges correctly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103762 13f79535-47bb-0310-9956-ffa450edef68
2004-05-25 17:13:07 +00:00
Joe Orton
af2d2b8edd * modules/dav/main/mod_dav.c (dav_method_put): Fix segfault
in auto-versioning error handling path.

PR: 29148


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103723 13f79535-47bb-0310-9956-ffa450edef68
2004-05-21 20:42:56 +00:00
Bradley Nicholes
db33072ca4 Fix up the DAV import/export files for the NetWare build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103540 13f79535-47bb-0310-9956-ffa450edef68
2004-04-28 17:59:12 +00:00
Joe Orton
56c15784a0 Forward-port from mod_dav 1.0:
* modules/dav/main/util.c (dav_validate_resource_state): Fix a 2617
violation: if the lock user validation fails, rather than giving a 401
without a WWW-Authenticate header, give a 403.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102958 13f79535-47bb-0310-9956-ffa450edef68
2004-03-14 19:51:08 +00:00
Joe Orton
3f4721a9b6 * modules/dav/main/mod_dav.c (dav_finish_multistatus): New function;
factored out, sends an EOS bucket after the response body.
(dav_send_multistatus, dav_method_propfind): Use it.

[might be related to PR 27576 if there is a real issue described
there]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102933 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 13:46:48 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:31:03 +00:00
André Malo
d80ff9c3b9 apply Apache License, version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102523 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:13:20 +00:00
Joe Orton
d102daa563 * modules/dav/main/mod_dav.c (dav_handler): Reject request if the
Request-URI includes a fragment part, i.e. an unescaped #.

PR: 21779
Submitted by: Amit Athavale <amit_athavale@lycos.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102224 13f79535-47bb-0310-9956-ffa450edef68
2004-01-08 13:08:57 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
Jeff Trawick
07e907f0c2 stop using apr_sockaddr_port_get() accessor function, as it will
disappear from APR 1.0 API shortly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101991 13f79535-47bb-0310-9956-ffa450edef68
2003-12-05 00:59:29 +00:00
Joe Orton
7fa53b9905 * modules/dav/main/mod_dav.c (dav_method_copymove): For a 401 on the
destination resource, propagate the WWW-Auth header from the
subrequest back to the client.

PR: 15571


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101885 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 14:17:55 +00:00
Joe Orton
c5503f14e4 * modules/dav/main/util.c (dav_validate_resource_state): Simplify weak
etag comparison to avoid unnecessary tests and pstrdup calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101884 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 13:54:39 +00:00
Cliff Woolley
aaf0424e2b get rid of _FOREACH
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101788 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 02:09:14 +00:00
André Malo
ab054b39d8 drop the test, whether apr_brigade_create returns NULL. It does never
(dumps core instead :-)

Submitted by: Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100924 13f79535-47bb-0310-9956-ffa450edef68
2003-08-06 21:38:58 +00:00
André Malo
1bb1108f02 use bucket brigades directly when reading PUT data. This avoids
problems with content-length-modifying input filter (like deflate).

PR: 22104
Some stuff submitted by: tim@robbins.dropbear.id.au (Tim Robbins)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100919 13f79535-47bb-0310-9956-ffa450edef68
2003-08-06 14:46:48 +00:00
Greg Stein
f756385b6d Switch ap_filter_flush() to ap_pass_brigade(). This removes a layer of
function calls, provides type safety for the ap_filter_t*, and
clarifies what is really going on (i.e. we aren't sending a FLUSH
bucket of any kind).

* mod_dav.c (dav_send_multistatus, dav_method_propfind): change the
    ap_filter_flush call to ap_pass_brigade; flip the params to match
    the prototype.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100647 13f79535-47bb-0310-9956-ffa450edef68
2003-07-16 06:31:53 +00:00
Greg Stein
9301426b12 Have mod_dav deal with errors that happen during a streamy provider
response.

* mod_dav.c (dav_method_propfind, dav_method_report): if the dav
    provider throws an error in the middle of streaming a response,
    have mod_dav log an error and abort the connection.

Submitted by: Ben Collins-Sussman <sussman@collab.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100309 13f79535-47bb-0310-9956-ffa450edef68
2003-06-19 21:24:10 +00:00
Greg Stein
9b429aa007 Fix a crasher introduced on June 3.
* mod_dav.c (dav_method_propfind): the PROPFIND request might not have
    a body. Therefore, we cannot dereference 'doc' unconditionally.
    Test it to decide what to pass on to dav_begin_multistatus().

Submitted by: Ben Collins-Sussman <sussman@collab.net>,
              David Waite <mass@akuma.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100308 13f79535-47bb-0310-9956-ffa450edef68
2003-06-19 21:21:15 +00:00
Greg Stein
97a278f1b3 mod_dav improvement: make dav_method_propfind stream its response,
rather than cache every <response> object and send the whole 207 at once.

Note:  this patch doesn't affect the mod_dav provider API at all.
Providers still return property results in text-buffers, but mod_dav
then streams them out immediately.

Submitted by: Ben Collins-Sussman <sussman@collab.net>
Reviewed by: gstein, jerenkrantz, sander

* mod_dav.h (dav_walker_ctx): add a brigade field and a scratchpool field.

* mod_dav.c (dav_send_one_response): new helper function to write a
    <DAV:response> into a brigade/filter.  this code has been factorized
    out of dav_send_multistatus.

  (dav_begin_multistatus): new factorized helper func; creates brigade
    and sends initial <multistatus> tag.

  (dav_send_multistatus): create brigade, call dav_begin_multistatus,
    and switch all ap_rputs calls to ap_fputs instead.  call
    dav_send_one_response when looping over response list.  use a
    subpool when iterating.

  (dav_method_propfind): initialize walker ctx's brigade.  initialize
    ctx's scratchpool as a subpool of r->pool.  Send a <multistatus> tag
    before calling the provider's walk() function, and a </multistatus>
    tag afterwards.

  (dav_stream_response): new function, originally based on
    dav_add_repsonse.  don't build linked list of responses in memory;
    just spew each response object into the brigade via
    dav_send_one_response().  take an incoming pool argument to do the
    temporary allocation and streaming.

  (dav_propfind_walker): pass ctx->scratchpool to dav_stream_response,
    and clear the pool when finished.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100164 13f79535-47bb-0310-9956-ffa450edef68
2003-06-03 22:09:24 +00:00
Sander Striker
a9008cf3d1 mod_dav providers define a 'can_be_activity' callback. Unfortunately,
mod_dav isn't calling it before creating an activity.  This is a
required precondition (along with the resource not existing), as
defined in the deltaV RFC (3253), section 13.5.

* mod_dav.c (dav_method_make_activity): if available, call provider's
  'can_be_activity' callback as a precondition to making an activity.

Submitted by: Ben Collins-Sussman <sussman@apache.org>
Reviewed by: Sander Striker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99966 13f79535-47bb-0310-9956-ffa450edef68
2003-05-20 23:09:00 +00:00
Justin Erenkrantz
789fab44ab Fix a typo in the weak entity check. The prefix is W/" not "W/.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99524 13f79535-47bb-0310-9956-ffa450edef68
2003-04-22 21:52:46 +00:00
William A. Rowe Jr
281948b722 After discussions at length on dev@apr/httpd, it is determined that
the older .dbg format symbols are not worth the interference with
  generating complete .pdb symbolic debugging databases.

  This patch further eliminates pdbtype:sept flags that interfere with
  deciphering local symbols and type information.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98970 13f79535-47bb-0310-9956-ffa450edef68
2003-03-11 00:58:59 +00:00
William A. Rowe Jr
25ac108fe2 After consultations on the APR list, it was decided that /map files are
fairly redundant when you retain rich .pdb debugging symbol files.  We
  have rarely used them, and generally .dbg and .pdb files prove much more
  useful for the cases we have.

  While eliminating /map files, we are also shrinking the size of the .dbg
  files by stripping 'private' symbol information.  Really this means less
  rich diagnostics from Dr. Watson on NT or Win9x when they query the .dbg
  symbols in creating a DrWatson log file.  But it's more than compensated
  for on newer OS'es where Dr. Watson will query the .pdb symbols, on all
  Win32 flavors when WinDbg is used with the .pdb symbols, and the fact that
  the distribution of binary symbols will use less bandwidth when less
  information is duplicated from the .pdb format into the .dbg files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98743 13f79535-47bb-0310-9956-ffa450edef68
2003-02-20 15:56:04 +00:00
William A. Rowe Jr
e8c0a9532f foo.dbgmark turned out to be the same 8.3 name as foo.dbg itself, which
was badness.  Twist this puppy to .dbr, the only name I could invent that
  doesn't look like any database file extension I recall.

  It stands for .dbg rebased.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98712 13f79535-47bb-0310-9956-ffa450edef68
2003-02-18 22:07:21 +00:00
William A. Rowe Jr
a45632ba37 *) Introduce debugging symbols for Win32 release builds, both .pdb
and .dbg files (older debuggers and Dr. Watson-type utilities
     on WinNT or Win9x don't support the newer .pdb flavor.)
     [Allen Edwards, William Rowe]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98596 13f79535-47bb-0310-9956-ffa450edef68
2003-02-07 21:30:53 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
Jeff Trawick
025381a544 fix misuse of const in a recent commit
warnings with recent gcc
compile break with native compiler for AIX


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98557 13f79535-47bb-0310-9956-ffa450edef68
2003-01-31 14:13:28 +00:00
Justin Erenkrantz
9c18a024fe Allow mod_dav to do weak entity comparison function rather than a strong
entity comparison function.  (i.e. it will optionally strip the W/ prefix.)

PR: 14921 (kinda, but not really)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98536 13f79535-47bb-0310-9956-ffa450edef68
2003-01-29 17:24:38 +00:00
Justin Erenkrantz
6e09bb02b3 Fix If header parsing when a non-mod_dav lock token is passed to it. We'll
now just skip over it rather than aborting.

PR: 16452


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98524 13f79535-47bb-0310-9956-ffa450edef68
2003-01-29 05:07:18 +00:00
Justin Erenkrantz
a060c926d5 Missed a word in a comment.
Bah.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98475 13f79535-47bb-0310-9956-ffa450edef68
2003-01-23 18:03:33 +00:00
Justin Erenkrantz
6dace5aad8 Create a subpool when we open the propdb, but we can't clear it until the rest
of the lifetime issues within mod_dav are straightened out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98474 13f79535-47bb-0310-9956-ffa450edef68
2003-01-23 17:59:20 +00:00
William A. Rowe Jr
b67d127829 Catch up with the changes to apr/build/win32ver.awk and name all loadable
httpd modules as .so, internally.  Credit to Mladen Turk for identifing
  the issue.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98380 13f79535-47bb-0310-9956-ffa450edef68
2003-01-20 19:52:30 +00:00
Greg Stein
60c41ddef3 When unlocking, the auto-checkin code does not need to refer to the
parent resource. We want to (possibly) check in only the resource
identified by the params.

Bug found by David Waite <mass@akuma.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98187 13f79535-47bb-0310-9956-ffa450edef68
2003-01-07 21:08:03 +00:00
Justin Erenkrantz
1efa9fe703 Per Greg's request, add a version string component to the ap_provider.h
functions.  This allows modules to register different versions of the
same provider.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97696 13f79535-47bb-0310-9956-ffa450edef68
2002-11-30 18:48:41 +00:00
William A. Rowe Jr
7687370549 Detabbify. With extreme prejudice.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97342 13f79535-47bb-0310-9956-ffa450edef68
2002-10-29 06:16:42 +00:00