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

1609 Commits

Author SHA1 Message Date
William A. Rowe Jr
5b96031409 Change over to apr_strfsize() for apr_off_t file size formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89713 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 21:34:15 +00:00
William A. Rowe Jr
6e1243809f Some cast magic for intentional float/int transformations, but I have
no idea what exactly this computation was trying to accomplish...

    req_time = (long)(((ws_record.stop_time - ws_record.start_time) * 1000)
		    + ((ws_record.stop_time - ws_record.start_time) / 1000));


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89712 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 21:15:54 +00:00
William A. Rowe Jr
5ccc4eb814 Some cast magic for intentional float/int transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89711 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 21:12:45 +00:00
Ralf S. Engelschall
534c18c054 Avoid uninitialized variable due to still disabled code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89705 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 10:23:03 +00:00
Chuck Murcko
7ea50abc30 Sorting things out
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89704 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 07:12:19 +00:00
Greg Ames
9ffcdaf02b Reduce CPU consumption in conv_10 function, used to format "%d" by apr_*printf
This includes two changes to APR:
  * new functions apr_itoa, apr_ltoa, and apr_off_t_toa
    that provide itoa-type functionality based on pools
  * Inline code in inet_ntop4 to replace sprintf for converting
    binary IP addresses into dotted-decimal format

and two changes to Apache:
  * use the apr_itoa functions in setting the content length,
    in place of apr_psprintf
  * use the apr_itoa functions to replace frequent uses of
    'sprintf("%d",...)' in mod_log_config.

Submitted by: Brian Pane
Reviewed by:  Dean Gaudet, Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89686 13f79535-47bb-0310-9956-ffa450edef68
2001-07-24 22:55:29 +00:00
Chuck Murcko
594feb7de5 fix warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89685 13f79535-47bb-0310-9956-ffa450edef68
2001-07-24 21:50:21 +00:00
William A. Rowe Jr
7b2c62a74e 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
2001-07-24 20:38:01 +00:00
Doug MacEachern
8d045a3727 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
2001-07-24 19:00:12 +00:00
Doug MacEachern
2aa8530634 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
2001-07-24 18:17:06 +00:00
Bill Stoddard
de06ddf627 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
2001-07-24 17:24:05 +00:00
Bill Stoddard
204e7c5e42 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
2001-07-24 14:36:29 +00:00
William A. Rowe Jr
743342d8e7 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
2001-07-23 19:33:03 +00:00
Victor J. Orlikowski
2c3faa4575 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
2001-07-23 16:16:29 +00:00
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
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
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
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
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
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
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
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
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
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
a9d2877e63 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
2001-07-17 22:13:57 +00:00
Ian Holsman
175af69f8e 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
2001-07-17 21:43:35 +00:00
Ralf S. Engelschall
75c03e1921 Remember current porting state
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89567 13f79535-47bb-0310-9956-ffa450edef68
2001-07-17 17:26:48 +00:00
Doug MacEachern
d7d869e327 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
2001-07-17 16:36:15 +00:00
Ralf S. Engelschall
97c1ff53d7 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
2001-07-17 14:57:35 +00:00
Ralf S. Engelschall
928be41381 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
2001-07-17 14:38:06 +00:00
William A. Rowe Jr
1fa29a8d2d 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
2001-07-16 21:07:40 +00:00
Ian Holsman
eef8a5ccff 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
2001-07-16 17:54:38 +00:00
Ian Holsman
9467f6ad75 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
2001-07-14 20:18:45 +00:00
Ian Holsman
f99ed71713 PR:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89550 13f79535-47bb-0310-9956-ffa450edef68
2001-07-14 20:17:07 +00:00
Greg Ames
5139e492bd 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
2001-07-12 03:20:50 +00:00
Greg Ames
13a3c248cc 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
2001-07-12 02:19:41 +00:00
Bill Stoddard
13793b8a50 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
2001-07-11 04:47:02 +00:00
Greg Ames
537f07df5e 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
2001-07-10 22:50:54 +00:00