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

327 Commits

Author SHA1 Message Date
Jim Jagielski
c0492553bc Merge r683626, r685112 from trunk:
mod_dav_fs: Retrieve minimal system information about directory 
entries when walking a DAV fs, resolving a performance degradation on
Windows.

PR: 45464


* modules/dav/fs/repos.c (DAV_FINFO_MASK): Define macro.
  (dav_fs_walker): Use DAV_FINFO_MASK when stat'ing the 
  directory member during the walk.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@686395 13f79535-47bb-0310-9956-ffa450edef68
2008-08-15 22:12:47 +00:00
Ruediger Pluem
134f174983 Merge r644050 from trunk:
* Prevent a segfault if the destination URI of a copy / move operation is
  not under DAV control. Return 405 (Method not allowed) instead.

PR: 44734

Submitted by: rpluem
Reviewed by: rpluem, niq, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@660571 13f79535-47bb-0310-9956-ffa450edef68
2008-05-27 15:57:23 +00:00
Ruediger Pluem
7b70806f5d Merge r607466, r607472, r607838 from trunk:
mod_dav: Fix evaluation of If-Match * and If-None-Match * conditionals.
PR 38034
Patch by Paritosh Shah
Explanation by Werner Baumann

* Style police. No functional changes.

* Avoid SEGFAULT as hooks->set_headers can be NULL. Furthermore do not set the
  ETag header permanently as setting it may not be desired for all responses.

Submitted by: niq, rpluem
Reviewed by: niq, rpluem, chrisd


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@609113 13f79535-47bb-0310-9956-ffa450edef68
2008-01-05 09:45:07 +00:00
Jim Jagielski
c9b1d06d54 http://svn.apache.org/viewvc?rev=606693&view=rev
http://svn.apache.org/viewvc?rev=607276&view=rev



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@608192 13f79535-47bb-0310-9956-ffa450edef68
2008-01-02 19:26:59 +00:00
Ruediger Pluem
45d8e798d6 Merge r607437 from trunk:
* Adjust etag generation to produce identical results on 32-bit and 64-bit
  platforms and avoid a regression with conditional PUT's on lock and etag.

  Add a warning to the documentation of FileETAG that changes of the ETAG
  format can cause conditionals to fail on mod_dav_fs provided backends.

PR: 44152
Submitted by: Michael Clark <michael metaparadigm.com>
eviewed by: rpluem, niq, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@608059 13f79535-47bb-0310-9956-ffa450edef68
2008-01-02 09:41:46 +00:00
Ruediger Pluem
0ed9165497 Merge 557837, 557972 from trunk:
Multiple trivial fixes from Christophe JAILLET
PR 38699, 39518, 42005, 42006, 42007, 42008, 42009
The patches are all his, and are sufficiently trivial to review
at a glance.

Fix clash between r557837 and r427780

PR: 38699, 39518, 42005, 42006, 42007, 42008, 42009
Submitted by: Christophe Jaillet <christophe.jaillet wanadoo.fr>
Reviewed by: rpluem, trawick, niq


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@599569 13f79535-47bb-0310-9956-ffa450edef68
2007-11-29 20:21:10 +00:00
William A. Rowe Jr
cb12933ef1 Sync build changes, current to r569249, modulo those modules which
don't correpond between 2.3-dev and 2.2.

Introduces ALL=1 flag that will cause the modules which are only
interesting to developers to be built.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@569261 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 06:00:44 +00:00
Guenter Knauf
0e8878ded1 removed obsolete -prefix; minor cosmetic changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@563191 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 17:01:03 +00:00
Bradley Nicholes
786636766c Implement a BASEDIR build environment variable to allow the NetWare build to relocate the install files
Submitted by: Guenter Knauf <fuankg apache org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@505572 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 23:59:15 +00:00
William A. Rowe Jr
003a033071 Add .manifest post-processing to the httpd build for users of VC 8
(Studio 2005, 'free' Express or full edition) command line builds.

