1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-14 01:22:37 +03:00
Commit Graph

231 Commits

Author SHA1 Message Date
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
Ryan Bloom
00ec6af4a5 Cleanups so that the support programs build cleanly. The Win32 values
need to be sanity checked.
Submitted by:	Cliff Woolley <cliffwoolley@yahoo.com>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87506 13f79535-47bb-0310-9956-ffa450edef68
2000-12-22 00:02:52 +00:00
William A. Rowe Jr
c2239e78bd All the supports now build on APR (+APRUTIL), no reliance on httpd.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87501 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 21:00:45 +00:00
William A. Rowe Jr
7c0baa0a3a This program should run entirely without ap_config support from
Apache, given that it is apr'ized


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87498 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 20:29:26 +00:00
Jeff Trawick
999e8d54a7 ab: use apr_parse_addr_port() in parse_url().
httpd.exp: Add the new APR symbol apr_parse_addr_port.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87252 13f79535-47bb-0310-9956-ffa450edef68
2000-12-07 18:12:48 +00:00
William A. Rowe Jr
3a75a983a5 Fix some leftover dirtyness from the conversion. All is building
over in Win32 land.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87223 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 21:02:20 +00:00
Ryan Bloom
fceb721ea9 Make ApacheBench compile cleanly again
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87201 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 05:32:59 +00:00
Jeff Trawick
f6dc4c993e use APR_SIZE_T_FMT to avoid a warning on AIX
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87150 13f79535-47bb-0310-9956-ffa450edef68
2000-12-01 21:51:51 +00:00
Greg Stein
656a5d3081 Use "const char * const *" for process->argv (which is the correct
const-ness since we sometimes put "some string" in there, and also the CRT's
argv). propagate this change within http_main and mpm/winnt/ (also correct
some other const type usage within the MPM).

fix ab's call to parse_url() which removed a const to actually manipulate an
arg from the CRT's argv (indirectly via opt->arg). no idea how this has
avoided segfaulting.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87130 13f79535-47bb-0310-9956-ffa450edef68
2000-11-29 17:33:03 +00:00
Jeff Trawick
4357532361 Get ab to compile cleanly after the apr_initopt() change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87127 13f79535-47bb-0310-9956-ffa450edef68
2000-11-29 13:02:11 +00:00
Greg Stein
ead2dae94c *) Compensate for recent changes in the APR headers. Specifically, some
files need to specifically include stdio.h, or a particular apr_*.h
   header.

*) Adjust callers of apr_create_process() to deal with the extra "const"

*) Add "const" to args of ap_os_create_privileged_process()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87080 13f79535-47bb-0310-9956-ffa450edef68
2000-11-26 04:47:43 +00:00
Jeff Trawick
2d5a108edc Don't use APR_INET6 unless APR_HAVE_INET6 is defined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87056 13f79535-47bb-0310-9956-ffa450edef68
2000-11-21 21:48:48 +00:00
Jeff Trawick
754e923993 Update ab to accept URLs with IPv6 literal address strings (in the
format described in RFC 2732), and to build Host header fields in
the same format.  This allows IPv6 literal address strings to be
used with ab.  This support has been tested against Apache 1.3 with
the KAME patch, but Apache 2.0 does not yet work with this format
of the Host header field.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87054 13f79535-47bb-0310-9956-ffa450edef68
2000-11-21 19:47:14 +00:00
Jeff Trawick
0caf561799 Call apr_create_socket() instead of apr_create_tcp_socket() (deprecated).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87025 13f79535-47bb-0310-9956-ffa450edef68
2000-11-19 14:27:45 +00:00
Jeff Trawick
3463c8ca6c APR: Change apr_connect() to take apr_sockaddr_t instead of hostname.
Add generic apr_create_socket().  Add apr_getaddrinfo() for doing
hostname resolution/address string parsing and building
apr_sockaddr_t.
Submitted by:	David Reid
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86990 13f79535-47bb-0310-9956-ffa450edef68
2000-11-17 03:45:02 +00:00
Ryan Bloom
50758ecf68 Fix a lot of the fallback from the apr_ssize_t to apr_size_t change
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86915 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 19:01:33 +00:00