1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

149 Commits

Author SHA1 Message Date
Ryan Bloom
f9f4c470a8 Convert ap_proc_t to a complete type. This lets us access the pid directly.
Only the prefork MPM has been ported so far, the rest of the Unix MPM's are
coming later today.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85279 13f79535-47bb-0310-9956-ffa450edef68
2000-05-23 21:04:03 +00:00
Manoj Kasichainula
aec887ec5e Remove all remaining instances in Apache code of
ap_{block,unblock}_alarms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85265 13f79535-47bb-0310-9956-ffa450edef68
2000-05-21 05:31:09 +00:00
Roy T. Fielding
943ce40ca4 Remove an unused variable and warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85242 13f79535-47bb-0310-9956-ffa450edef68
2000-05-18 01:35:03 +00:00
Ryan Bloom
fcc4d8c669 Port reliable piped logs to mpmt_pthread and dexter. Also a couple of small
cleanups for reliable piped logs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85137 13f79535-47bb-0310-9956-ffa450edef68
2000-05-04 19:42:57 +00:00
Ryan Bloom
8c385f0dbd Make reliable piped logs work on 2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85136 13f79535-47bb-0310-9956-ffa450edef68
2000-05-04 04:02:37 +00:00
Ryan Bloom
0a29229315 Make piped logs work again in 2.0. The next step is reliable piped logs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85114 13f79535-47bb-0310-9956-ffa450edef68
2000-04-30 21:21:51 +00:00
Bill Stoddard
4ea1a363d3 Get rid of ap_pool_t argument on ap_strerror
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85044 13f79535-47bb-0310-9956-ffa450edef68
2000-04-26 02:36:38 +00:00
Bill Stoddard
385effc089 Tell APR to truncate the httpd.pid file if it exists. Fix a bug in the
Windows side of APR to correctly handle this flag. Also fix related bug
in ap_write.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85039 13f79535-47bb-0310-9956-ffa450edef68
2000-04-25 23:15:46 +00:00
Ryan Bloom
52c04b67a7 Add support for pool to log_error_core. Also add ap_log_perror to allow
logging without either a request or server _rec.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85002 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 16:25:40 +00:00
Ryan Bloom
860eb11705 Add a pool to dupfile. There is no reason that when we duplicate a file, we would want to use the same pool for the duplicated file as we used for
the original file.  This should solve a problem we were having with
dieing quietly on startup, because we are no longer closing stderr in the
original process and then opening the config file as file descriptor 2.

