1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-08 04:22:21 +03:00
Commit Graph

146 Commits

Author SHA1 Message Date
Aaron Bannert
5b19a402e7 Major improvement in concurrent processing for AB:
- Enable non-blocking connects.
- Prevent quasi-blocking mode apr_recv (which would prevent AB from
  multiplexing over the entire descriptor set).
- Catch other fatal apr_recv() errors.

[This patch is slightly different than the one posted to the dev list,
but regardless thanks to the many people who reviewed this.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94782 13f79535-47bb-0310-9956-ffa450edef68
2002-04-24 17:09:59 +00:00
Brian Pane
965c3a8fea fixed a typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94643 13f79535-47bb-0310-9956-ffa450edef68
2002-04-14 09:21:43 +00:00
William A. Rowe Jr
01ba81a1f4 Correct const'ness of argv in all support apps, and use the new
apr_app_initialize over apr_initialize for win32, and other platforms
  that may wish to tweak 'apr-ized' application support (e.g. Netware?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94633 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 19:35:18 +00:00
Dirk-Willem van Gulik
639b242b4a Made AB's use of the Host: header rfc2616 compliant as
reported by Taisuke Yamada <tai@iij.ad.jp>

PR:
Obtained from: Mailing list
Submitted by: Taisuke Yamada <tai@iij.ad.jp>
Reviewed by: Dirk-Willem van Gulik


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94355 13f79535-47bb-0310-9956-ffa450edef68
2002-04-01 04:32:40 +00:00
Dirk-Willem van Gulik
3ffd24a1f1 Removed email address on request - as obviscation was slammed down on the list - and Google is your friend in any case
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94315 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 19:20:40 +00:00
Cliff Woolley
9999686615 What is "zop"? :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94013 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 02:52:20 +00:00
Cliff Woolley
731f6ef006 Carriage returns??
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93994 13f79535-47bb-0310-9956-ffa450edef68
2002-03-18 06:33:53 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Jeff Trawick
53d837b39b simplify the way we find the family of an apr_sockaddr_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93884 13f79535-47bb-0310-9956-ffa450edef68
2002-03-12 23:15:54 +00:00
Brian Pane
1cfef29a33 Fixed segfault in "-i" mode of ab
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93043 13f79535-47bb-0310-9956-ffa450edef68
2002-01-27 06:38:25 +00:00
Jeff Trawick
d44a139606 "totalcon / requests" is no longer double either, so %5e doesn't fly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92247 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 11:30:57 +00:00
William A. Rowe Jr
aabc6ac798 I don't believe it. This actually fixes the rest of the type mismatches.
Of course, I could have hosed everything, a second pair of eyes would be
  appreciated.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92242 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 07:17:09 +00:00
Jeff Trawick
2e3ee5ab47 clean up some warnings on AIX
since apr_size_t isn't always int, we should use
APR_SIZE_T_FMT instead of %d


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91861 13f79535-47bb-0310-9956-ffa450edef68
2001-11-12 01:21:21 +00:00
William A. Rowe Jr
56da963113 Some type correctness fixes for LARGEFILES platforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91521 13f79535-47bb-0310-9956-ffa450edef68
2001-10-17 13:42:22 +00:00
Jeff Trawick
3f3a6898b9 simplify some code in output_results() just a bit to avoid a
bug in gcc 2.7.2.3 on FreeBSD 3.4; didn't hit the problem with
-O2; did hit the problem with no -O


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90501 13f79535-47bb-0310-9956-ffa450edef68
2001-08-22 18:58:36 +00:00
William A. Rowe Jr
03fe07566b Now that it's apr'ized, ab is most definately in a 2.0 revision cycle,
and definately needs to track the Apache revision (especially because of
  apr and apr-util!)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90209 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 08:20:36 +00:00
David Reid
a4ca0ddd1b If we've spent the effort of getting some connections, when we die with an
error at least inform the user how many we completed before dying.
Tidy up some formatting...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89639 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 09:51:43 +00:00
William A. Rowe Jr
6fd9442de5 A smart answer to users attempting the -s arg to ab.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89619 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 16:40:42 +00:00
Jeff Trawick
791dbc3a81 fix the type of parms to apr_send() and apr_recv()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89615 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 12:43:22 +00:00
William A. Rowe Jr
584c93dfb2 Truncate the working set in ab by introducing a connection pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89614 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 04:39:17 +00:00
William A. Rowe Jr
ef32166a5e Hmmm... editing with tabs != 8, eeuh. Just cleaning and fixing casts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89596 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 18:08:57 +00:00
William A. Rowe Jr
1d8d61297f Fix some casting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89595 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 17:56:14 +00:00
William A. Rowe Jr
b65ca11a4a Changes to back out inherit flag from apr_os_sock_make()
and apr_socket_create()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89592 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 16:56:55 +00:00
Ryan Bloom
44715abbd2 Added an inherit flag to apr_socket_create and other socket creation
functions.  This allows APR programs to specify that a socket should
be passed to any child processes that are created.  The inherit flag
is only meaningful if programs use apr_process_create().  This
also adds a couple of macros that allow APR types to set and unset
the inherit flag.

This also fixes Apache to use the new API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89557 13f79535-47bb-0310-9956-ffa450edef68
2001-07-16 16:11:05 +00:00
Cliff Woolley
d3c97dfdac Fix spelling mistake.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89414 13f79535-47bb-0310-9956-ffa450edef68
2001-06-26 04:07:43 +00:00
Jeff Trawick
f5df386762 The patch fixes 2 things.
* apr_terminate now has the right declaration so it can be used
directly in atexit
* Win2K gets a divde by zero error when heartbeatres is zero (reproduce via
    support\Debug\ab.exe -k -c 6 -n 100 localhost/

Submitted by:   Ian Holsman <ianh@cnet.com>
Reviewed by:    Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89383 13f79535-47bb-0310-9956-ffa450edef68
2001-06-18 11:50:42 +00:00
Roy T. Fielding
6cbe701862 Make ab work again by changing its native types to apr types and formats.
Submitted by:	Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88819 13f79535-47bb-0310-9956-ffa450edef68
2001-04-12 07:34:17 +00:00
Jeff Trawick
e14a9d7ce4 Uhh, we really need the prototypes for standard string functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88691 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 16:49:25 +00:00
Dirk-Willem van Gulik
0fbdd4ac53 Make live simpler - as we are using strchr already
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88680 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 01:56:18 +00:00
Dirk-Willem van Gulik
3f6b89bc8e Doing last minute alphabettically sorting things to look nice is not always a good idea.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88677 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 01:41:51 +00:00
Jeff Trawick
1e424f9197 make sure we have the prototype for index() (fixes a Solaris warning)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88675 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 01:39:13 +00:00
Jeff Trawick
981b85f7c5 consistent types; avoid warning on AIX for mismatch between printf
format and arg


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88660 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 21:59:03 +00:00
Jeff Trawick
4af9bfe69e "void *res = signal(blah)" isn't cool 'cause void * is not compatible with
a function pointer; but we don't need to save the old signal pointer anyway
so drop the variable


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88653 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 18:49:44 +00:00
Jeff Trawick
f31fc4448c keep ab from dividing by zero when heartbeatres is zero
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88651 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 17:58:23 +00:00
Ryan Bloom
b138bb7807 Cleanup all the warnings introduced in AB yesterday.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88650 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 17:50:45 +00:00
Dirk-Willem van Gulik
836f8f56a7 Commit early and often. This should merge all changes into
ab from 1.3 into 2.0. SSL work not completed; I need to move
some of the autoconf detection of mod_wtls to a more central
place first. Any suggestions appreciated :-)

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88628 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 06:19:45 +00:00
Dirk-Willem van Gulik
364d2ce3c2 Either MacOS-X is much more sensitive for border conditions - or I am just being
unlucky. This allows for apr_send() to do consequitive partial write's; by keeping
a buffer and TO within ab itself. Ab was already doing that for read anyway.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88627 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 04:39:01 +00:00
Dirk-Willem van Gulik
26b3f51837 First stab at encapsulating the apr_send() to make it a
little more pushy. Ran into this whilst' porting the -1.3
changes forward.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88626 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 03:25:32 +00:00
Dirk-Willem van Gulik
ac04be6309 Prevent cobbering of lenght for subsequent sends. Still not quite
right; we ough to call apr_send again if len != requested_len - but
then our timeout could be len * timeout if we happen to only stuff
one byte down the pipe each time.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88625 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 01:50:40 +00:00
Ryan Bloom
af067d08c3 Use "Basic" authentication instead of "basic" in ab, as the spec says we
should.
PR:	7294
Submitted by:	Andre Breiler <andre.breiler@rd.bbc.co.uk>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88281 13f79535-47bb-0310-9956-ffa450edef68
2001-02-22 23:52:51 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
Jeff Trawick
4bf49b8c6c close the post file after reading it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87827 13f79535-47bb-0310-9956-ffa450edef68
2001-01-25 14:43:28 +00:00
William A. Rowe Jr
cd1ef027c2 The changes required for the APR_FINFO_wanted argument to
apr_stat/lstat/getfileinfo.  These are -NOT- optimal, they
  are simply the required changes to get the server working.
  The size of the patch is a warning about how we need to
  really look at what we are trying to accomplish with all
  of these stat/lstat calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87760 13f79535-47bb-0310-9956-ffa450edef68
2001-01-20 21:42:23 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
William A. Rowe Jr
cbf6e71e06 When is a void fn(void) not a void fn(void)? It's a win32'ism, since
the APR_DECLARE (excluding _NONSTD) uses the pascal convention.  Really
  irrelevant in a function that never needs to clean up (atexit), but
  the compiler complains.  Possible workarounds, but that would break
  non-c lanaguge code from linking into apr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87726 13f79535-47bb-0310-9956-ffa450edef68
2001-01-18 23:54:14 +00:00
Jeff Trawick
c04cb69d4a fix a warning on platforms where apr_size_t isn't int
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87692 13f79535-47bb-0310-9956-ffa450edef68
2001-01-15 20:22:30 +00:00
Jeff Trawick
96314873ff Fix an endless loop in ab which occurred when ab was posting
and the server dropped the connection unexpectedly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87689 13f79535-47bb-0310-9956-ffa450edef68
2001-01-15 18:01:48 +00:00
Jeff Trawick
69c51c783f open_postfile():
fix some return codes along the lines of OtherBill's comment
  fix some bad conditional logic for when to check if we read the
    wrong number of bytes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87671 13f79535-47bb-0310-9956-ffa450edef68
2001-01-12 14:28:17 +00:00
Jeff Trawick
4796d863d1 get rid of a non-portable use of errno
don't return errno as an error flag after an APR function fails; return
something guaranteed to be non-zero on all platforms


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87628 13f79535-47bb-0310-9956-ffa450edef68
2001-01-09 04:48:18 +00:00