Commit Graph

2075 Commits

Author SHA1 Message Date
c1b39458ab Command handler revamp. Note that this makes the code produce a LOT of
warnings!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85595 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 11:13:05 +00:00
5f186c042c ap_pool_join is a debugging function so remove it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85594 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 11:00:57 +00:00
26b5a249bf reduce some code redundancy / simplify.
use a consistent var name for va_list


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85590 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 02:22:03 +00:00
c7d0508e8a ap_bvputs() is a misnomer; introduce ap_bputstrs()
[todo: proxy and file_cache code should be updated for new name]
add ap_vbputstrs()
use ap_vbputstrs() from http_protocol.
use EOF in a few places, rather than the magic "-1" constant


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85589 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 01:29:29 +00:00
d72e9ac525 Buffering for config file reads is now enabled.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85587 13f79535-47bb-0310-9956-ffa450edef68
2000-06-16 16:42:49 +00:00
b18a907dad Turn on buffering for config file reads. This is dependent on ap_fgets()
doing the right thing.

Brian Havard implemented buffering for ap_fgets() on Win32 recently; OS/2 had
it already.  This provides it for Unix.

changes to ap_read(), ap_getc(), ap_fgets() for Unix:

1) this fixes a problem in where ap_open() where a lock is created for
   non-buffered files
2) this fixes problems setting rv correctly in the ap_read() buffered
   path
3) since ap_read() works as expected, it is possible to make ap_getc()
   and ap_fgets() even smaller
4) ap_fgets() no longer cares about '\r'


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85586 13f79535-47bb-0310-9956-ffa450edef68
2000-06-16 16:41:21 +00:00
78571030f9 Fix segfault when reporting this type of syntax error:
"</container> without matching <container> section", where
container is VirtualHost or Directory or whatever.

