www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-14 01:22:37 +03:00
Code Activity
26,419 Commits 62 Branches 304 Tags
1755dc97033f4c7129f1f8c9380510517c7005a4
Commit Graph

231 Commits

Author SHA1 Message Date
Jeff Trawick
aa21671e13 switch to APR 1.0 API (which is still in flux) 
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
 2003-09-03 19:27:12 +00:00
Jeff Trawick
92286bea45 distinguish between these two states: 
. just issued connect(), polling for writability to find out when connect()
  completed
. already connected, waiting for data from the server so polling for
  readability

by only polling for writability during the first state, we avoid some
logic in test() which inappropriately writes multiple requests to the
server

btw, the most basic SSL test segfaulted before and after this commit


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100889 13f79535-47bb-0310-9956-ffa450edef68
 2003-08-01 10:41:46 +00:00
Jeff Trawick
5f94c42bd6 restore a check for write failures which was lost for non-SSL builds 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100888 13f79535-47bb-0310-9956-ffa450edef68
 2003-08-01 08:57:43 +00:00
Jeff Trawick
548da410d3 ab: Work over non-loopback on Unix again. 
(Broken as of 2.0.47 due to dependence on an APR bug which was fixed
in 2.0.47.)

PR:   21495


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100846 13f79535-47bb-0310-9956-ffa450edef68
 2003-07-29 18:25:15 +00:00
André Malo
6d5e39b8f7 reject overlong credentials from the commandline 
Acked by: Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100718 13f79535-47bb-0310-9956-ffa450edef68
 2003-07-21 11:41:01 +00:00
Joe Orton
32bc13995e Pick up getpid() prototype. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100539 13f79535-47bb-0310-9956-ffa450edef68
 2003-07-10 19:16:35 +00:00
André Malo
140f805d92 catch out of memory condition (ID 29 of reasoning report) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100447 13f79535-47bb-0310-9956-ffa450edef68
 2003-07-03 16:07:21 +00:00
André Malo
dbdd2df050 Fix NULL-pointer issue in ab when parsing an incomplete or non-HTTP 
response.

PR: 21085
Submitted by:	Glenn Nielsen <glenn@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100399 13f79535-47bb-0310-9956-ffa450edef68
 2003-06-29 17:41:56 +00:00
William A. Rowe Jr
5dadb2bfe0 Absorb our ssl library-foo from the mod_ssl build changes to automatically 
generate an SSL/https: enabled ab binary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100351 13f79535-47bb-0310-9956-ffa450edef68
 2003-06-24 23:09:59 +00:00
André Malo
742af25096 finished that boring job: 
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
 2003-02-03 17:53:28 +00:00
Jeff Trawick
4de39c7a9c %qd is not portable; use APR_INT64_FMT_T for apr_time_t 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97237 13f79535-47bb-0310-9956-ffa450edef68
 2002-10-16 12:39:21 +00:00
Brian Pane
77e39cec55 Eliminated some fixed-size buffers that didn't have proper overflow checks 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96611 13f79535-47bb-0310-9956-ffa450edef68
 2002-09-01 21:11:17 +00:00
Aaron Bannert
7d3f32a290 Keep track of the recent changes for the new pollset API, since they 
may affect performance characteristics.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96607 13f79535-47bb-0310-9956-ffa450edef68
 2002-09-01 06:25:42 +00:00
Brian Pane
dedff7e1bc Switched ab to the new abstract pollset API (this will 
allow ab to take advantage of future apr_pollset_t scalability
improvements)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96603 13f79535-47bb-0310-9956-ffa450edef68
 2002-09-01 04:26:32 +00:00
Martin Kraemer
0389ecf42b Leon Brocard writes: 
> Hello,
>
> I love httpd2 and I really like apachebench but using the gnuplot
> output option (-g) gave me this:
>
>   starttime       seconds ctime   dtime   ttime   wait
>   Thu Aug 29 12:29:31 200        1030620571362758        0       54      54      0
>
> It's truncating the year. Now according to
> http://apr.apache.org/docs/apr/group__APR__Time.html#a15 "Unlike
> ANSI/ISO C ctime(), apr_ctime() does not include a \n", so the code
> and comment in ab.c are wrong, hence my attached patch to remove them.

Submitted by:	Leon Brocard <acme@astray.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96586 13f79535-47bb-0310-9956-ffa450edef68
 2002-08-30 12:26:14 +00:00
