1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

5059 Commits

Author SHA1 Message Date
Cliff Woolley
ee760bf405 The bucket should be created with the size of the data NOT including a null
terminator as its length.  Otherwise, the bucket length value is wrong (too big
by one).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89654 13f79535-47bb-0310-9956-ffa450edef68
2001-07-23 13:45:44 +00:00
Jeff Trawick
0f1bd9f39b tweak make_exports.awk so it works with nawk on Solaris
Submitted by:	Sander Striker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89653 13f79535-47bb-0310-9956-ffa450edef68
2001-07-23 12:40:40 +00:00
Jeff Trawick
31dfddfafd fix a typo (duplicate return statement)
Submitted by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89652 13f79535-47bb-0310-9956-ffa450edef68
2001-07-23 11:50:11 +00:00
Ryan Bloom
46ff196b32 Fix a cosmetic problem with mod_include. Non-existant SSI vars
used to appear as '(none', without the closing paren.
Submitted by:	G�nter Knauf <eflash@gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89651 13f79535-47bb-0310-9956-ffa450edef68
2001-07-22 23:00:52 +00:00
Brian Havard
0735485931 Sander says:
I missed the hook declarations in my previous
  script. This is added by the patch below.

  The patch also removes unneeded ; that slipped
  in because I use c a lot more than awk :)

  I moved a rule around so removal of leading
  whitespace could go into one rule
  (see AP[RU]?_DECLARE).

  Also removed the additional idx variable in
  favor of checking the return value of the
  index function.

Submitted by:	Sander Striker <striker@apache.org>
Reviewed by:	Brian Havard <brianh@kheldar.apana.org.au>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89650 13f79535-47bb-0310-9956-ffa450edef68
2001-07-21 13:33:31 +00:00
Ryan Bloom
c92887ec0f APR now uses the correct gethostbyname_r when available, so this has
effectively been solved.
Submitted by:	Justin Erenkrantz <jerenkrantz@ebuilt.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89649 13f79535-47bb-0310-9956-ffa450edef68
2001-07-21 06:47:58 +00:00
Ryan Bloom
024d1ff3e1 These two files aren't used anymore, so we can get rid of them now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89648 13f79535-47bb-0310-9956-ffa450edef68
2001-07-21 06:40:14 +00:00
Ryan Bloom
fcaa0f5620 Improve the exports generating awk script. In the past, we had
work around problems in the awk script by avoiding some #if and
#ifdefs.  This has bitten us many times in generating the exports.c
file.  This improvement allows corrects the header file parsing.

Submitted by:	Sander Striker <striker@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89647 13f79535-47bb-0310-9956-ffa450edef68
2001-07-21 06:34:54 +00:00
William A. Rowe Jr
6053f562d3 Do we hear any objections?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89646 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 20:39:30 +00:00
William A. Rowe Jr
05fcc41a1f Update for latest structure changes for 2.0.21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89644 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 20:00:50 +00:00
William A. Rowe Jr
ef4a9670db Clean up unnecessary duplicate references to pcre (they fall out of
libhttpd as our own ap_regexec()) and force InstallBin as the default
  project by moving it to the head of the list, so the first access of
  this .dsp will take InstallBin.dsp as the active project.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89643 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 19:48:02 +00:00