The original problem report can be found in the message
<20000311232812.A1066@sanguine.linuxcare.com.au>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84985 13f79535-47bb-0310-9956-ffa450edef68
2000-04-17 19:57:30 +00:00
Ryan Bloom
de3a77dc01 Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages
on Linux, but probably breaks somewhere.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84963 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 15:59:20 +00:00
Jeff Trawick
92cafef56b stop relying on a macro to map signal() to ap_signal(); call
ap_signal() directly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84914 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 01:23:51 +00:00
Bill Stoddard
0b0be5337c Eliminate apr_win.h and apr_winconfig.h (and the ugly #ifdefs they cause).
Now, apr.h and apr_config.h are generated from apr.hw and apr_config.hw
at build time. At this point, the server will not compile on Windows because
of the recent DSO commits. Fixing those next.

Submitted by: Bill Rowe & Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84896 13f79535-47bb-0310-9956-ffa450edef68
2000-04-03 18:40:44 +00:00
Roy T. Fielding
057b29f829 Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84878 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 08:44:21 +00:00
Jim Jagielski
70ef1e69d5 Backport the CSS security fixes to Apache 2.0a. Or is that forward
port? My sense of direction is all confused.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84751 13f79535-47bb-0310-9956-ffa450edef68
2000-03-13 20:27:29 +00:00
Ryan Bloom
b1c26f031a Fix all the License issues. Including:
s/Apache Group/Apache Software Foundation/
s/1999/2000/
s/Sascha's license/ASF license


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84725 13f79535-47bb-0310-9956-ffa450edef68
2000-03-10 00:07:37 +00:00
Ryan Bloom
1a47df7dd3 Fix the logic for ap_signal, so it is exposed in external header files in APR.
Also change the header file included in http_log.c.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84700 13f79535-47bb-0310-9956-ffa450edef68
2000-03-02 20:36:46 +00:00
dgaudet
7dd8a75266 clean up a bunch of -Wall/etc warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84698 13f79535-47bb-0310-9956-ffa450edef68
2000-03-02 11:05:17 +00:00
Bill Stoddard
2a1ed8bb9f Ahh, found ap_flush()!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84643 13f79535-47bb-0310-9956-ffa450edef68
2000-02-18 14:18:11 +00:00
Bill Stoddard
7e977c5c9e Update Windows ap_filedup() call to recognise when it is asked to dup2
a standard i/o handle. Return error if the dup2 handle is not one of the
standard i/o handles (because Windows does not support a dup2 style function
to operate on native file handles)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84638 13f79535-47bb-0310-9956-ffa450edef68
2000-02-17 19:03:52 +00:00
Bill Stoddard
bdad3347fb ap_dupfile (specifically dup2) is not available in a general form under Windows.
So use SetStdHandle directly. A single call to ap_dup2stderr() (or similar) could
replace the entire chunk of code in the #ifdef #else #endif block.  Ryan didn't
want to put this speciality function into APR, but we could put it into os.c
if folks are interested.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84624 13f79535-47bb-0310-9956-ffa450edef68
2000-02-15 22:51:23 +00:00
Bill Stoddard
b99c3eec37 First step to get piped logs working on Windows (and Unix as well).
There are still all kinds of problems in http_log.c. This patch just
barely scratches the surface.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84622 13f79535-47bb-0310-9956-ffa450edef68
2000-02-15 00:54:06 +00:00
Martin Kraemer
5bb2506c9a Enforce a sensible permission on the httpd.pid file.
Submitted by:	Frank Miller <frankm@system-associates.com>
Reviewed by:	Martin Kraemer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84547 13f79535-47bb-0310-9956-ffa450edef68
2000-01-31 23:14:41 +00:00
Ryan Bloom
a8ce196da5 Finish the commits for the change in the header files. Basically, this hides
all of the Apache macros that modules don't need access to.  This should
have been committed with the modules, but I wasn't paying attention to the
directory I was in when I ran the commit.
Submitted by:	Manoj Kasichainula and Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84493 13f79535-47bb-0310-9956-ffa450edef68
2000-01-19 01:16:31 +00:00
dgaudet
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
Ryan Bloom
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
Ryan Bloom
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
Ryan Bloom
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
Ryan Bloom
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
Ryan Bloom
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
Manoj Kasichainula
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
Manoj Kasichainula
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
Ryan Bloom
975ea85ea2 First step in removing the fprintf(stderr problem from Apache. Basically,
I defined APLOG_STARTUP, which refrains from printing the date string
and the log level information in log_error_core.  I then changed all the
fprintf(stderr calls to ap_log_error, and used APLOG_STARTUP.
log_error_core on Unix takes care of creating a log file and directing
it to stderr if a log file isn't already active.  I will continue to
make these changes tomorrow.  Currently, the main code and the dexter
mpm have been modified.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84134 13f79535-47bb-0310-9956-ffa450edef68
1999-11-18 23:07:53 +00:00
Brian Havard
ade03101b9 Get rid of a number of 'incompatible pointer type' warnings using
ap_os_{get,put}_file() on platforms who's ap_os_file_t is not an int.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84109 13f79535-47bb-0310-9956-ffa450edef68
1999-11-08 06:05:50 +00:00
Manoj Kasichainula
de46b1035b Stop using APR_BUFFERED for the error log and httpd.pid file. The error
logging code has been tweaked a bit so that we still have one write per
log entry.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84108 13f79535-47bb-0310-9956-ffa450edef68
1999-11-05 21:01:44 +00:00
Martin Kraemer
e7d4a013c2 Be on the safe side
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84028 13f79535-47bb-0310-9956-ffa450edef68
1999-10-23 21:27:38 +00:00
Ryan Bloom
482dcf3495 Add a status value to ap_log_error and ap_log_rerror. This allows us to use
apr_status codes in our error logs.  The main advantage of this, is portable
error codes.  Now, Windows will finally be able to use errno!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84007 13f79535-47bb-0310-9956-ffa450edef68
1999-10-20 12:50:12 +00:00
Brian Havard
77917c57a4 Need APR_CREATE flag when opening error log & pid file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84005 13f79535-47bb-0310-9956-ffa450edef68
1999-10-19 15:52:24 +00:00
Ryan Bloom
234823c5c5 I missed one function when swapping paramters. This fixes it. I think I
have caught them all this time.  I really hope this is the final time I have
to swap parameters.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83996 13f79535-47bb-0310-9956-ffa450edef68
1999-10-14 14:36:49 +00:00
Ryan Bloom
25c184d3e7 This finishes the argument swaps. The docs haven't been updated, and
probably won't be for a while yet.  These argument orders have been
documented in the APR Design doc committed earlier today.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83963 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 17:52:28 +00:00
Ryan Bloom
018feacc4b Make Apache use the new ap_create_process call. This is the first of a
group of patches.  This patch, allows the core server to compile and
serve pages.  There is a set of patches which will follow to allow the
standard modules to use ap_create_process.  This change should make
writing code which spawns new processes easy to read and understand.
Submitted by:	Paul Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83959 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 14:20:48 +00:00
Ryan Bloom
e75cbac28c Bring file_io up to the new parameter order for APR. I have decided to do
these on a directory by directory basis for the rest of APR.  I hope to
cause fewer problems for other developers by doing it this way.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83937 13f79535-47bb-0310-9956-ffa450edef68
1999-10-06 23:04:16 +00:00
Ryan Bloom
2b361ec557 First patch to re-order function parameters. This one gets the low hanging
fruit, and moves most of the result parameters to the first argument.
Future patches in this series will move the rest of the result parameters
to the beginning of the list, and will move the context's to the end of the
list


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83927 13f79535-47bb-0310-9956-ffa450edef68
1999-10-04 16:38:16 +00:00
Ryan Bloom
69adf379b4 Remove all of the calls to functions like "ap_popenf". These functions were
moved down to APR, but they are being removed.  They are not portable, and
were only moved down for backwards compatability.  With this change, they can
be safely removed, which is the next commit on it's way.
Submitted by:  Ryan Bloom and Paul Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83879 13f79535-47bb-0310-9956-ffa450edef68
1999-09-08 14:15:55 +00:00
Ryan Bloom
c37f14ddf3 Changed pools to contexts. Tested with prefork and pthread mpm's. I'll
check this out tomorrow and make sure everything was checked in correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83852 13f79535-47bb-0310-9956-ffa450edef68
1999-08-31 05:35:52 +00:00
Roy T. Fielding
44679abe2b Odd comments and leftover bits from the pthreads version.
The comments really should be deleted, or at least cleaned up.

Submitted by:	pthreads leftovers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83779 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:30:39 +00:00
Roy T. Fielding
1fa9e10844 Sorry, but using C comments in place of C++ comments
makes life for me and my compiler much easier.

This one should be back-ported to Apache 1.3.10-dev

Submitted by:	Martin Kraemer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83771 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 14:37:39 +00:00
Roy T. Fielding
19bca355c1 Replace all alarms and timeouts with a mutex on alloc.
Replace file descriptors with APRFile.
Add ap_is_aborted macro.

Submitted by:	Bill Stoddard, Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83766 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 12:54:16 +00:00
Roy T. Fielding
6f96ad5227 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83750 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 06:46:03 +00:00