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

482 Commits

Author SHA1 Message Date
Jeff Trawick
f379bdda77 Get rid of an ancient comment (which was updated for the CHARSET_EBCDIC
->APACHE_XLATE change.  Once I figured out what "32/9" meant (doh!)
it was pretty clear that the comment is no longer applicable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86051 13f79535-47bb-0310-9956-ffa450edef68
2000-08-11 16:31:40 +00:00
Ken Coar
62989065fe Don't skip any remaining methods just because one was already
noted.

Submitted by:	Joe Orton <joe@orton.demon.co.uk>
Reviewed by:	Ken Coar


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86050 13f79535-47bb-0310-9956-ffa450edef68
2000-08-11 16:31:02 +00:00
Ken Coar
6f7162d533 Fix another oversight: don't add an extension method to the Allow
list if it's already there.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86049 13f79535-47bb-0310-9956-ffa450edef68
2000-08-11 14:41:13 +00:00
Ken Coar
5bc475f394 Whoops, head off a potential segfault. The array is only
created at need, so check for its existence before trying
	to peek into it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86047 13f79535-47bb-0310-9956-ffa450edef68
2000-08-10 13:28:45 +00:00
Jeff Trawick
df5ed41b51 Change use of ap_pstrcat() to apr_pstrcat() in previous commit so
that Apache builds again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86044 13f79535-47bb-0310-9956-ffa450edef68
2000-08-10 12:46:52 +00:00
Ken Coar
702dd42deb Add support for arbitrary extension methods for the Allow
response header field, and an API routine for modifying the
	allowed list in a unified manner for both known and extension
	methods.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86043 13f79535-47bb-0310-9956-ffa450edef68
2000-08-10 11:22:57 +00:00
Jeff Trawick
2b1382383e mod_cern_meta: fix broken file reading loop in scan_meta_file().
We checked the retcode from apr_fgets() improperly.
Submitted by:	Rob Simonson <simo@us.ibm.com>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86039 13f79535-47bb-0310-9956-ffa450edef68
2000-08-09 20:47:06 +00:00
Bill Stoddard
9bb89ff621 Fix compile break
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86033 13f79535-47bb-0310-9956-ffa450edef68
2000-08-09 12:58:21 +00:00
Bill Stoddard
808831ec31 Updated patch to fix compile warnings from not including apr_strings.h
Submitted by:	Joe Orton <joe@orton.demon.co.uk>
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86029 13f79535-47bb-0310-9956-ffa450edef68
2000-08-08 20:03:52 +00:00
Bill Stoddard
cba8d8f05c Fix win32 compile break.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86027 13f79535-47bb-0310-9956-ffa450edef68
2000-08-08 19:53:27 +00:00
Jeff Trawick
f7ec9ddb5b A few more (last?) ap_xlate->apr_xlate changes covering stuff not completely
handled in the big apr rename last week.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86020 13f79535-47bb-0310-9956-ffa450edef68
2000-08-07 20:11:37 +00:00
Jeff Trawick
99cf606197 Fix some problems with the apr conversion so that APACHE_XLATE builds work
again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86018 13f79535-47bb-0310-9956-ffa450edef68
2000-08-07 19:26:02 +00:00
Jeff Trawick
c30e232c7c Use AP_INIT_* macros for command_rec [] in a few more modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86014 13f79535-47bb-0310-9956-ffa450edef68
2000-08-06 22:38:23 +00:00
Jeff Trawick
15a43f6956 Finish renaming AP_CTIME_LEN to APR_CTIME_LEN.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86009 13f79535-47bb-0310-9956-ffa450edef68
2000-08-06 12:15:57 +00:00
William A. Rowe Jr
1a9db204f5 Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation...
see src/lib/apr/apr_compat.h for most details.
  Also a few minor nits to get Win32 to build.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86008 13f79535-47bb-0310-9956-ffa450edef68
2000-08-06 06:07:53 +00:00
Jeff Trawick
330e49d94b Use new AP_INIT_xxx macros & include apr_strings.h to get rid of warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86002 13f79535-47bb-0310-9956-ffa450edef68
2000-08-06 02:13:15 +00:00
Jeff Trawick
750ff5fd96 Disable the dbm_ usage in mod_rewrite so that it links.
Still to do: decide at config time whether any modules need dbm, whether
             to use the native one or sdbm, etc.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85982 13f79535-47bb-0310-9956-ffa450edef68
2000-08-04 02:25:08 +00:00
Jeff Trawick
03585c8240 Clean up maintainer-mode compiles of mod_rewrite (use AP_INIT_xx macros
and clean up resulting warnings).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85980 13f79535-47bb-0310-9956-ffa450edef68
2000-08-03 03:09:32 +00:00
Jeff Trawick
4f7694bcad Don't trace EINTR errors from accept() on the Unix socket.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85979 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 23:47:58 +00:00
Doug MacEachern
059d8dd212 prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 05:27:38 +00:00
Jeff Trawick
3ae78ff383 Use the AP_INIT_TAKE23() macro to clean up a maintainer-mode warning,
then fix the warnings resulting from AP_INIT_TAKE23() :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85975 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 02:30:23 +00:00
Jeff Trawick
ce2ce1ebb2 Use the AP_INIT_FLAG() macro to clean up a maintainer-mode warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85974 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 01:01:12 +00:00
Jeff Trawick
ed49d74ae1 Include <strings.h> if we have it to get protos for strcase* on AIX.
Submitted by:	Victor J. Orlikowski <vjo@raleigh.ibm.com>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85965 13f79535-47bb-0310-9956-ffa450edef68
2000-07-31 17:22:01 +00:00
Jeff Trawick
d5ee92d684 Use ap_dso_error() instead of ap_strerror() when ap_dso_sym() fails.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85946 13f79535-47bb-0310-9956-ffa450edef68
2000-07-30 02:03:42 +00:00
Ryan Bloom
fe64231023 Move the Server Token stuff out of http_config_globals.h because it is
now isolated in http_core.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85941 13f79535-47bb-0310-9956-ffa450edef68
2000-07-29 19:50:08 +00:00
Ryan Bloom
c266de9029 Remove iol_socket.h. This file had one declaration, and it makes more
sense for that declaraion to move to ap_iol.h.  This also modifies all of
the files that include iol_socket.h to include ap_iol.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85934 13f79535-47bb-0310-9956-ffa450edef68
2000-07-29 16:24:15 +00:00
Jeff Trawick
844bc85ee4 Change the storage allocation mechanism for ap_proc_t structures
passed to ap_note_subprocess() by mod_rewrite and mod_include.  The
storage needs to last as long as the pool passed to
ap_note_subprocess(), so autodata won't work.

The mod_rewrite change wasn't tested.  A normal build with mod_rewrite
on Linux currently results in the link failing due to unresolved
references to dbm_*.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85928 13f79535-47bb-0310-9956-ffa450edef68
2000-07-29 03:08:13 +00:00
Jeff Trawick
368bb3c9af Fix segfault/SIGSEGV when running gzip from mod_mime_magic.c.
An invalid ap_proc_t was passed to ap_create_process().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85927 13f79535-47bb-0310-9956-ffa450edef68
2000-07-29 02:04:49 +00:00
Ryan Bloom
f89738e6b6 Add the ability to register filters. This commit introduces a warning
into the build.  This warning will be removed automatically, as soon as
we decide on a prototype for the function causing the warning.  That
decision is tied to which filtering mechanism we decide on.
Submitted by:	Ryan Bloom and Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85926 13f79535-47bb-0310-9956-ffa450edef68
2000-07-28 20:31:02 +00:00
Jeff Trawick
d3bb567248 Use ap_note_subprocess() to register the mod_cgid daemon process for cleanup
so that it is killed at termination if it does not die when the parent gets
SIGTERM.  This change is to fix occasional problems where the process stays
around.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85917 13f79535-47bb-0310-9956-ffa450edef68
2000-07-28 18:15:21 +00:00
William A. Rowe Jr
d2c9dd85e3 Another day's progress... little changes, but just establishing the
baseline for fully implementing extensions.  Filters... that's still
  a little way away.  This demonstrates the HSE_STATUS_PENDING result
  wait event trap, so we let another thread keep working till we get
  the HSE_REQ_DONE_WITH_SESSION request.  Cleaned up callback names
  and tossed bunches of stuff in the isapi_cid (connection/request) and
  the isapi_loaded (dll details) for future caching optimizations.


PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85903 13f79535-47bb-0310-9956-ffa450edef68
2000-07-27 05:23:17 +00:00
Ryan Bloom
28f6bfe4a2 Remove all of the ap_is* functions from Apache. They were already in APR,
and we all hate duplicate code.  :-)  This also required adding ap_isascii
to APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85897 13f79535-47bb-0310-9956-ffa450edef68
2000-07-26 15:31:30 +00:00
Jeff Trawick
891b6a680a packet minimization when doing sendfile...
When preparing to call iol_sendfile(), don't call ap_bflush() first.
Instead, pass the data ap_bflush() would have written (if any) to
iol_sendfile() as a header.  In practice, this prevents sending headers
separately from the first part of the file.
Submitted by:	Greg Ames
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85895 13f79535-47bb-0310-9956-ffa450edef68
2000-07-26 14:29:34 +00:00
Jeff Trawick
992516b075 Fix some compile warnings in mod_file_cache.
Submitted by:	Greg Ames
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85893 13f79535-47bb-0310-9956-ffa450edef68
2000-07-26 14:03:08 +00:00
dgaudet
2547832c5c - fix POOL_DEBUG ... restored the ap_pool_joins that dreid removed.
- removed the apr_abort foo since every caller was passing it NULL anyway;
  and this is debugging code, so i don't have any qualms about using
  stderr or abort().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85888 13f79535-47bb-0310-9956-ffa450edef68
