1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

86 Commits

Author SHA1 Message Date
William A. Rowe Jr
7b2c62a74e Changes to respect the new apr bucket and brigade length types (either
apr_size_t for bucket lengths, or apr_off_t for aggregate brigade lengths.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89683 13f79535-47bb-0310-9956-ffa450edef68
2001-07-24 20:38:01 +00:00
William A. Rowe Jr
05fcc41a1f Update for latest structure changes for 2.0.21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89644 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 20:00:50 +00:00
William A. Rowe Jr
1501c81198 Remove last public vestigages of APR_INHERIT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89600 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 19:41:20 +00:00
William A. Rowe Jr
1fa29a8d2d Obvious files that need inheritance, correct me if I'm wrong.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89561 13f79535-47bb-0310-9956-ffa450edef68
2001-07-16 21:07:40 +00:00
Jeff Trawick
1bc52ecfd0 ignore generated DSO-related files on OS/390
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89529 13f79535-47bb-0310-9956-ffa450edef68
2001-07-10 04:54:14 +00:00
William A. Rowe Jr
f6f3f613e3 Refresh .mak files for tagging 2.0.19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89458 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 00:31:04 +00:00
Cliff Woolley
29212e8c6b *) Account for the new pool parameter to apr_bucket_file_create()
and apr_bucket_file_make().

*) Simplify mod_file_cache's sendfile_handler by taking advantage
   the new ability of file buckets to handle files opened in XTHREAD
   mode.  [Also inlined some of the brigade construction stuff in
   mod_file_cache's handlers to save a palloc() or two.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89438 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 20:18:09 +00:00
William A. Rowe Jr
e6bb83641f Filenames aught to be normalized to the serverroot, and server_root_relative
already canonicalizes names.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89382 13f79535-47bb-0310-9956-ffa450edef68
2001-06-18 05:39:10 +00:00
Roy T. Fielding
8ea5039bdb Fix httpd's definition of LTFLAGS to be consistent with that of apr
and apr-util, allow it to be overridden by the configure command-line
(default="--silent") and introduce LT_LDFLAGS to replace what we were
formally abusing as LTFLAGS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89094 13f79535-47bb-0310-9956-ffa450edef68
2001-05-12 03:48:31 +00:00
Bill Stoddard
c13afe3fd5 Do not send apr_file_t allocated out of the pconf pool down the
filter chain.  This is not perfect but better. Need to do some
more work in apr_os_file_put to initialize fields a bit better.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89086 13f79535-47bb-0310-9956-ffa450edef68
2001-05-11 17:34:17 +00:00
Roy T. Fielding
f1f5f01fdb Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables.  Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
avoid pointless duplications.  Fix the order in which flags are given
on the compile and link lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:24:11 +00:00
William A. Rowe Jr
5383bde83c Time to refresh mak on Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88728 13f79535-47bb-0310-9956-ffa450edef68
2001-04-05 09:21:46 +00:00
Jeff Trawick
aa532ee243 Get mod_file_cache to refuse to compile on systems with neither
sendfile nor mmap.

Get mod_file_cache to compile on systems with sendfile but !mmap.

Submitted by:	Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88623 13f79535-47bb-0310-9956-ffa450edef68
2001-03-31 11:51:16 +00:00
Jeff Trawick
808ca404c6 get rid of an unused variabe in file_cache_xlat()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88591 13f79535-47bb-0310-9956-ffa450edef68
2001-03-26 23:40:41 +00:00
Jeff Trawick
16a82e270b Get mod_file_cache to compile again on platforms with no apr_sendfile().
Get the Tru64 compiler to shut up about an incompatibility between void **
and struct **.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88589 13f79535-47bb-0310-9956-ffa450edef68
2001-03-26 19:11:09 +00:00
Bill Stoddard
b951f8b0c7 Eat our own cooking. Cleanup code paths and use apr_hash functions. Good
for a small performance boost.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88586 13f79535-47bb-0310-9956-ffa450edef68
2001-03-26 18:01:17 +00:00
William A. Rowe Jr
e935387c91 This should wrap this freshen up
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88559 13f79535-47bb-0310-9956-ffa450edef68
2001-03-22 05:56:59 +00:00
William A. Rowe Jr
16231360f1 Goodbye ap_send_http_header
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88390 13f79535-47bb-0310-9956-ffa450edef68
2001-02-28 15:24:09 +00:00
William A. Rowe Jr
d3fdebba53 A patch to clean up much bogusity in Win32. Eliminates absolute cd "/..."
references using build/fixwin32mak.pl, and the latest #if APR_HAVE_FOO_H
  fixes apparently worked, now that they no longer appear as dependencies
  [which had broken the build entirely.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88336 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 22:20:25 +00:00
William A. Rowe Jr
77390b6985 Refresh all .mak files should we choose to roll again shortly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88317 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 02:53:30 +00:00
Jeff Trawick
e26706be5c use the right fmt string for finfo.size
Submitted by:	Greg Stein and gcc on FreeBSD


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88309 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 00:38:17 +00:00
Bill Stoddard
1db0d496ec Modify mod_file_cache to save pre-formatted strings for
content-length and last-modified headers for performance.

Submitted by:  Mike Abbot <mja@trudge.engr.sgi.com>
Reviewed by: Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88292 13f79535-47bb-0310-9956-ffa450edef68
2001-02-23 18:57:36 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
Greg Stein
5dc34feb12 *) continued header revamping
*) torch some headers (and some libs) from the autoconf stuff


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88061 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 14:04:21 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
Bill Stoddard
b119ec0e60 Begin restructuring scoreboard code to enable adding back in
the ability to use IPC other than shared memory.
Get mod_status working on Windows again.