William A. Rowe Jr
9b3864b084 APR_FINFO_TYPE is all we really needed here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89642 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 19:19:39 +00:00
William A. Rowe Jr
1adf783132 A pool is a REQUIRED ARGUMENT, never optional (NULL).
This is why Mladen observed that htpasswd was still broken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89641 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 19:13:44 +00:00
David Reid
a00679f49f Get ONE_PROCESS working again for beos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89640 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 10:09:43 +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
b07a17a64f That's it. Adjust for our pcre transition, and the whole thing links
once again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89631 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 22:35:32 +00:00
William A. Rowe Jr
c0b8cc5aa8 We want the ssl_expr evaluators, now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89629 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 22:23:38 +00:00
William A. Rowe Jr
e0e8319ca1 Hope I've got these generated bits right. Note bison is more common
for Win32 then lexx.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89628 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 22:20:58 +00:00
William A. Rowe Jr
e1a4ca3ba6 Take care of folk's assert() undefined errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89627 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 22:20:09 +00:00
Ryan Bloom
a92e3e0532 Bump after the tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89626 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:49:41 +00:00
Ryan Bloom
c21c903e1e Bumps for the release. The tag will be moved to this version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89625 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:43:38 +00:00
William A. Rowe Jr
d6bff4d622 A dash of portability
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89624 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:39:26 +00:00
William A. Rowe Jr
4ba473bd88 Since mpm.h wraps unixd.h and scoreboard.h nicely, and win32 has
no unixd.h, well...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89623 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:30:37 +00:00
William A. Rowe Jr
50572ad029 Uhmm... need to NOCRYPT away WinCrypt.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89622 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:29:20 +00:00
Ralf S. Engelschall
2f9d44683b Update TODO list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89621 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:03:43 +00:00
William A. Rowe Jr
d8f39cdd57 Workaround till connection_hook details are resolved
[MATHIHALLI,MADHUSUDAN <madhusudan_mathihalli@hp.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89620 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 20:02:28 +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
Ralf S. Engelschall
ca8f54367f Apply mod_ssl MEGA porting patch. This is a cleaned up version of the
latest patches from Madhusudan which makes mod_ssl 95% working inside
Apache 2.0. There is still a lot of more work (both porting and cleanup)
to do be done. See modules/ssl/README for details.

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89618 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 16:08:01 +00:00
David Reid
d7a428b08a Some small changes...
- use palloc instead of pcalloc
- add code to set larger FD_SETSIZE if appropriate
- some formatting tidy up


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89616 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 12:49:32 +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
Greg Ames
590a1bde98 fix memory leak of apr_sockaddr_t and apr_socket_t in ap_mpm_pod_signal,
called by perform_idle_server_maintenance.

allocate & init one apr_sockaddr_t for the dummy connect at pod open time.
use a temporary subpool for the apr_socket_t


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89612 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 21:16:40 +00:00
William A. Rowe Jr
db65b5a2a2 Last of the ignore goodness for today.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89611 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 21:15:50 +00:00
William A. Rowe Jr
c4549d2816 Remainder of Win32 ap_create_scoreboard fooness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89610 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 21:14:21 +00:00
William A. Rowe Jr
7f30a1383e Fix ap_create_scoreboard fooness on Win32.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89609 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 21:13:04 +00:00
Ryan Bloom
3d8f3ce64b Make scoreboard creation a hook. This allows management
modules to have access to the scoreboard at the time that it is
created, and at every restart request.
Submitted by:	Cody Sherr <csherr@covalent.net>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89608 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 20:45:36 +00:00
Ian Holsman
4318882a79 Remove APR_NO_INHERIT as it is now private.
sigh... the cost of being bleeding edge
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89607 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 20:35:13 +00:00
Doug MacEachern
506b33a955 s/destroy/free/g; likeness to SSL naming
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89606 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 20:35:07 +00:00
Doug MacEachern
f962339ad5 give some more diagnostics if server cert or key file cannot be read
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89605 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 20:29:29 +00:00
Paul J. Reder
620a48e609 Changed AP_MPMQ_MAX_DAEMONS to refer to MaxClients and
added an AP_MPMQ_MAX_DAEMON_USED to refer to the highest
daemon index actually used in the scoreboard. I also
updated the pertinent calls.

Paul J. Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89604 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 20:29:00 +00:00
Joshua Slive
b8861ba216 Bringing forward from 1.3: small changes to standardize argument types.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89603 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 20:25:19 +00:00
William A. Rowe Jr
ce3b970d96 Missed one, all should have recovered from APR_INHERIT now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89602 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 19:58:49 +00:00
Doug MacEachern
1a44af4868 only reset request level filters in reset_filters(), else for example
TLSFilter gets wiped out, breaking any response that comes through ap_die
(including the frequent '304 not modified')
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89601 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 19:52:40 +00:00
William A. Rowe Jr
1501c81198 Remove last public vestigages of APR_INHERIT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89600 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 19:41:20 +00:00
Jeff Trawick
db088722d7 This patch removes spaces that shouldn't be there.
It bit me when I tried to get the new make_exports
to work.  I now fixed my make_exports (will commit
patch later), so that will eat this anyway, but
it seems nicer to make this obey the coding style
rules as well.

Submitted by:	Sander Striker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89599 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 19:38:35 +00:00
Doug MacEachern
2b8cc6f60f add dump_filters macro for printing r->{input,output}_filters chain info
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89598 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 18:44:45 +00:00
Doug MacEachern
dbfb786c1f add cleanup of SSLStateMachine to tls filter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89597 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 18:18:20 +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
6f96a10305 Omitted the arg
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89594 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 17:14:09 +00:00