2000-07-26 01:56:02 +00:00
Ryan Bloom
e3702116a5 Update mod_so to use the new command_rec format.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85885 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 19:52:37 +00:00
Ryan Bloom
a8924ba469 Remove EXEC_ON_READ from ClearModuleList and AddModule. Having these
as EXEC_ON_READ was causing a seg fault, and it was unnecessary.  Neither
of these directives changes how the server interprets the config file,
they only change how the server responds to the configuration.
PR:	6318


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85883 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 05:35:34 +00:00
William A. Rowe Jr
2ea44150e8 Undo my damage.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85882 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 03:40:24 +00:00
William A. Rowe Jr
c50d07027c Undo the damage to mod_isapi (leave placeholders for new functions though)
and add APR_EOL_STR to log files (precomiled, of course :)

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85881 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 03:26:31 +00:00
William A. Rowe Jr
f5cd4a7017 Caught a bit of my own bad style :)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85879 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 01:36:28 +00:00
William A. Rowe Jr
847b20108c Add APR_EOL_STR for a platform specific text delimiter, provided by
apr.h (defined in apr.h.in and apr.hw).  This is needed -only- in APR
  created files (true raw files) such as logs.  It is not required in any
  splat to screen (stderr/stdout) formatting, nor any html markup.

  Some other modules slipped through in the prior apr_strings.h commit.
  Sorry 'bout that.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85878 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 01:06:32 +00:00