Still to do:
Rename some of the function APIs. Replace all calls to reinit_scoreboard with
ap_create_scoreboard. Add back in support for scoreboard files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87959 13f79535-47bb-0310-9956-ffa450edef68
2001-02-02 21:32:34 +00:00
William A. Rowe Jr
7f4a5fe7f5 Use the appropriate APR_FINFO_flags for the apr_stat/lstat/getfileinfo
calls to avoid ownership and permissions on Win32 when they are not
  required, and until they are implemented.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87873 13f79535-47bb-0310-9956-ffa450edef68
2001-01-27 21:28:28 +00:00
William A. Rowe Jr
cd1ef027c2 The changes required for the APR_FINFO_wanted argument to
apr_stat/lstat/getfileinfo.  These are -NOT- optimal, they
  are simply the required changes to get the server working.
  The size of the patch is a warning about how we need to
  really look at what we are trying to accomplish with all
  of these stat/lstat calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87760 13f79535-47bb-0310-9956-ffa450edef68
2001-01-20 21:42:23 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
William A. Rowe Jr
40655f8641 Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 15:52:12 +00:00
Jeff Trawick
9a73c1fca8 get rid of an unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87658 13f79535-47bb-0310-9956-ffa450edef68
2001-01-11 20:14:04 +00:00
Bill Stoddard
d88b08d746 It is not sufficient to reset the file pointer before each call to ap_send_fd. A better solution
is to make certain that only apr_sendfile() will be used to send content with a cached file handle.
This assumes that apr_sendfile() should not rely on the position of the file pointer. I suspect that
sendfile implementations that rely on the position of the file pointer are broken and we should not
use sendfile on those platforms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87654 13f79535-47bb-0310-9956-ffa450edef68
2001-01-11 18:50:09 +00:00
Allan K. Edwards
06c2846624 use AP_HOOK_LAST for this module. This may or may not be the final
solution but it is at least more correct.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87634 13f79535-47bb-0310-9956-ffa450edef68
2001-01-09 21:38:35 +00:00
Doug MacEachern
55e9bcf8e7 use ap_strcmp_match and fix pattern typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87618 13f79535-47bb-0310-9956-ffa450edef68
2001-01-09 00:08:13 +00:00
Doug MacEachern
40391fb9f2 adjust remaining modules to use the new handler hook method (Alan Edwards)
bring back the old handler prototype by reusing r->handler (dougm)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87617 13f79535-47bb-0310-9956-ffa450edef68
2001-01-08 23:55:12 +00:00
William A. Rowe Jr
8a5e3208d9 Last of the Win32 goodness I've noticed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87503 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 21:07:18 +00:00
William A. Rowe Jr
c876e8476a Out of the sandbox and into prime time. Note... these should always and
only be regenerated immediately prior to the tag and roll.  Do not assume
  they are current with the sources in the development tree.  They should
  be generated as vc5 make files, since only vc5 makefiles are readable by
  both vc5 and vc6.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87479 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:46:22 +00:00
William A. Rowe Jr
0a37cdf9fe Correction, commited the vc5. Need vc6 in the tree. Humble appologies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87475 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:25:10 +00:00
William A. Rowe Jr
4315b0c706 The Win32 overhaul, in summary;
Modules are named mod_foo.so
    Dynamic Libraries are named libfoo.dll, and are stored in bin/
    The former ApacheCoreDll is now libhttpd.dll
    Apache.exe moves to bin/
    The make install now copies include, lib, and libexec
    All build options are normalized, filenames adjusted appropriately


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87471 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:04:49 +00:00
Jeff Trawick
78309d6d21 Get rid of the once_through flag. It is never used and doesn't work
in DSO mode anyway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87329 13f79535-47bb-0310-9956-ffa450edef68
2000-12-13 13:22:51 +00:00
Greg Stein
9787943f19 *) remove STANDARD_LIBS line; it is unused/unneeded
*) simplify by removing the extra AC_DEFUN() in each file


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87247 13f79535-47bb-0310-9956-ffa450edef68
2000-12-07 10:40:01 +00:00
Ryan Bloom
1e453f2369 Port httpd to the newest MMAP api.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87243 13f79535-47bb-0310-9956-ffa450edef68
2000-12-07 05:01:01 +00:00
William A. Rowe Jr
56560e4293 A bit of inclusion for the apr-util package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87213 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 17:38:40 +00:00
William A. Rowe Jr
f119cafbaa This patch illustrates the new locations, and makes the majority of the
adjustments.  Now to actually try to build the thing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87212 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 16:37:50 +00:00
Ryan Bloom
c512685df5 Ignore all the files that are generated during a build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87195 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 03:48:26 +00:00
Ryan Bloom
d412995055 Get the modules configuration stuff working correctly. This just deals
with STANDARD modules and Protocol, not MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87186 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 21:38:51 +00:00
Ryan Bloom
a87a761b37 Start to add back the config.m4 and Makefile.in's that were separated out
during the repository move.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87184 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 20:34:48 +00:00
Jeff Trawick
8662bacbc4 When caching file handles (vs. mmaps) reset the file pointer
before serving, since a filter may have caused the file pointer
to advance.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86876 13f79535-47bb-0310-9956-ffa450edef68
2000-11-08 23:07:32 +00:00
Jeff Trawick
5d452728e4 Remove the byterange code out of mod_file_cache's handler. That
is completely in the core now.

Note that file handle caching is broken (nothing to do with
byte ranges).  mmap caches seem to work o.k.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86873 13f79535-47bb-0310-9956-ffa450edef68
2000-11-08 19:07:34 +00:00
Greg Stein
9904e8589a ap_set_content_length() now has a void return.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86863 13f79535-47bb-0310-9956-ffa450edef68
2000-11-08 03:12:58 +00:00