William A. Rowe Jr
f136a4fce7 Revert to CRYPTO_malloc_init for non-rsa [gotta read the diffs more 
closely the first time.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96301 13f79535-47bb-0310-9956-ffa450edef68
 2002-08-03 22:01:40 +00:00
William A. Rowe Jr
c7f071d0e4 Support rsaref compilation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96300 13f79535-47bb-0310-9956-ffa450edef68
 2002-08-03 22:00:23 +00:00
Jeff Trawick
fb6c16e812 fix a spelling problem 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96234 13f79535-47bb-0310-9956-ffa450edef68
 2002-07-30 13:00:33 +00:00
Martin Kraemer
6efe4acae8 And fix the version number 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96074 13f79535-47bb-0310-9956-ffa450edef68
 2002-07-16 09:30:16 +00:00
Martin Kraemer
30304d4854 Fix the long-standing bug that "ab -t10" would loop for 10000 seconds 
instead of 10 as documented. Also fix an off-by-one-second error, which
did not matter much (in comparison to the 1000x error ;-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96073 13f79535-47bb-0310-9956-ffa450edef68
 2002-07-16 09:28:40 +00:00
William A. Rowe Jr
ed8fc9abae http occurances to update for apr_socket_opt_get/set 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96057 13f79535-47bb-0310-9956-ffa450edef68
 2002-07-15 08:05:11 +00:00
Dirk-Willem van Gulik
45aec24ede We where mixing #if USE_SSL en #ifdef USE_SSL. Since there where 
many more #ifdef's than #if's - Converted the minority to the majority.

Note however that the APR_* defines are usually set to '=1'. So this is
not quite consistent. (I.e. CFLAGS=-DUSE_SSL or CFLAGS=-DUSE_SSL=1).

Dw.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96011 13f79535-47bb-0310-9956-ffa450edef68
 2002-07-11 13:44:12 +00:00
Ryan Bloom
2c94ecadce Bring Apache in line with APR's new poll implementation. This isn't 
optimal, because it still uses the compatibility functions to make it
work, but it does work.  The next step will be to take the memory for
the pollsets under Apache's control.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96005 13f79535-47bb-0310-9956-ffa450edef68
 2002-07-11 05:42:20 +00:00
William A. Rowe Jr
703fabaaa3 If you want floating math, use float literals. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95980 13f79535-47bb-0310-9956-ffa450edef68
 2002-07-08 19:39:01 +00:00
Brian Pane
69ad393a9d fix for compilers that don't support long long datatype 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95967 13f79535-47bb-0310-9956-ffa450edef68
 2002-07-07 06:37:21 +00:00
Brian Pane
65fe92eb20 use the time conversion macros rather than dividing by APR_USEC_PER_SEC 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95960 13f79535-47bb-0310-9956-ffa450edef68
 2002-07-04 22:56:51 +00:00
William A. Rowe Jr
7f9865c91a A few more unused/unnecessary variables and surpress an uninitialized 
value warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95457 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-31 21:33:24 +00:00
William A. Rowe Jr
8dfa16fe6a Enable SSL negotation in ab.c. It is that, or remove all the entirely 
BOGUS ssl config options from ab.c.  If it works, nifty, if not, we now
  have directives that have some effect, rather than no effect, for SSL.

Submitted by:	Madhu Mathihalli <madhusudan_mathihalli@hp.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95451 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-31 19:26:20 +00:00
William A. Rowe Jr
dce5669ea5 Well, know that I'm aware that the ssl stuff was entirely premature, it's 
still worth committing the correct code to handle the port number.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95447 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-31 17:22:58 +00:00
William A. Rowe Jr
7a3c75278f Locks are good, provide locks. ab -s -c >1 is [was?] dying on Win32 
while -s -c 1 works just fine.  Still investigating.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95442 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-31 16:31:29 +00:00
Cliff Woolley
3d9c16b61a There's really no reason for a -dev here. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95168 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-18 06:27:06 +00:00
Paul J. Reder
37060b992e Fix some minor formatting issues with ab. Part of this is 
in reference to PR 8544, the rest I noticed while testing
     the PR fix. [Paul J. Reder]

Submitted By: Carlo Marcelo Arenas Belon
Reviewed By:  Paul J. Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94898 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-01 21:17:18 +00:00
Roy T. Fielding
267591e39f Remove APR_WANT_SIGNAL from apr_want.h because code must include 
apr_signal.h in order to get consistent definitions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94872 13f79535-47bb-0310-9956-ffa450edef68
 2002-04-30 01:29:11 +00:00
Dirk-Willem van Gulik
353bf6e950 During the 1.3->2.0 migragrion; ab its #defined VERSION own string was replaced 
by that of the base server distribution it sits in. Propably by accident.

This is propably not a good idea - as ideally one would like to be able to compare
ab runs as much as possible - even across releases of apache 2.0 - assuming ab or
the dependent APR has not changed (note to self: we do not track APR in our version
structure). This commit decouples the version strings for now. Though the actual
value may be nicely confusing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94792 13f79535-47bb-0310-9956-ffa450edef68
 2002-04-25 08:31:13 +00:00
Aaron Bannert
90ed8206a7 Document the recent AB changes since they have the potential to change 
the meaning of test results.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94787 13f79535-47bb-0310-9956-ffa450edef68
 2002-04-24 23:28:38 +00:00
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