William A. Rowe Jr
fc3580dd3b Missing apr_strings.h - hope this wasn't destined for some global header.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85877 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 00:58:22 +00:00
Ryan Bloom
b75d43974f Fix some issues with mod_mime_magic. Basically, we need to include
apr_strings.h, the command table needed to be fixed to use the new
format, and we had vestiges of stat left around.

The top two issues are simple, we include apr_strings and fix the command
recs.

The last issue required using APR enums instead of the stat.h macros.  This
also allows us to remove some ugly #ifdefs.  :-)
Submitted by:	Shaun Savage <shaun@igel.de>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85875 13f79535-47bb-0310-9956-ffa450edef68
2000-07-24 20:48:24 +00:00
Ryan Bloom
ce7a5bcaff Remove apr_strnatcmp.h. All of the functions prototyped in this file
have been moved to apr_strings.h.  This also modifes Apache to include
apr_strings.h instead of apr_strnatcmp.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85872 13f79535-47bb-0310-9956-ffa450edef68
2000-07-23 17:31:08 +00:00
Ryan Bloom
22d9fbdec0 Move all APR functions related to strings to their own directory, and
create a new header for those functions.  This is the first step to
removing the apr/lib directory completely, and moving those files/functions
to descriptive directories.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85867 13f79535-47bb-0310-9956-ffa450edef68
2000-07-21 19:50:58 +00:00
Jeff Trawick
fccf46923f Protect some sendfile()-specific logic with APR_HAS_SENDFILE
so that mod_file_cache can build on a system with no sendfile().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85863 13f79535-47bb-0310-9956-ffa450edef68
2000-07-20 18:19:36 +00:00
Jeff Trawick
510681a27d Get mod_cgid.c to compile on OS/390 again. It needs unistd.h
for STDERR_FILENO.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85862 13f79535-47bb-0310-9956-ffa450edef68
2000-07-19 18:04:24 +00:00
Jeff Trawick
db3c12a79e Fix some bad ap_log_error() invocations. Comment on a bad
ap_log_rerror() invocation.

Almost all of this is in code never compiled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85860 13f79535-47bb-0310-9956-ffa450edef68
2000-07-17 22:11:47 +00:00
Keith Wannamaker
14df9ea297 Fix copy/move depth infinity lock propagation problem.
Submitted by: Joe Orton <joe@orton.demon.co.uk>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85858 13f79535-47bb-0310-9956-ffa450edef68
2000-07-17 05:17:02 +00:00
Greg Stein
d3b192ab05 add ap_full_read() and ap_full_write(). they guarantee to read/write the
full buffer unless an error occurs.
use the new functions in SDBM and DAV. [and Subversion]
Win32 and OS/2 can directly include/use file_io/unix/fullrw.c since it is
    written in terms of other APR functions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85850 13f79535-47bb-0310-9956-ffa450edef68
2000-07-15 02:07:21 +00:00