1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Commit Graph

214 Commits

Author SHA1 Message Date
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
Jeff Trawick
c43a79fd20 Get ab to build again by changing apr_set_remote_port() to apr_set_port().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86872 13f79535-47bb-0310-9956-ffa450edef68
2000-11-08 18:41:45 +00:00
Jeff Trawick
93bdf51d34 Get rid of some warnings on Solaris 8 by using APR's ctype macros:
logresolve.c: In function `main':
logresolve.c:327: warning: subscript has type `char'
ab.c: In function `main':
ab.c:1074: warning: subscript has type `char'
ab.c:1087: warning: subscript has type `char'


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86793 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 02:12:34 +00:00
David Reid
579ced0d5d Some fixes and a general tidy up of ab. With these changes ab can now
support concurrency levels > 1 against the loopback on BONE and will
actually use all the connections it starts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86595 13f79535-47bb-0310-9956-ffa450edef68
2000-10-15 11:46:22 +00:00
William A. Rowe Jr
01f4c4f960 The lots of little ones... APR_IS_STATUS_condition(rv) conditional macros
replacing the majority of fallible rv == APR_condition tests.  But there
  are lots more to fix, these are the obvious ones that already did proper
  canonical error conversion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86405 13f79535-47bb-0310-9956-ffa450edef68
2000-10-05 17:33:14 +00:00
Jeff Trawick
cc23cc0866 Fix the types of the variables passed as the len parm to bucket->read()
(in various places).
In ab, change the declaration of argv so that it can be passed into
apr_initopt() without warning.
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>
Reviewed and modified slightly by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86229 13f79535-47bb-0310-9956-ffa450edef68
2000-09-14 18:42:58 +00:00
Jeff Trawick
b8e043416b Tweak apr_getopt() and its use in ab to avoid compiler warnings.
(Note: apr_initopt() and/or its callers still need tweaking.)
Submitted by:	Bill Rowe
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86045 13f79535-47bb-0310-9956-ffa450edef68
2000-08-10 12:52:37 +00:00
William A. Rowe Jr
a270d783a0 Fix ApacheBench for the apr_initopt/apr_getopt change. This illustrates
abusing the apr_getopt_t for direct access at the working structure, just
  as we did with the global vars.  By my global search, there should be no
  more apr_opt*** symbols out there.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86037 13f79535-47bb-0310-9956-ffa450edef68
2000-08-09 15:01:59 +00:00
Jeff Trawick
f7ec9ddb5b A few more (last?) ap_xlate->apr_xlate changes covering stuff not completely
handled in the big apr rename last week.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86020 13f79535-47bb-0310-9956-ffa450edef68
2000-08-07 20:11:37 +00:00
Jeff Trawick
99cf606197 Fix some problems with the apr conversion so that APACHE_XLATE builds work
again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86018 13f79535-47bb-0310-9956-ffa450edef68
2000-08-07 19:26:02 +00:00
William A. Rowe Jr
1a9db204f5 Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation...
see src/lib/apr/apr_compat.h for most details.
  Also a few minor nits to get Win32 to build.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86008 13f79535-47bb-0310-9956-ffa450edef68
2000-08-06 06:07:53 +00:00
Doug MacEachern
059d8dd212 prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 05:27:38 +00:00
Jeff Trawick
b6faa37675 Don't use perror() to report the failure of an APR function.
Introduce apr_err() for that purpose.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85962 13f79535-47bb-0310-9956-ffa450edef68
2000-07-31 14:50:50 +00:00
Roy T. Fielding
7a357441ab ab would start up more connections than needed, then quit when the
desired number were finished. Also fixed a logic error involving
ab keepalives.

Submitted by:	Victor J. Orlikowski
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85855 13f79535-47bb-0310-9956-ffa450edef68
2000-07-16 00:06:39 +00:00
Ryan Bloom
750d8cc03c Protect system header files with the appropriate macros.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85558 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 23:03:05 +00:00
William A. Rowe Jr
d82e6e26e3 PR:
Obtained from:
Submitted by:
Reviewed by:

  One reason ap_config.h can be a problem.  Change VERSION->AB_VERSION to
  avoid ap_config.h #undef.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85320 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 23:49:07 +00:00
Ryan Bloom
b5e7b4304a Remove a warning about ap_base64encode not being defined anywhere.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85261 13f79535-47bb-0310-9956-ffa450edef68
2000-05-19 22:39:40 +00:00
Jeff Trawick
b31d97deda ab: Fix a command-line processing bug; track bad headers in
err_response; support reading headers up to 2K.  (In the
original patch it was 8K instead of 2K; it isn't clear to me
that 8K is really needed or appropriate.)
Submitted by:	Ask Bjoern Hansen <ask@valueclick.com>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85251 13f79535-47bb-0310-9956-ffa450edef68
2000-05-19 02:18:06 +00:00