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

5094 Commits

Author SHA1 Message Date
William A. Rowe Jr
c9148bcd49 This same patch is needed in mod_asis and others, I'm testing the waters
for this solution.  I'm easily convinced to choose AP_MAX_SENDFILE based
  on any reasonable argument, provided it's smaller than 2^30 :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89714 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 21:41:44 +00:00
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
Jeff Trawick
83cf542b3d fix the "server seems busy" message so that it really logs
the number of children we're about to spawn


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89710 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 20:48:53 +00:00
Jeff Trawick
9b4256883c fix some typos, add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89709 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 20:34:02 +00:00
Cliff Woolley
85bef0aa7f PR:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89708 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 17:59:37 +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
Brian Havard
fa74775bd3 OS/2: get canonical filename functions exported from the core.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89698 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 02:14:39 +00:00
David Reid
77d67354c6 Another of the long term issues cleared up. BeOS can now run
perl and other CGI's that rely on .so's for their operation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89697 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 00:49:36 +00:00
Cliff Woolley
22ae0e7090 Add my PGP key
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89687 13f79535-47bb-0310-9956-ffa450edef68
2001-07-24 23:34:24 +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
Bill Stoddard
80692df384 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
2001-07-24 21:33:44 +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
William A. Rowe Jr
6f2ee46754 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
2001-07-24 20:20:46 +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
586cf18632 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
2001-07-24 05:19:47 +00:00
Cliff Woolley
8f8d186a8d 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
2001-07-24 00:10:26 +00:00
William A. Rowe Jr
ea2a3f582e 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
2001-07-23 19:52:41 +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
William A. Rowe Jr
0d3a73e395 Downgrade non-stopper from XXX->###
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89664 13f79535-47bb-0310-9956-ffa450edef68
2001-07-23 19:02:03 +00:00
William A. Rowe Jr
67af92ac6e More XXX replacement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89663 13f79535-47bb-0310-9956-ffa450edef68
2001-07-23 18:54:32 +00:00
William A. Rowe Jr
77dc0ac926 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
2001-07-23 18:53:04 +00:00
Greg Ames
bf192951e6 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
2001-07-23 18:49:11 +00:00
Greg Ames
eca0a9cd55 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
2001-07-23 18:17:16 +00:00
William A. Rowe Jr
202c91a033 cvs up kept this in :(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89659 13f79535-47bb-0310-9956-ffa450edef68
2001-07-23 18:07:21 +00:00
William A. Rowe Jr
f7c76543cc Focusing my thoughts
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89658 13f79535-47bb-0310-9956-ffa450edef68
2001-07-23 18:00:16 +00:00
William A. Rowe Jr
4779d38dd2 Lots o' changes to re-review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89657 13f79535-47bb-0310-9956-ffa450edef68
2001-07-23 17:24:47 +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
Joshua Slive
2761ae7342 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
2001-07-23 15:50:47 +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
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