Commit Graph

537 Commits

Author SHA1 Message Date
bbe1a3601e These changes are committed together, because they depend on each other.
-   shared modules can be built in the tree
    -   added support for --with-layout, uses APACI's config.layout
    -   working 'make install'
    -   working 'make depend'
    -   working Pthreads checks
    -   buildconf replaced


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84423 13f79535-47bb-0310-9956-ffa450edef68
2000-01-11 13:11:13 +00:00
ffb8b69b2e Update .cvsignore files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84422 13f79535-47bb-0310-9956-ffa450edef68
2000-01-11 13:04:01 +00:00
0df3ec32ca Rework ap_finfo_t to split the file type out of the protection field.
I've taken a stab at the unix implementation but tested only on OS/2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84416 13f79535-47bb-0310-9956-ffa450edef68
2000-01-10 15:35:51 +00:00
faff1f01dd time overhaul:
- ap_time_t is a 64-bit scalar, microseconds since epoch
- ap_exploded_time_t corresponds to struct tm with a few extras

probably broken on anything except linux.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84413 13f79535-47bb-0310-9956-ffa450edef68
2000-01-09 05:18:31 +00:00
8f26ac7df4 Separate the stat structure from the file structure and use ap_stat and
ap_getfileinfo in apache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84397 13f79535-47bb-0310-9956-ffa450edef68
2000-01-06 14:43:41 +00:00
528afcc4d6 Initialize all ap_file_t's to NULL. This allows ap_open and ap_stat to
work together without causing memory leaks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84393 13f79535-47bb-0310-9956-ffa450edef68
2000-01-04 19:01:04 +00:00
7cb6de58a7 A few more tweaks to finish the modules work. Now, all of the modules
compile correctly with Apache 2.0. This does run, but it hasn't been tested
any more than simply compiling and running the server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84386 13f79535-47bb-0310-9956-ffa450edef68
1999-12-31 20:32:36 +00:00
6786681590 Get rid of ap_call_exec. It has been #if 0'ed out for a long time, and we
never call it, so I'm taking it out all together now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84377 13f79535-47bb-0310-9956-ffa450edef68
1999-12-31 01:27:43 +00:00
7c7d0b0f43 Some changes to the ap_strftime function. We now inform the user of the
length of the string written, and we return a status code.  I expect the
status code to mean a bit more on Windows than it currently does on Unix.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84376 13f79535-47bb-0310-9956-ffa450edef68
1999-12-30 18:31:29 +00:00
c434846940 Fall back to save values for SHM_R and SHM_W, if the system does not
define them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84375 13f79535-47bb-0310-9956-ffa450edef68
1999-12-29 23:57:53 +00:00
ad82790133 Fix the threads check so it works on non-bash shells.
Submitted by:   Sascha Schumann
Reviewed by:    Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84369 13f79535-47bb-0310-9956-ffa450edef68
1999-12-24 21:12:20 +00:00
cf09b66786 Submitted by: Sascha Schumann <sascha@schumann.cx>
Reviewed by:	Rasmus Lerdorf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84366 13f79535-47bb-0310-9956-ffa450edef68
1999-12-24 18:35:19 +00:00
ef6a9f850c Finish the MPM decision logic. This moves the threads checking stuff into
the mpm directory where it belongs.  It also adds logic so that if threads
aren't detected, we automatically choose to use the prefork mpm.  Lastly,
I also cleaned up a variable name to make it more consistent with the other
variables used in our configure script.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84365 13f79535-47bb-0310-9956-ffa450edef68
1999-12-24 18:31:10 +00:00
84f9b5d2c6 First stab at logic to determine which threading library to use. This also
gets rid of the hack of always putting -pthread in the CFLAGS variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84363 13f79535-47bb-0310-9956-ffa450edef68
1999-12-23 21:01:31 +00:00
a3a24e14b8 This fixes the bug in my last commit. Apache always caches a value for
enable-threads.  This allows us to re-configure the server for different
MPM's without worrying about not having APR-threads available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84360 13f79535-47bb-0310-9956-ffa450edef68
1999-12-22 21:24:45 +00:00
3f4fe1cea0 Clean up APR's configure script a bit. This commit also allows Apache to
specify that APR should be built without threads for the prefork MPM.  This
is broken if we then try to configure Apache again using a threaded MPM, but
this is easily fixable, and I will be doing that soon.  Lastly, I removed all
thread calls from APR when it is told to build without threads.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84359 13f79535-47bb-0310-9956-ffa450edef68
1999-12-22 20:29:20 +00:00
53e662b1f2 Remove a bunch of functions that are being replaced by functions in APR.
Also finished porting Apache to use APR in most cases.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84355 13f79535-47bb-0310-9956-ffa450edef68
1999-12-21 21:41:53 +00:00
c60be447ce Fix compile break introduced to Apache 2.0 by the mass vhosting security fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84350 13f79535-47bb-0310-9956-ffa450edef68
1999-12-21 14:45:53 +00:00
5ef2a1ecd3 Fix the mass vhosting security problem spotted by Lars, as in 1.3
Submitted by:	Ben Hyde
Reviewed by:	Tony Finch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84349 13f79535-47bb-0310-9956-ffa450edef68
1999-12-21 11:33:23 +00:00
e32d1edaaa Windows: Can now install/uninstall Apache as a service and start/stop apache via
net start and net stop commands. Not extensively tested, so there may be bugs
in this still.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84343 13f79535-47bb-0310-9956-ffa450edef68
1999-12-20 19:52:51 +00:00
f69d6ac434 Get rid of the C++ style comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84342 13f79535-47bb-0310-9956-ffa450edef68
1999-12-20 19:16:34 +00:00
ec1cc5b5ce Handle -k restart|shutdown command line option from http_main.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84341 13f79535-47bb-0310-9956-ffa450edef68
1999-12-20 19:07:33 +00:00
8c56e6dfc3 First step in getting Apache to use APR's time libraries. This gets a good
number of them, but I think there are more time values still in the Apache
code.  This works under Linux, but has not been tested anywhere else.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84338 13f79535-47bb-0310-9956-ffa450edef68
1999-12-20 16:38:39 +00:00
8c0183b985 Eliminate the .h.stub files; AC_DEFINE can generate the necessary
#defines in the config header for us.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84329 13f79535-47bb-0310-9956-ffa450edef68
1999-12-20 03:09:50 +00:00
7f31f4cd6e Remove some nuisance warnings by changing int to ap_ssize_t.
Also add a default MPM_METHOD for BeOS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84315 13f79535-47bb-0310-9956-ffa450edef68
1999-12-19 10:05:15 +00:00
4b6703572c Update Apache version in windows registry.c file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84312 13f79535-47bb-0310-9956-ffa450edef68
1999-12-17 15:39:56 +00:00
ecf9bb296b Getting rid of more warnings in the prefork mpm.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84297 13f79535-47bb-0310-9956-ffa450edef68
1999-12-15 21:39:09 +00:00
9b7c1b330a Cleanup the Windows build a bit by getting rid of more platform dependant
code.  Still won't compile cleanly, but we are closer.  I am hoping for a
clean Windows compile by Friday.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84294 13f79535-47bb-0310-9956-ffa450edef68
1999-12-15 00:59:56 +00:00
e0f0562f26 Make prefork compile.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84292 13f79535-47bb-0310-9956-ffa450edef68
1999-12-14 20:02:50 +00:00
57a64feae6 Fix some warnings when configured with --enable-maintainer-mode.
ap_start_(shutdown|restart) are no longer static in dexter, because we
explicitly state we are creating them to be called from places other than
the parent.  This is the first in a series of patches to get the 2.0 code
to compile cleanly again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84290 13f79535-47bb-0310-9956-ffa450edef68
1999-12-13 22:53:25 +00:00
0d022946bc Get rid of more platform dependant code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84288 13f79535-47bb-0310-9956-ffa450edef68
1999-12-13 20:52:28 +00:00
f8be925ab2 Get rid of a couple more ap_os_file_t's along with their platform
dependant code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84283 13f79535-47bb-0310-9956-ffa450edef68
1999-12-13 14:01:35 +00:00
dc89301b6e Use ap_open_stderr in http_config.c. This cleans up some non-portable
code that has been bothering me.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84281 13f79535-47bb-0310-9956-ffa450edef68
1999-12-11 20:29:17 +00:00
516c90f02f Get rid of an instance of ap_file_os_t from the Apache source. I will
be finishing the cleansing of these interim variables over the next few
days.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84279 13f79535-47bb-0310-9956-ffa450edef68
1999-12-11 00:13:19 +00:00
fd54e2951c We now make the decision to USE_MMAP_FILES based on whether or not APR
has MMAP.  If APR_HAS_MMAP is true then USE_MMAP_FILES is true.  We also
no longer check for MMAP in autoconf within Apache.  Apache relies on APR
to give us MMAP functionality, and therefore doesn't need to check for
itself.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84278 13f79535-47bb-0310-9956-ffa450edef68
1999-12-10 20:22:07 +00:00
0678b2a472 Removed these a bit too soon. Adding them back.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84269 13f79535-47bb-0310-9956-ffa450edef68
1999-12-09 21:50:16 +00:00
a43d9443b2 Win32: First cut at getting apache -k restart|shutdown and running apache as a service working
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84249 13f79535-47bb-0310-9956-ffa450edef68
1999-12-08 22:34:02 +00:00
f49f38b50c I shouldn't have to explicitly provide an MPM. I am setting the default
as mpmt_pthread.  I would much rather it was prefork, but the autoconf
work hasn't progressed to the point that prefork will work yet.  When it
does work, I expect the default to change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84226 13f79535-47bb-0310-9956-ffa450edef68
1999-12-05 19:36:42 +00:00
869a58d8f7 autoconf: Generate modules.c based on configuration. This is the first
step to supporting selection of modules, and it seems to make --with-mpm
actually work now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84223 13f79535-47bb-0310-9956-ffa450edef68
1999-12-05 08:54:39 +00:00
1ab6b7b233 The Unix MPMs were depending on APR for signal.h, and broke. Add an
explicit #include for it back in.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84217 13f79535-47bb-0310-9956-ffa450edef68
1999-12-03 22:11:31 +00:00
b259c85053 We may not always want to make the pipes between processes non-blocking.
This patch allows us to set if both sides of the pipes are nonblocking,
both sides are blocking, just the parent side blocks, or just the child
side blocks for all three of the pipes created during create_process.  I
have also modified Apache to take advantage of this change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84215 13f79535-47bb-0310-9956-ffa450edef68
1999-12-02 18:36:39 +00:00
04c494c2b5 Eliminate ap_config.h's checks when using autoconf. Now, ap_ac_config.h
is used instead, and autoconf's configure script will check for
everything else.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84200 13f79535-47bb-0310-9956-ffa450edef68
1999-12-01 01:16:23 +00:00
1582947dd5 Get rid of ap_check_signals() in all but the prefork MPM, and #define it
away there. It's a TPF-specific piece that will likely go into a TPF
MPM.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84199 13f79535-47bb-0310-9956-ffa450edef68
1999-12-01 00:45:02 +00:00
4f70d9d00b Remove a vestige of the old timeout system. ident lookups need timeouts,
though.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84198 13f79535-47bb-0310-9956-ffa450edef68
1999-12-01 00:25:18 +00:00
c31d4dbf55 Some compile fixes for the piped log code. It doesn't completely
completely compile, but it looks a little better.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84197 13f79535-47bb-0310-9956-ffa450edef68
1999-11-30 23:27:29 +00:00
3cfe8158af Deal with times() properly in autoconf. This also changes NO_TIMES to
!HAVE_TIMES.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84193 13f79535-47bb-0310-9956-ffa450edef68
1999-11-30 03:52:57 +00:00
c6b9cc45c1 The second part of the big autoconf patch, which actually adds autoconf
building to the tree.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84187 13f79535-47bb-0310-9956-ffa450edef68
1999-11-29 23:47:33 +00:00
a7a251cb29 The first part of the big autoconf patch. This replaces a bunch of
NEED_* macros with HAVE_* macros to be more consistent with autoconf.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84186 13f79535-47bb-0310-9956-ffa450edef68
1999-11-29 23:33:24 +00:00
d46c42e705 First cut at getting graceful restart working with the AcceptEx completion port
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84185 13f79535-47bb-0310-9956-ffa450edef68
1999-11-29 21:14:06 +00:00
444531b691 Clean up the getopt stuff a bit. Basically, I am removing the #define's,
and changing the names in the getopt.c file so that we are sure there is
no namespace collision between regular getopt's, and APR's getopt.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84143 13f79535-47bb-0310-9956-ffa450edef68
1999-11-22 14:52:17 +00:00