1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00

560 Commits

Author SHA1 Message Date
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
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
Ryan Bloom
63f93a6504 Backout layered I/O changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84842 13f79535-47bb-0310-9956-ffa450edef68
2000-03-27 16:22:30 +00:00
Ryan Bloom
6a4d775449 Enabled layered I/O. Docs are forthcoming.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84837 13f79535-47bb-0310-9956-ffa450edef68
2000-03-25 15:00:10 +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
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
7763f0ace7 Set timeouts to sendfile operation in http_protocol.c. Fix bugs in Win32
sendfile implementation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84543 13f79535-47bb-0310-9956-ffa450edef68
2000-01-31 19:21:37 +00:00
Ryan Bloom
f8a7fce423 Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is
defined correctly in all C files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84531 13f79535-47bb-0310-9956-ffa450edef68
2000-01-28 18:02:29 +00:00
Bill Stoddard
e38f994a9d More sendfile work. Use new sendfile API in Apache, update Windows MPM
to begin using APR socket API.
Note:
sendfile on Unix side is broken. Need to detect for NULL hdtr. I'll do
it later this week if no one else steps up.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84529 13f79535-47bb-0310-9956-ffa450edef68
2000-01-27 05:58:00 +00:00
Ryan Bloom
0432102c4f Cleanup a few things with the compile. There were also a few macro name
changes I missed earlier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84496 13f79535-47bb-0310-9956-ffa450edef68
2000-01-19 02:09:03 +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
Bill Stoddard
d1451eb401 Update Windows port to new file_io and time specs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84483 13f79535-47bb-0310-9956-ffa450edef68
2000-01-17 19:37:55 +00:00
Ryan Bloom
941a96936e Fix some remaining problems with SSI's and Windows. Basically, the
sendfile stuff doesn't work properly with chuncked data.
Submitted by:	Allan Edwards
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84448 13f79535-47bb-0310-9956-ffa450edef68
2000-01-12 18:20:43 +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
ed4c96e92d Change ap_gm_timestr_822 to ap_timestr. Now, one function can be used to get
a timestr for GMT and Localtimes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84352 13f79535-47bb-0310-9956-ffa450edef68
1999-12-21 16:21:44 +00:00
Tony Finch
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
Ryan Bloom
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
David Reid
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
Bill Stoddard
62b6269551 Fix Windows build break
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84268 13f79535-47bb-0310-9956-ffa450edef68
1999-12-09 21:47:45 +00:00
Manoj Kasichainula
5e8f51cb00 The extra (n < 1) check is redundant, leftover from pre-APR code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84192 13f79535-47bb-0310-9956-ffa450edef68
1999-11-30 03:36:33 +00:00
David Reid
98ad401c48 Next stage of ap_mmap support. Tested on FreeBSD and BeOS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84139 13f79535-47bb-0310-9956-ffa450edef68
1999-11-20 11:56:13 +00:00
Ryan Bloom
370fc31b00 Cleanup the ZZZ comments. Basically these used to mark places where APR
is needed.  It is much easier to do this conversion by hand than by
searching for old comments, so they are going away now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84128 13f79535-47bb-0310-9956-ffa450edef68
1999-11-16 18:32:05 +00:00
Bill Stoddard
e63638c46b Export ap_send_error_response
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84107 13f79535-47bb-0310-9956-ffa450edef68
1999-11-05 15:45:05 +00:00
Brian Havard
2829b12529 OS/2: Don't return APR_EOF from ap_read(). EOF is indicated by a APR_SUCCESS
status with nbytes set to 0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84097 13f79535-47bb-0310-9956-ffa450edef68
1999-11-03 12:47:23 +00:00
Bill Stoddard
b4c19fa524 Delete useless code...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84090 13f79535-47bb-0310-9956-ffa450edef68
1999-11-02 14:34:32 +00:00
Bill Stoddard
ee53e27fb6 First cut at adding a sendfile API to IOL. Eventually need to move iol_socket
into APR...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84089 13f79535-47bb-0310-9956-ffa450edef68
1999-11-02 14:30:23 +00:00
Brian Havard
36fdf82e45 In ap_send_fb_length() don't treat APR_EOF as a fatal error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84081 13f79535-47bb-0310-9956-ffa450edef68
1999-11-01 10:50:47 +00:00
Manoj Kasichainula
570a2b8bb4 Finish removing references to errno from buff, by introducing
ap_berror() to return the status from calls that don't return an
ap_status_t.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84077 13f79535-47bb-0310-9956-ffa450edef68
1999-10-31 09:13:22 +00:00
Manoj Kasichainula
2c5ab99008 Undo the ap_bgets errno patch. It will return status with ap_berror().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84076 13f79535-47bb-0310-9956-ffa450edef68
1999-10-31 09:02:55 +00:00
Manoj Kasichainula
9056dc8abc An errnoless interface for ap_bgets
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84075 13f79535-47bb-0310-9956-ffa450edef68
1999-10-30 08:05:10 +00:00
Manoj Kasichainula
b73b1bf345 ap_bwrite now exports an errnoless interface.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84074 13f79535-47bb-0310-9956-ffa450edef68
1999-10-30 05:25:32 +00:00
Manoj Kasichainula
d74bab7548 Change ap_bread's interface to no longer require errno.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84073 13f79535-47bb-0310-9956-ffa450edef68
1999-10-30 02:06:34 +00:00
Manoj Kasichainula
8c4d317e7f ap_bflush and ap_bclose now return ap_status_t error codes instead of
returning -1 and setting errno.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84040 13f79535-47bb-0310-9956-ffa450edef68
1999-10-26 22:25:02 +00:00
Manoj Kasichainula
0c15754e72 One ap_bflush to the client wasn't checked. Now fixed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84039 13f79535-47bb-0310-9956-ffa450edef68
1999-10-26 22:15:16 +00:00
Ben Laurie
9030edb03b Size rigour.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84032 13f79535-47bb-0310-9956-ffa450edef68
1999-10-24 19:24:13 +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
Manoj Kasichainula
8d98d62709 Add a connection status table to replace the old function of the
scoreboard. It allows MPMs to implement their own mechanism for the
status table and allows any module to add its own per-connection status
entries.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83982 13f79535-47bb-0310-9956-ffa450edef68
1999-10-13 05:24:16 +00:00
Manoj Kasichainula
924c199a50 Eliminate a warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83980 13f79535-47bb-0310-9956-ffa450edef68
1999-10-12 20:38:58 +00:00
Manoj Kasichainula
6bef7d28f8 Attempt to make ap_send_fb work again. This is untested, but it works
better than the old version because it compiles.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83979 13f79535-47bb-0310-9956-ffa450edef68
1999-10-12 20:36:56 +00:00
Martin Kraemer
0c7673561b Fix typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83969 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 22:07:29 +00:00
Bill Stoddard
6737d44fe5 Update ap_send_fd() and ap_send_fd_length() to use an ap_file_t. Hummm...
Still need to get sendfile() in. First, lets get the serving basically
working again :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83930 13f79535-47bb-0310-9956-ffa450edef68
1999-10-05 05:14:43 +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
e4e32bb59e A change to how APR uses user data. Now, user data is a linked list that
is retreivable using a char string.  Basically, you provide a string that
will be used as a key when you store the data.  If the key was used before,
we will overwrite the old data.  When you want to retreive your data, pass
in the same key, and we will find the data you care about.  This also makes
it harder to put user data in when creating a context, so that option has
disappeared.  It is also impossible to inherit user data from parent contexts.
This option may be added in later.  I will be documenting this VERY soon.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83901 13f79535-47bb-0310-9956-ffa450edef68
1999-09-14 13:37:45 +00:00
Ben Laurie
5536bd4070 Fix warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83894 13f79535-47bb-0310-9956-ffa450edef68
1999-09-11 22:14:37 +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
Ralf S. Engelschall
895541ebc1 Make ``configure --with-option=devel'' under
GCC 2.95.1 happy by avoiding various warnings...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83836 13f79535-47bb-0310-9956-ffa450edef68
1999-08-28 12:22:10 +00:00
Roy T. Fielding
b8390cd2d2 Reverse the unnecessary change to the interface of ap_parseHTTPdate()
that was discovered while rebuilding the repository.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83821 13f79535-47bb-0310-9956-ffa450edef68
1999-08-27 22:18:49 +00:00