]>
granicus.if.org Git - apache/log
Chuck Murcko [Tue, 24 Jul 2001 21:50:21 +0000 (21:50 +0000)]
fix warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89685
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 24 Jul 2001 21:33:44 +0000 (21:33 +0000)]
A couple of optimizations to the content_length filter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89684
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 24 Jul 2001 20:38:01 +0000 (20:38 +0000)]
Changes to respect the new apr bucket and brigade length types (either
apr_size_t for bucket lengths, or apr_off_t for aggregate brigade lengths.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89683
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 24 Jul 2001 20:20:46 +0000 (20:20 +0000)]
It's a nit, but since I'm searching for "win32" it ought to be there :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89682
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 24 Jul 2001 19:00:12 +0000 (19:00 +0000)]
bandaid for segv in ssl_io_filter_Output
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89681
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 24 Jul 2001 18:17:06 +0000 (18:17 +0000)]
zero the SSLStateMachine in case of early error, else SSLStateMachine_free segvs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89680
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 24 Jul 2001 17:24:05 +0000 (17:24 +0000)]
Fix problem with the previous patch to handle HEAD requests. Now, the
header_filter will stay installed in the filter chain when processing
HEAD requests to intercept and discard content bodys sent by poorly
written handlers. This work also points out the need for an optimization
in the content_length filter to not split the brigade if the next bucket
in the brigade is an EOS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89679
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Tue, 24 Jul 2001 14:36:29 +0000 (14:36 +0000)]
Fix problem reported by Taketo Kabe <kabe@sra-tohoku.co.jp>
where HEAD response headers were being repeated twice for
files greater than 32K bytes (4*AP_MIN_BYTES_TO_WRITE). This
problem in the http_header filter was exposed by the recent rewrite
of the content_length filter.
[Taketo Kabe, Bill Stoddard]
PR: 8037
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89676
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 24 Jul 2001 05:19:47 +0000 (05:19 +0000)]
Change the worker_function implementations to accept both parameters,
the apr private data (apr_thread_t*) and the application private data
(void*), for the last update to APR.
Submitted by: Aaron Bannert <aaron@ebuilt.com>
Reviewed by: Will Rowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89672
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Tue, 24 Jul 2001 00:10:26 +0000 (00:10 +0000)]
Document and future-proof the dependency between apr_read_type_e and
ap_input_mode_t. It's now safe(r) to cast from ap_read_type_e to
ap_input_mode_t.
Submitted by: Justin Erenkrantz, Sander Striker
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89671
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 23 Jul 2001 19:52:41 +0000 (19:52 +0000)]
The original answer was evil, return NULL if the file name has no path!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89666
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 23 Jul 2001 19:33:03 +0000 (19:33 +0000)]
Some odd XXX fixups that are closed (or unneeded)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89665
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 23 Jul 2001 19:02:03 +0000 (19:02 +0000)]
Downgrade non-stopper from XXX->###
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89664
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 23 Jul 2001 18:54:32 +0000 (18:54 +0000)]
More XXX replacement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89663
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 23 Jul 2001 18:53:04 +0000 (18:53 +0000)]
XXX is disallowed except as a to-do note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89662
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Mon, 23 Jul 2001 18:49:11 +0000 (18:49 +0000)]
commit CHANGES file for patch to server/scoreboard.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89661
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Mon, 23 Jul 2001 18:17:16 +0000 (18:17 +0000)]
prevent seg faults in mod_status with ExtendedStatus enabled, after
a restart. A pointer to the previous generation's vhost server_rec
could be left in the worker_score under certain conditions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89660
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 23 Jul 2001 18:07:21 +0000 (18:07 +0000)]
cvs up kept this in :(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89659
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 23 Jul 2001 18:00:16 +0000 (18:00 +0000)]
Focusing my thoughts
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89658
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 23 Jul 2001 17:24:47 +0000 (17:24 +0000)]
Lots o' changes to re-review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89657
13f79535 -47bb-0310-9956-
ffa450edef68
Victor J. Orlikowski [Mon, 23 Jul 2001 16:16:29 +0000 (16:16 +0000)]
Fix a couple of compiler warnings, since these are macros, not functions.
Submitted by: Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by: Victor Orlikowski <orlikowski@apache.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89656
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Mon, 23 Jul 2001 15:50:47 +0000 (15:50 +0000)]
Some doc updates realted to ssi.
1. Add info on how to activate ssi to upgrading.html.
2. Remove mention of the ssi magic mime-types, since they no
longer work.
3. Place a warning on xbithack that it doesn't currently work,
and reference the bug report.
4. Add a warning about mod_include parsing non-html content.
5. Misc little fixups.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89655
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Mon, 23 Jul 2001 13:45:44 +0000 (13:45 +0000)]
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
Jeff Trawick [Mon, 23 Jul 2001 12:40:40 +0000 (12:40 +0000)]
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
Jeff Trawick [Mon, 23 Jul 2001 11:50:11 +0000 (11:50 +0000)]
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
Ryan Bloom [Sun, 22 Jul 2001 23:00:52 +0000 (23:00 +0000)]
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
Brian Havard [Sat, 21 Jul 2001 13:33:31 +0000 (13:33 +0000)]
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
Ryan Bloom [Sat, 21 Jul 2001 06:47:58 +0000 (06:47 +0000)]
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
Ryan Bloom [Sat, 21 Jul 2001 06:40:14 +0000 (06:40 +0000)]
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
Ryan Bloom [Sat, 21 Jul 2001 06:34:54 +0000 (06:34 +0000)]
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
William A. Rowe Jr [Fri, 20 Jul 2001 20:39:30 +0000 (20:39 +0000)]
Do we hear any objections?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89646
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 20 Jul 2001 20:00:50 +0000 (20:00 +0000)]
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
William A. Rowe Jr [Fri, 20 Jul 2001 19:48:02 +0000 (19:48 +0000)]
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
William A. Rowe Jr [Fri, 20 Jul 2001 19:19:39 +0000 (19:19 +0000)]
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
William A. Rowe Jr [Fri, 20 Jul 2001 19:13:44 +0000 (19:13 +0000)]
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
David Reid [Fri, 20 Jul 2001 10:09:43 +0000 (10:09 +0000)]
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
David Reid [Fri, 20 Jul 2001 09:51:43 +0000 (09:51 +0000)]
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
William A. Rowe Jr [Thu, 19 Jul 2001 22:35:32 +0000 (22:35 +0000)]
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
William A. Rowe Jr [Thu, 19 Jul 2001 22:23:38 +0000 (22:23 +0000)]
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
William A. Rowe Jr [Thu, 19 Jul 2001 22:20:58 +0000 (22:20 +0000)]
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
William A. Rowe Jr [Thu, 19 Jul 2001 22:20:09 +0000 (22:20 +0000)]
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
Ryan Bloom [Thu, 19 Jul 2001 21:49:41 +0000 (21:49 +0000)]
Bump after the tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89626
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Thu, 19 Jul 2001 21:43:38 +0000 (21:43 +0000)]
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
William A. Rowe Jr [Thu, 19 Jul 2001 21:39:26 +0000 (21:39 +0000)]
A dash of portability
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89624
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 19 Jul 2001 21:30:37 +0000 (21:30 +0000)]
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
William A. Rowe Jr [Thu, 19 Jul 2001 21:29:20 +0000 (21:29 +0000)]
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
Ralf S. Engelschall [Thu, 19 Jul 2001 21:03:43 +0000 (21:03 +0000)]
Update TODO list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89621
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 19 Jul 2001 20:02:28 +0000 (20:02 +0000)]
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
William A. Rowe Jr [Thu, 19 Jul 2001 16:40:42 +0000 (16:40 +0000)]
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
Ralf S. Engelschall [Thu, 19 Jul 2001 16:08:01 +0000 (16:08 +0000)]
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
David Reid [Thu, 19 Jul 2001 12:49:32 +0000 (12:49 +0000)]
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
Jeff Trawick [Thu, 19 Jul 2001 12:43:22 +0000 (12:43 +0000)]
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
William A. Rowe Jr [Thu, 19 Jul 2001 04:39:17 +0000 (04:39 +0000)]
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
Greg Ames [Wed, 18 Jul 2001 21:16:40 +0000 (21:16 +0000)]
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
William A. Rowe Jr [Wed, 18 Jul 2001 21:15:50 +0000 (21:15 +0000)]
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
William A. Rowe Jr [Wed, 18 Jul 2001 21:14:21 +0000 (21:14 +0000)]
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
William A. Rowe Jr [Wed, 18 Jul 2001 21:13:04 +0000 (21:13 +0000)]
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
Ryan Bloom [Wed, 18 Jul 2001 20:45:36 +0000 (20:45 +0000)]
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
Ian Holsman [Wed, 18 Jul 2001 20:35:13 +0000 (20:35 +0000)]
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
Doug MacEachern [Wed, 18 Jul 2001 20:35:07 +0000 (20:35 +0000)]
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
Doug MacEachern [Wed, 18 Jul 2001 20:29:29 +0000 (20:29 +0000)]
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
Paul J. Reder [Wed, 18 Jul 2001 20:29:00 +0000 (20:29 +0000)]
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
Joshua Slive [Wed, 18 Jul 2001 20:25:19 +0000 (20:25 +0000)]
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
William A. Rowe Jr [Wed, 18 Jul 2001 19:58:49 +0000 (19:58 +0000)]
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
Doug MacEachern [Wed, 18 Jul 2001 19:52:40 +0000 (19:52 +0000)]
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
William A. Rowe Jr [Wed, 18 Jul 2001 19:41:20 +0000 (19:41 +0000)]
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
Jeff Trawick [Wed, 18 Jul 2001 19:38:35 +0000 (19:38 +0000)]
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
Doug MacEachern [Wed, 18 Jul 2001 18:44:45 +0000 (18:44 +0000)]
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
Doug MacEachern [Wed, 18 Jul 2001 18:18:20 +0000 (18:18 +0000)]
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
William A. Rowe Jr [Wed, 18 Jul 2001 18:08:57 +0000 (18:08 +0000)]
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
William A. Rowe Jr [Wed, 18 Jul 2001 17:56:14 +0000 (17:56 +0000)]
Fix some casting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89595
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 18 Jul 2001 17:14:09 +0000 (17:14 +0000)]
Omitted the arg
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89594
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 18 Jul 2001 17:13:01 +0000 (17:13 +0000)]
rbb's names still need work :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89593
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 18 Jul 2001 16:56:55 +0000 (16:56 +0000)]
Changes to back out inherit flag from apr_os_sock_make()
and apr_socket_create()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89592
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 18 Jul 2001 07:01:32 +0000 (07:01 +0000)]
sweep up some cruft, and clean out a good solve by Mr. Stoddard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89591
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 Jul 2001 22:13:57 +0000 (22:13 +0000)]
Fix incl/libpath to / slashes for an upcoming patch to cvtdsp.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89570
13f79535 -47bb-0310-9956-
ffa450edef68
Ian Holsman [Tue, 17 Jul 2001 21:43:35 +0000 (21:43 +0000)]
Change the APR_INHERIT flag to APR_NO_INHERIT,which is the default (as recommended by rbb)
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89569
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Tue, 17 Jul 2001 20:20:21 +0000 (20:20 +0000)]
Bringing forward from 1.3: Changes to standardize the "argument types"
in the syntax entires.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89568
13f79535 -47bb-0310-9956-
ffa450edef68
Ralf S. Engelschall [Tue, 17 Jul 2001 17:26:48 +0000 (17:26 +0000)]
Remember current porting state
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89567
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 17 Jul 2001 16:36:15 +0000 (16:36 +0000)]
dummy ssl hooks need to return an int value for server to function with mod_ssl compiled in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89566
13f79535 -47bb-0310-9956-
ffa450edef68
Ralf S. Engelschall [Tue, 17 Jul 2001 14:57:35 +0000 (14:57 +0000)]
Merge in part II of a set of mod_ssl porting changes.
Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89564
13f79535 -47bb-0310-9956-
ffa450edef68
Ralf S. Engelschall [Tue, 17 Jul 2001 14:38:06 +0000 (14:38 +0000)]
Merge in part of a set of mod_ssl porting changes.
Submitted by: Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89563
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Tue, 17 Jul 2001 04:57:43 +0000 (04:57 +0000)]
Note the change to the CVS server in the buildconf script.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89562
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 16 Jul 2001 21:07:40 +0000 (21:07 +0000)]
Obvious files that need inheritance, correct me if I'm wrong.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89561
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 16 Jul 2001 18:14:51 +0000 (18:14 +0000)]
Fix for the new schema
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89560
13f79535 -47bb-0310-9956-
ffa450edef68
Ian Holsman [Mon, 16 Jul 2001 17:54:38 +0000 (17:54 +0000)]
applies change in APR function apr_socket_create, which added a new parameter.
I defaulted these to APR_INHERIT.
Also..
the connection-close was being merged, insted of 'set'
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89559
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 16 Jul 2001 16:11:05 +0000 (16:11 +0000)]
Added an inherit flag to apr_socket_create and other socket creation
functions. This allows APR programs to specify that a socket should
be passed to any child processes that are created. The inherit flag
is only meaningful if programs use apr_process_create(). This
also adds a couple of macros that allow APR types to set and unset
the inherit flag.
This also fixes Apache to use the new API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89557
13f79535 -47bb-0310-9956-
ffa450edef68
Ryan Bloom [Mon, 16 Jul 2001 02:29:33 +0000 (02:29 +0000)]
Remove a couple fields from the scoreboard that aren't currently used.
If we need these, they should be added when we begin to use them.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89554
13f79535 -47bb-0310-9956-
ffa450edef68
Ian Holsman [Sat, 14 Jul 2001 20:18:45 +0000 (20:18 +0000)]
Last Log entry was bogus.
Changed to 'setting' the X-Forwarded-Server X-Forwarded-Host X-Forwarded-For
headers instead of merging them
PR:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89551
13f79535 -47bb-0310-9956-
ffa450edef68
Ian Holsman [Sat, 14 Jul 2001 20:17:07 +0000 (20:17 +0000)]
PR:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89550
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 13 Jul 2001 18:46:15 +0000 (18:46 +0000)]
Win32: Prevent listening sockets from being inherited by
the Apache child process, CGI scripts, rotatelog process
etc. If the Apache child process segfaults, any processes
that the child started are not reaped. Prior to this fix,
these processes inherited the listening sockets which sometimes
prevented the restarted Apache child process from accepting
connections (ie, the server would hang).
The Sleep(1000) is a bit of a hack but it is sufficient I believe. All
that is really necessary is for the parent to give up its quantum and
allow the child to run. I could not get WaitForInputIdle to work properly.
Will investigate alternative solutions later.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89547
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Fri, 13 Jul 2001 12:45:19 +0000 (12:45 +0000)]
Win32: First of two patches to prevent child processes from inheriting open
socket descriptors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89546
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Thu, 12 Jul 2001 03:50:19 +0000 (03:50 +0000)]
Some STATUS updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89543
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Thu, 12 Jul 2001 03:20:50 +0000 (03:20 +0000)]
scratch an old itch - give lingering close its own state in the scoreboard.
clean up SERVER_ACCEPTING and SERVER_QUEUEING (never set) while I'm at it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89542
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Thu, 12 Jul 2001 02:19:41 +0000 (02:19 +0000)]
Provide vhost and abbreviated request strings on ExtendedStatus displays.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89541
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Wed, 11 Jul 2001 16:51:29 +0000 (16:51 +0000)]
Typo fix.
Submitted by: Carl Johnstone <carl.johnstone@gmgrd.co.uk>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89540
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 11 Jul 2001 14:48:23 +0000 (14:48 +0000)]
Fix an issue with the pod and prefork:
when the parent process wakes up a server process via connect(), use
an APR timeout on the connect() so that we don't hang for a long time
if there aren't server processes around to do accept()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89539
13f79535 -47bb-0310-9956-
ffa450edef68
Jason S. Lingohr [Wed, 11 Jul 2001 07:12:53 +0000 (07:12 +0000)]
Updated with 1.3 stuff in tandem with my 1.3 STATUS file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89537
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Wed, 11 Jul 2001 04:47:02 +0000 (04:47 +0000)]
Performance improvement to mod_mime.c. find_ct() in mod_mime,
spends a lot of time in apr_table_get calls. Using the default
httpd.conf, the tables for languages and charsets are somewhat
large, so the time spent scanning them on each request is
significant. Replacing the tables with hash tables provides
a nice speedup. [Brian Pane <bpane@pacbell.net>]
Had to handmerge a lot of this patch so please review! Dean had some suggestions
for improvement which are not currently implemented.
Submitted by: Brian Pane
Reviewed by: Bill Stoddard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89535
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Tue, 10 Jul 2001 22:50:54 +0000 (22:50 +0000)]
fix pid numbers in mod_status output when using a threaded mpm. pid_buffer was
being indexed by worker slot during initialization, then by process slot when
generating output.
This saves a little storage and a few cycles, too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89534
13f79535 -47bb-0310-9956-
ffa450edef68