1
0
mirror of https://github.com/apache/httpd.git synced 2025-06-13 16:41:33 +03:00
Commit Graph

143 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
516688c8c2 APR-ize the CHARSET_EBCDIC support in ap_base64encode() and
ap_base64decode().  The app (e.g., Apache, ab) must call a function
to set up translation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85226 13f79535-47bb-0310-9956-ffa450edef68
2000-05-16 03:11:13 +00:00
1d6866385c Fix some bugs (mostly lost 1.3 code) in ab's command-line processing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85223 13f79535-47bb-0310-9956-ffa450edef68
2000-05-16 02:42:57 +00:00
607d91d897 add missing ';' in non-ASCII path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85120 13f79535-47bb-0310-9956-ffa450edef68
2000-05-01 15:56:26 +00:00
6bb2ecf9c8 Win32:
install ab.exe
  fix dependency in Apache.dsw (ab is dependent on aprlib and ap)
  fix ab and htdigest projects so that they find all header files
  define ap_signal() in apr.hw - this is o.k. for casual use as with
    cmd-line programs
  use API_VAR_EXPORT as appropriate in getopt.c
general:
  ab doesn't need to declare ap_optarg/ap_optind; fix a warning
  htdigest needs to call ap_initialize() to avoid segfault at
    startup


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85080 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 18:25:02 +00:00
b47c5b45e7 Build ab on Win32.
Fix some minor ab APR-ization issues.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85068 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 01:37:42 +00:00
8b087b6209 Repair ap_poll() on UNIX systems where APR's poll flags
have different values than the system's poll flags (i.e.,
call get_revents() to translate flags before returning to
the caller; otherwise, they are quite meaningless :) ).

Fix ab's usage of the new ap_poll() and repair some APR-ization
breakage (e.g., not setting port prior to ap_connect()).

Uninteresting changes:

Change toascii to to_ascii in ab.c to avoid a conflict with MSVC++'s
toascii() (I enabled the NOT_ASCII logic in ab on Win32 recently to
verify that ap_xlate_X() returned the correct error codes and got
warnings on toascii.

get_revent() was reformatted unintentionally.  Sorry.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85063 13f79535-47bb-0310-9956-ffa450edef68
2000-04-27 20:11:34 +00:00
b88630623e I have merged the two ab files together, the one from src/support and
src/lib/apr/test.  This means that the ab program in the support
directory is now portable using APR.  This has only gone through the
barest of testing, and needs to be tested much better.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85055 13f79535-47bb-0310-9956-ffa450edef68
2000-04-27 05:56:41 +00:00
e63f4def85 Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84881 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 09:42:55 +00:00
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
5630e64123 Add CVS Revision number to ab.c to allow for detecting changes
which were not marked by a version number update. Additionally,
display base repository name (apache-2.0)

Also, merge revision 1.34 of the 1.3 branch:
 Made sure ApacheBench (ab) performs no more requests than
 specified on command line (option -n).

Submitted by: Jim Cox <jc@superlink.net>
Reviewed by: Ralf S. Engelschall
PR: 4839


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84056 13f79535-47bb-0310-9956-ffa450edef68
1999-10-27 22:36:20 +00:00
a9c5b29052 These changes allow the support programs to compile on BeOS.
The biggest change is in ab.c where the functions that BeOS needs that
aren't the standard format are hidden behind a new ab_* define.  Tested
on FreeBSD and BeOS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83964 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 20:25:08 +00:00
7b311b0641 Re-sync to most up-to-date ab.c version 1.3b
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83946 13f79535-47bb-0310-9956-ffa450edef68
1999-10-07 21:53:46 +00:00
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
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