This was a path not covered by the fix in 2.0a4 to report
the proper line numbers (sorry!).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85585 13f79535-47bb-0310-9956-ffa450edef68
2000-06-16 12:00:58 +00:00
21fda11151 Rebuild Apache and APR configure scripts when lib/apr/hints.m4 changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85582 13f79535-47bb-0310-9956-ffa450edef68
2000-06-15 17:54:37 +00:00
e38702601d Include the proper header file (under X/Open, at least) for ntohs() in
a couple of modules.  This lets us link-edit successfully again on OS/390.
(OS/390 only has the macro form of these functions.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85580 13f79535-47bb-0310-9956-ffa450edef68
2000-06-15 13:42:01 +00:00
f2354c846f Prevent the source code for CGIs from being revealed when using
mod_vhost_alias and the CGI directory is under the document root
and a user makes a request like http://www.example.com//cgi-bin/cgi
as reported in <news:960999105.344321@ernani.logica.co.uk>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85575 13f79535-47bb-0310-9956-ffa450edef68
2000-06-15 00:56:37 +00:00
8df8ca51e3 Add support to ap_xlate_open() for an app to specify that the
charset of the locale is to be used for the source or target
charset.

At EBCDIC initialization, use the locale charset as one of the
pair when setting up the default translation handles for content.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85571 13f79535-47bb-0310-9956-ffa450edef68
2000-06-14 20:38:32 +00:00
35e97374a7 Add sys/time.h to mpm_common to include define of timeval.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85569 13f79535-47bb-0310-9956-ffa450edef68
2000-06-14 13:50:40 +00:00
87fb37f9c5 Tidy up the beos mpm by
- removing some unused variables
- correct a problem with pool allocations that killed the server
- add back the ap_lingering close call which I removed in error
  just before going on holiday.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85568 13f79535-47bb-0310-9956-ffa450edef68
2000-06-14 00:17:21 +00:00
a9746375cf Get the ap_config.h cleanup working on FreeBSD by adding includes of
additional system headers.

A platform check in logresolve.c to determine whether or not we include
<arpa/inet.h> was converted to a feature check.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85567 13f79535-47bb-0310-9956-ffa450edef68
2000-06-13 21:36:18 +00:00
20641b5303 Add mpm.h to the src/modules/mpm/winnt directory (it's empty for now, but its presense
is required for http_core.c, et. al.).  Update ApacheCore.dsp to pick it up in the
include path.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85564 13f79535-47bb-0310-9956-ffa450edef68
2000-06-13 14:09:22 +00:00
54c34b3ea7 fixups for remaining current warnings
Submitted by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85563 13f79535-47bb-0310-9956-ffa450edef68
2000-06-13 06:17:47 +00:00
54a3c92ce6 OK, this builds and is autoconf safe about system headers, until it starts
using APR
PR:
Obtained from:
Submitted by:	Chuck Murcko
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85562 13f79535-47bb-0310-9956-ffa450edef68
2000-06-13 01:22:09 +00:00
a1a3b578a5 Fix the configuration process. If no modules are specified in a given
directory, then that directory is no longer added to the build process.
Also, I have added a .cvsignore to the file_cache directory and removed
a generated file from this directory.  Finally, I have removed
some unnecessary checks from the config.m4 files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85561 13f79535-47bb-0310-9956-ffa450edef68
2000-06-13 01:22:06 +00:00
b4f482c494 Stop checking for Shared Memory. This function is actually no longer
defined by our autoconf setup, but I forgot to remove all of the calls
to it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85560 13f79535-47bb-0310-9956-ffa450edef68
2000-06-13 01:08:20 +00:00
4c847f5ff6 Remove the check for EAGAIN. With APR handling the error codes, this is
no longer an issue that Apache needs to deal with.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85559 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 23:34:23 +00:00
750d8cc03c Protect system header files with the appropriate macros.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85558 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 23:03:05 +00:00
47df25ba18 Mod_proxy should not be a default module... yet. :-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85557 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 22:49:53 +00:00
469a91db1b resolved conflicts (2) in PASV handling from original commit
PR:
Obtained from:
Submitted by:	Chuck Murcko
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85556 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 22:13:08 +00:00
580852da85 Clean up a big chunk of ap_config.h. This basically stops ap_config.h from
including any files.  Because of this change, other files must include
their own headers.  I also cleaned up a couple of other bugs in some
modules because I had to compile them all.

I expect this to break multiple platforms, but this will be fixed over time.
The massive configure cleanup is almost done.  I will go through the files
one more time after this commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85553 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 21:47:17 +00:00
db096af6a5 New mod_proxy/mod_cache (file cache) for 2.0. This uses a caching API so
that shared mem, LDAP servers, DBs, etc. can also be used for proxy
caching. The caching API is very young, and subject to change as APR changes.

proxy_cache.c from the proxy subdir is no longer used.

Build with --enable-modules=proxy,cache

Lightly tested on Linux, no warranties expressed or implied yet.

Still to do:

strerror(), waitpid(), stat() cleanups
address issues marked by @@@FIXME
add HTTP/1.1

This should be considered a *reference* proxy implementation for 2.0. What
actually ends up shipping with 2.0 is likely going to be rather different as
the redesign evolves. This may end up being the 2.0 backwards compatibility
workalike.

Modified to work with today's conf/build/layout scheme

PR:
Obtained from:
Submitted by:	Sam Magnuson
Reviewed by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85552 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 21:41:58 +00:00
bfbb1c736d Fix logging of errors creating the httpd.pid file.
perror() was converted to ap_log_error(), which will interpret the
specified APR error code properly.

The existing ap_log_error() call was changed so that the message is
formatted properly.  Note that this call is made from the mpm after
we detach from the foreground process, so it can only appear in the
log.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85551 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 21:39:57 +00:00
93a6d2f3a7 Back out ap_set_default_perms(). Remove old logic to play with umask
around the creation of the httpd.pid file.  Pass explicit permissions to
ap_open(), omitting write-ability except by the owning user.  As always,
we end up with rw-r--r-- for the permissions unless the umask is something
unusual.

Note that the OS/2 and Win32 implementations of ap_open() ignore the
permissions parameter altogether.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85550 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 21:08:25 +00:00
374f895ac3 Get mod_cgid compiling again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85549 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 20:42:11 +00:00
19a6c374b5 pcre.h is a permanent file now... don't .cvsignore it any longer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85548 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 20:40:05 +00:00
f8aafcf4e5 Add exports required by Jeff's recent changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85547 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 18:44:26 +00:00
802f37be47 Another struct stat to ap_finfo_t change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85546 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 18:43:41 +00:00
09076e771a Clean up the stat commit. Basically there was one struct stat that I
missed converting to ap_finfo_t.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85545 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 18:07:43 +00:00
29faf4133c Fix Win32 compile break caused by Ryan's stat cleanup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85544 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 18:07:31 +00:00
2cf4563fcc Including apr_file_io.h is not necessary.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85543 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 17:41:14 +00:00
4f8f778113 Fix typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85542 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 17:40:00 +00:00
573f9750df add note about building MM library
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85541 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 17:28:48 +00:00
8e9db838fa Finish the switch to light-wheight pcre.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85540 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 17:24:09 +00:00
ec58094da8 All of Apache uses APR for shared memory, so Apache doesn't need to check
for SHM_[RW].


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85539 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 17:04:39 +00:00
5a2f77c208 Apache doesn't use struct tm anymore, Remove a check that defines a
macro that we never use.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85538 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 16:31:54 +00:00
b44c18edd7 Add a new function ap_set_default_fperms. This allows people to set the
umask to be used when creating files.  This should change the permissions
of files created using APR_DEFAULT_OS.  Also removed a warning introduced
with the sys/stat.h changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85537 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 16:00:33 +00:00
e6d6a8d197 Missed one sys/stat.h in mod_rewrite.h. Removing it now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85536 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 15:43:10 +00:00
16748b4e22 Remove the final vestiges of stat.h from Apache 2.0. All calls are now to
ap_stat.  This also adds the new function ap_lstat().  This function is
analogous to lstat.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85535 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 15:29:09 +00:00
b6571e18f1 Dont' add -ldl for BeOS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85534 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 13:58:49 +00:00
26d4070ce3 Don't add -ldl for OS/2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85533 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 13:07:08 +00:00
ad614825ba Make this build again...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85532 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 12:58:12 +00:00
a03d62f437 yaabbos? gravity?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85531 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 10:46:50 +00:00
2a521ae209 Remove reference to dftables.lo from CLEANFILES. *.lo is automatically
unlinked.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85529 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 06:46:04 +00:00
a4accf814a Build only needed parts of libpcre. This is more light-wheight than
having a complete build-subsystem for PCRE.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85528 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 06:44:26 +00:00
6bd252eeb5 Nothing in Apache should be calling stat anymore, so we can remove
the check for sys/stat.h and all references to the resulting macro.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85526 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 04:17:45 +00:00
06ec9982bb Apache doesn't need to check for inline or pid's, because APR provides
both ap_inline and ap_proc_t.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85525 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 03:35:13 +00:00