1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

318 Commits

Author SHA1 Message Date
Roy T. Fielding
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
William A. Rowe Jr
6df9b82d20 Revert Revision 397647
While it solves the studio 2005 (we desire this), it breaks
the studio 6 packaging (we require this).  Discussion on list
of practical solutions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419644 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 18:36:23 +00:00
Joe Orton
c13f8dd6eb * server/core.c (default_handler): Use apr_brigade_insert_file() to
append the file to the brigade.

* server/protocol.c (ap_send_fd),
modules/proxy/mod_proxy_http.c (spool_reqbody_cl), 
modules/cache/mod_mem_cache.c (recall_body),
modules/cache/mod_disk_cache.c (recall_body),
modules/mappers/mod_negotiation.c (handle_map_file),
modules/generators/mod_asis.c (asis_handler),
modules/dav/fs/repos.c [DEBUG_GET_HANDLER] (dav_fs_deliver),
modules/arch/win32/mod_isapi.c (ServerSupportFunction): Likewise.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@414238 13f79535-47bb-0310-9956-ffa450edef68
2006-06-14 13:16:29 +00:00
William A. Rowe Jr
b2820e8da8 This resource /D syntax was pretty horridly imported into VS 2005,
change the quotation to ensure a peaceful transition to sln/vcproj files.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397647 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 21:41:29 +00:00
William A. Rowe Jr
f65c47bd75 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).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397407 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 05:30:39 +00:00
William A. Rowe Jr
663687ae8e s|/GX |/EHsc | because they were always synonyms, and Visual Studio
2005 edition complains bitterly and loudly that /GX is deprecated.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395419 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 22:51:02 +00:00
William A. Rowe Jr
862d0e231e Remove a host of dependencies upon awk, using the same template for
nearly every .rc compilation (giving the output .res file a different
  name for each component).  Adds AP_SERVER_BASEPROJECT to ap_revision.h
  so we can display the proper name of "Apache HTTP Server" as opposed
  to AP_SERVER_BASEPRODUCT (which is, and should remain, simply "Apache"
  for the server string tokens.)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395418 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 22:47:49 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
Garrett Rooney
cb130c3e8f Clean up some code in mod_dav.
Submitted by: Dan Rall <dlr collab.net>

* modules/dav/main/mod_dav.c
  (dav_error_response, dav_error_response_tag): Remove redundant assignment
   of r->status_line which is handled by basic_http_header_check().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@377292 13f79535-47bb-0310-9956-ffa450edef68
2006-02-13 02:34:26 +00:00
Jim Jagielski
08c97ba290 No functional change: remove "internal" tab spacing/formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345053 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 16:31:25 +00:00
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
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
Bradley Nicholes
c7174f4244 Allow make files to create a cc.opt compiler options file per NLM rather than a single file per directory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102876 13f79535-47bb-0310-9956-ffa450edef68
2004-03-07 03:04:51 +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
82d5cc1737 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102556 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 11:30:29 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +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