1
0
mirror of https://github.com/apache/httpd.git synced 2025-06-04 21:42:15 +03:00

579 Commits

Author SHA1 Message Date
Jeff Trawick
1db6e020f1 logresolve: Allow size of log line buffer to be overridden at
build time (MAXLINE).

PR:          27793


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103060 13f79535-47bb-0310-9956-ffa450edef68
2004-03-21 11:13:13 +00:00
Jean-Jacques Clar
ec3144682b Using ap_max() to ensure no negative values are stored in data structure.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103035 13f79535-47bb-0310-9956-ffa450edef68
2004-03-19 15:39:45 +00:00
Madhusudan Mathihalli
8915b61c79 Add Missing parenthesis !
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103015 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 23:16:33 +00:00
Madhusudan Mathihalli
87d5e2ed2b Limit the concurrency to MAX_CONCURRENCY.
Otherwise, ab may dump core (calloc fails) when a arbitrarily huge value
is used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103011 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 18:22:35 +00:00
Bradley Nicholes
3574543174 Remove the OMIT_DELONCLOSE #ifdef since this should happen automatically with the apr_temp_dir_get() function.
Submitted by: Guenter Knauf <eflash@gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103007 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 01:17:26 +00:00
Bradley Nicholes
65c9f17999 Add a terminate function that gets called on atexit() so that NetWare has the chance to pause the screen to view the output before the screen is destroyed.
Submitted by: Guenter Knauf <eflash@gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103005 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 01:03:27 +00:00
Bradley Nicholes
3bbfe194f2 Replace calls to fprintf() with apr_file_printf()
submitted by: Guenter Knauf <eflash@gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103004 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 00:18:47 +00:00
Bradley Nicholes
c591775efc Replace tabs with spaces
Submitted by: Guenter Knauf <eflash@gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103003 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 00:17:21 +00:00
Bradley Nicholes
140a0683fd Remove the dependance on external cp/copy commands
Submitted by: Guenter Knauf <eflash@gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103002 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 00:15:12 +00:00
Jean-Jacques Clar
a6aee15e59 using build in err function, thanks Jeff for pointing that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103000 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 00:06:44 +00:00
Bradley Nicholes
5095c3880c Use apr_temp_dir_get() to get the temporary directory
Submitted by: Guenter Knauf <eflash@gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102998 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 00:04:35 +00:00
Bradley Nicholes
6fe7808cbe Use the default logger screen for the ab output because it is scrollable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102992 13f79535-47bb-0310-9956-ffa450edef68
2004-03-16 19:22:46 +00:00
Jean-Jacques Clar
9cc9ba0aca added check on apr_pollset_create() return value to exit ab it case it fails.
On NetWare using a concurrency higher than 64 is segfaulting because of FD_SETSIZE as a value of 64.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102990 13f79535-47bb-0310-9956-ffa450edef68
2004-03-16 16:57:02 +00:00
Thom May
a1d5470e1e htpasswd.c: various cleanups and move to using apr_temp_dir_get()
Submitted by: Guenter Knauf
Reviewed by: Thom May


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102950 13f79535-47bb-0310-9956-ffa450edef68
2004-03-13 22:18:19 +00:00
Joe Orton
15e2a44274 Fix use of mod_ssl as a DSO linked against static SSL libraries; also
stop linking all of support/* against the SSL libraries:

* acinclude.m4 (APACHE_MODULE): Define MOD_FOO_LDADD which each
module .la library will be linked against.
(APACHE_MODPATH_ADD): Link static modules against the provided libraries.
(APACHE_CHECK_SSL_TOOLKIT): Put SSL libraries in SSL_LIBS and export
that to config_vars.mk.

* support/Makefile.in: Link ab against SSL_LIBS.

* modules/ssl/config.m4: Add SSL_LIBS and distcache libraries to
MOD_SSL_LDADD.

PR: 17217


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102870 13f79535-47bb-0310-9956-ffa450edef68
2004-03-06 16:47:41 +00:00
André Malo
eeb57c17ad fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102619 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:40:53 +00:00
André Malo
c0dcb76491 fix copyright dates according the first cehck in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102592 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 14:14:53 +00:00
André Malo
60bf503378 fix copyright date according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102590 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 14:05:43 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
Joe Orton
634513a345 * support/Makefile.in (suexec): Don't link against libapr etc; suexec
is self-contained.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102491 13f79535-47bb-0310-9956-ffa450edef68
2004-02-03 19:37:34 +00:00
Ben Laurie
d43870bbf3 Note GNU difference.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102349 13f79535-47bb-0310-9956-ffa450edef68
2004-01-15 20:51:09 +00:00
Joe Orton
7a06ef17b2 * support/ab.c (write_request): Fix gcc warning at -O2 in USE_SSL
build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102155 13f79535-47bb-0310-9956-ffa450edef68
2004-01-03 15:58:19 +00:00
Ben Laurie
c154a09f30 Add forensic logging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102141 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 15:39:30 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
Joe Orton
e0360b3575 Fix ab's SSL support a little:
* support/ab.c (ssl_*): Fix function prototypes througout.
(test): Use correct connection structure when using SSL.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102014 13f79535-47bb-0310-9956-ffa450edef68
2003-12-10 16:08:44 +00:00
Justin Erenkrantz
1e1a131b4e If we have a comment, place in a ':' not a ';' (has this *ever* worked?)
If -n is specified and we have a comment, print the comment out too.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101946 13f79535-47bb-0310-9956-ffa450edef68
2003-12-02 09:41:45 +00:00
Joe Orton
ad89dca474 * support/logresolve.c (strdup): Remove, APR already
provides this if necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101704 13f79535-47bb-0310-9956-ffa450edef68
2003-11-05 17:21:56 +00:00
Jeff Trawick
a7f1773e89 this won't work with 5.003, so bump up the require to
5.004:

  my $cntopen = () = ($before =~ m|^\s*<[^/].*$|mg);


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101296 13f79535-47bb-0310-9956-ffa450edef68
2003-09-19 19:55:16 +00:00
William A. Rowe Jr
bea15a2e01 Simplify includes - we always (in HTTPD 2.1 forward) are looking
for the openssl/foo.h headers explicitly.  Fix the abs.dsp build
  to define HAVE_OPENSSL instead of USE_SSL so the correct headers
  are included upfront.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101195 13f79535-47bb-0310-9956-ffa450edef68
2003-09-08 16:03:49 +00:00
Martin Kraemer
62af9ca378 Still in 2003
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101194 13f79535-47bb-0310-9956-ffa450edef68
2003-09-08 15:29:40 +00:00
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
Martin Kraemer
a7f39b1d90 Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100959 13f79535-47bb-0310-9956-ffa450edef68
2003-08-11 08:03:41 +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
André Malo
cf9772a8fc Remember an authenticated user during internal redirects if the
redirection target is not access protected and pass it
to scripts using the REDIRECT_REMOTE_USER environment variable.

PR: 10678, 11602.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100604 13f79535-47bb-0310-9956-ffa450edef68
2003-07-14 17:24:38 +00:00
André Malo
e1eff53b89 Propagate the handler name to the action script via
the REDIRECT_HANDLER environment variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100598 13f79535-47bb-0310-9956-ffa450edef68
2003-07-14 16:04:47 +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
Justin Erenkrantz
5cbcc8cf8f Perform run-time query in apxs for apr and apr-util's includes.
This is required when they are in disjoint directories from httpd.  Otherwise,
apxs won't pass their include information into the compiler and the
compilation will fail.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99981 13f79535-47bb-0310-9956-ffa450edef68
2003-05-21 06:56:35 +00:00
Thom May
28fa358552 Add a delete flag to htpasswd.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99828 13f79535-47bb-0310-9956-ffa450edef68
2003-05-14 19:23:30 +00:00
André Malo
abe287956a (grabbed from archive)
Check the processed file on validity. If a line is not empty
and not a comment, it must contain at least one colon. Otherwise exit
with error code 7.

Submitted by: Thom May <thom@planetarytramp.net> (on 2002-07-02)
              Kris Verbeeck <Kris.Verbeeck@ubizen.com> (on 2002-10-22)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99771 13f79535-47bb-0310-9956-ffa450edef68
2003-05-13 03:40:29 +00:00
Martin Kraemer
0a10e92c0a I stumbled over a 2002 (it's not the only one)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99749 13f79535-47bb-0310-9956-ffa450edef68
2003-05-09 21:52:11 +00:00
Thom May
6a917afcdb Forward port a fix for a pair of potential buffer overflows in htdigest from 1.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99680 13f79535-47bb-0310-9956-ffa450edef68
2003-05-01 13:45:38 +00:00
Jeff Trawick
a0fdb69ddd run libtool from the apr install directory (in case that is different
from the apache install directory)

further changes are needed to automatically pick up apr and apr-util
include directories; for now, "-Wc,-I/path" needs to be added to the
apxs -c invocation to work around that problem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99213 13f79535-47bb-0310-9956-ffa450edef68
2003-04-04 19:04:21 +00:00
André Malo
3dc90e431c Fix mod_ssl.dsp and abs.dsp to use also the openssl-0.9.7-defines for
NO_MD5, NO_IDEA and NO_MDC2 (won't compile otherwise with 0.9.7+ and
restricted crypto algorithms)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99107 13f79535-47bb-0310-9956-ffa450edef68
2003-03-29 04:39:08 +00:00
Bradley Nicholes
bc9f1dba49 Fix up the log resolve utility to work with NetWare. Increased the stack size
and fixed WSAStartup to use the correct version number


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98984 13f79535-47bb-0310-9956-ffa450edef68
2003-03-11 19:11:17 +00:00