Backports 495126, adjusted for debugging/debug path change between
trunk and 2.2 branch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495130 13f79535-47bb-0310-9956-ffa450edef68
2007-01-11 05:44:54 +00:00
William A. Rowe Jr
50d63a7fe6 Sync to httpd/trunk where we've reverted the /d "LONG_NAME=foo bar" syntax,
which confuses the ability of MS VS 6 to export makefiles.

  Also syncs the fix to some debug/release targets observed by hunter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@429039 13f79535-47bb-0310-9956-ffa450edef68
2006-08-05 20:19:08 +00:00
Roy T. Fielding
ae1748a99f update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 03:38:44 +00:00
William A. Rowe Jr
913de3b472 This resource /D syntax was pretty horridly imported into VS 2005,
change the quotation to ensure a peaceful transition to sln/vcproj files.

Backports: 397647

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@397651 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 21:51:48 +00:00
William A. Rowe Jr
967c94daee Remove all /machine:I386 references, these are getting in the way
of switching linkers from the x86 (default linker) to x64 or other
  possible target platforms.  (Also this commit cleans up lingering
  /GX switches from the 'BASE' options that are supposed to be unused.)

Backports: 397407

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@397649 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 21:47:41 +00:00
William A. Rowe Jr
9b1b56ab68 After appropriate time sitting on trunk, and some review by our
win32 builders, eliminate platform-specific use of 'awk' to create
  our .rc resources.  (Deliberately waited until a clean 2.2.2 was
  pulled from the branch.)  The end goal is to make building simpler
  for our 'free' VisualStudio 2005 Express users, to encourage more
  end users to explore the source code.  Eliminating thousands of
  lines of build-script is a nice side effect.

Backports: 395418

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396974 13f79535-47bb-0310-9956-ffa450edef68
2006-04-25 20:24:55 +00:00
Paul Querna
786089eef9 Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard to the copyright statements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68
2006-04-22 01:53:06 +00:00
William A. Rowe Jr
84871ce3fe Backport 395419, replace /GX win32 compile flag with /EHsc to match.
Reviewed by all active win32 contributors, and committed as an arch
  maintenance fix.  This permits Win32 VisualStudio 2005 users to build
  httpd without extranious 'deprectated option' emits.

Reviewed by: wrowe, colm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395961 13f79535-47bb-0310-9956-ffa450edef68
2006-04-21 17:47:19 +00:00
Colm MacCarthaigh
8ffd8c554b Update the last year of copyright for the 2.2.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395231 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:33:16 +00:00
Jim Jagielski
0f7b6563e8 Merge r345053 from trunk:
No functional change: remove "internal" tab spacing/formatting.



Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@345239 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 13:39:15 +00:00
Ruediger Pluem
7f0908da56 Merge r331041 from trunk:
* 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/branches/2.2.x@332657 13f79535-47bb-0310-9956-ffa450edef68
2005-11-11 22:29:31 +00:00
Jim Jagielski
b3181bddae No functional change: remove trailing whitespace. This also means
that "blank" lines, which had consisted of just spaces
and/or tabs are now truly blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332309 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:20:05 +00:00
Jim Jagielski
ec2468d2ae No functional change: detab all indenting to be consistent
with our formatting standards.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332307 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:15:41 +00:00
Joe Orton
a574d41e87 Merge r329562 from trunk:
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/branches/2.2.x@331600 13f79535-47bb-0310-9956-ffa450edef68
2005-11-07 21:29:16 +00:00
Colm MacCarthaigh
6eb63ce4ba Merge r239422 and r239423 from trunk; these are (long) casts to fix 64-bit
build warnings by asteinmetz. Tested on IA64, x64 and x86. 

Originally by: asteinmetz
Reviewed by: colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293305 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 11:06:04 +00:00
Colm MacCarthaigh
69b359cfdc Backport the Doxygen changes to the 2.2.x branch. No functional changes,
however backporting these doxygen fixes makes it significantly easier to diff
trunk and the 2.2.x branch, to sort out what's what. And we might as well
release with nicer doxygen markup.

Submitted by: Neale Ranns <neale ranns.org>
Reviewed by:  Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292540 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 20:44:53 +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
93e638300b Link to the correct socket library depending on which one is selected
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161791 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 19:54:33 +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
Joe Orton
34cdcdfde8 * modules/dav/fs/lock.c (dav_fs_refresh_locks): Fix SEGV on refresh of
indirect lock.

PR: 31183


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105100 13f79535-47bb-0310-9956-ffa450edef68
2004-09-12 22:24:05 +00:00
Joe Orton
176d3378b2 * modules/dav/fs/lock.c (dav_size_indirect): Fix indirect lock record
handling on 64-bit platforms: use correct size of apr_datum_t.dsize
field.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105099 13f79535-47bb-0310-9956-ffa450edef68
2004-09-12 22:14:57 +00:00
Bradley Nicholes
611952767a Eliminate the redundant compiler rules
Submitted by: Guenter Knauf <fuankg@apache.org>, Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103816 13f79535-47bb-0310-9956-ffa450edef68
2004-06-01 17:48:21 +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
77555ba72e Fix the XLFLAGS define in the NetWare makefiles so that the contents are added to the _link.opt file rather than the _link.def file
Submitted by: Guenter Knauf <gk@gknw.net>, Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103544 13f79535-47bb-0310-9956-ffa450edef68
2004-04-28 20:40:22 +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
Jeff Trawick
77b387e14b mod_dav: Fix a problem that could cause crashes when manipulating
locks on some platforms.

crashes seen on Sparc when the integer copied out of the database
was not aligned properly

also, sizeof(int) not necessarily sizeof(apr_size_t), so that could
be a concern; we copy in sizeof(apr_size_t field) so we should copy
out sizeof(apr_size_t field)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103027 13f79535-47bb-0310-9956-ffa450edef68
2004-03-19 02:32:25 +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
André Malo
4d651c4a11 repos.c: In function `dav_fs_copymove_file':
repos.c:315: warning: `perms' might be used uninitialized in this function


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102953 13f79535-47bb-0310-9956-ffa450edef68
2004-03-14 16:13:20 +00:00
Joe Orton
e44704a468 Fix litmus test copy_nodestcoll; 2518 requires that MKCOL MUST fail
with 409 on missing intermediates:

* modules/dav/fs/repos.c (dav_fs_create_collection): Give a 409 rather
than a 403 if apr_dir_make fails with ENOENT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102946 13f79535-47bb-0310-9956-ffa450edef68
2004-03-13 12:56:47 +00:00
Joe Orton
087d576ab8 Forward-port from mod_dav 1.0: maintain the {DAV:}executable property
across COPY and MOVE:

* modules/dav/fs/repos.c (dav_fs_copymove_file): Take src_info,
dst_info arguments and set permissions on dst if necessary.
(dav_fs_copymove_state, dav_fs_copymove_walker,
dav_fs_copymove_resource): Update accordingly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102945 13f79535-47bb-0310-9956-ffa450edef68
2004-03-13 12:52:04 +00:00
Joe Orton
b40d18f81a * modules/dav/fs/repos.c (MAP_IO2HTTP): New macro.
(dav_fs_copymove_file): Use it to give a 507 if open() returns ENOSPC,
and use it to handle apr_file_write_full() return code.
(dav_fs_open_stream): Use MAP_IO2HTTP.
(dav_fs_create_collection): Use APR_STATUS_IS_ENOSPC.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102944 13f79535-47bb-0310-9956-ffa450edef68
2004-03-12 18:06:55 +00:00
Joe Orton
af018fda00 * modules/dav/fs/repos.c (dav_fs_copymove_file): Update for the fact
that apr_file_read() has guaranteed len == 0 at EOF for a looong time;
and avoid a redundant call to write(,,0) when EOF is reached.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102934 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 14:32:00 +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