1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Commit Graph

463 Commits

Author SHA1 Message Date
Jim Jagielski
ce503e00e3 Add in the UseCanonicalPhysicalPort directive, which
basically allows Apache to configurably ( :) )
use the physical port when constructing the
canonical port. Also add the exact ordering to
the docs, so people can easily see how it works.
We now have compatibility with both 2.0 and 1.3.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344369 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 14:50:39 +00:00
Jim Jagielski
b72e610410 No functional change: more indenting/formatting changes due to
tabbing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332316 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 16:03:23 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
Jim Jagielski
5d2fae4818 No functional change: simple detabbing of indented code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:05:51 +00:00
Brian Pane
4db6998015 Add new connection states for handler and write completion
(backport from async-dev branch to 2.3 trunk)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327870 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 22:20:59 +00:00
Ruediger Pluem
aabe646236 * Fix PR31226 (AddOutputFilterByType deflate not active with mod_proxy), by
allowing ap_add_output_filters_by_type to handle proxied requests.
  Basic tests by jorton and me show that this works, nobody can actually
  remember why this limitation was introduced at all (r94028) and the mailing
  list archives also gave no hint.

Submitted by: Joe Orton



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327179 13f79535-47bb-0310-9956-ffa450edef68
2005-10-21 13:41:25 +00:00
William A. Rowe Jr
7e2a5490d1 NET_TIME, as a standalone feature, was a horrid idea.
The core filter will NOT operate correctly across platforms 
  (even between Linux/Solaris) without setting up the conn->timeout,
  so always apply the timeout when establishing the core filter.

  The keep-alive-timeout is entirely an HTTP-ism, and needs to
  move to the http protocol handler.  Note #1; this isn't triggered
  in the event mpm, but the event mpm introspects s->keep_alive_timeout
  directly adding it to the pollset, so this is a non-sequitor.

  Finally, once the headers are read, the named virtual host may
  have a different (more/less permissive) timeout for the remainder
  of the request body.  This http-centric patch picks up that subtle
  detail and can switch to a named-vhost timeout.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@306495 13f79535-47bb-0310-9956-ffa450edef68
2005-10-06 01:29:42 +00:00
William A. Rowe Jr
62d58df5ca Pay close attention to core_create_req() ... and note
that not one other member of the r->vars is initialized
  herein.  Move this initialization elsewhere.

  (If this is the 'default' - it really aught to be the
  zero value, for that matter).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@295141 13f79535-47bb-0310-9956-ffa450edef68
2005-10-05 23:37:53 +00:00
William A. Rowe Jr
025c799a79 Initially a no-op. Add trace_enable configuration. The http and proxy
flavors of interpreting this flag are yet to be committed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@208785 13f79535-47bb-0310-9956-ffa450edef68
2005-07-01 19:39:26 +00:00
Paul Querna
6a23d6ebeb Merge the listen-protocol sandbox branch to trunk.
I will be adding documentation for the new directives hopefully in the next day or so.

* server/core.c: Added 'Protocol' to the core module config
                 Added ap_{set,get}_server_protocol API.
                 Added new directive: 'AcceptFilter'.
                 Enable 'httpready' by default on systems that support it.  Use dataready filters for others.

* server/listen.c: Attempt to inherit protocols from Listener Records to Server configs.
                   The 'Listen' directive can now optionally take a protocol arg
                   Move bits that determined which accept filter is applied to core.c.
                   Added bits to find the correct accept filter based on the core's configuration.

* include/{ap_listen.h,http_core.h}: Add Protocol to respective structures.

* include/http_core.h: Add the accf_map table to the core_server_config structure

* include/ap_mmn.h: Minor MMN Bump for the new interfacces.

* modules/ssl/ssl_engine_init.c: Use the new protocol framework to enable mod_ssl for 'https' websites.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190563 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 09:21:18 +00:00
Sander Striker
9b1a855882 Submitted by: Rüdiger Pluem <r.pluem@t-online.de>
* server/core.c

  (default_handler): Always give the filters a chance at processing
   the response.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178018 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 20:54:10 +00:00
Jeff Trawick
f78a4e4a89 Prevent hangs of child processes when writing to piped loggers at
the time of graceful restart. 

PR:          26467
Reviewed by: Joe Orton



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170281 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 23:56:48 +00:00
Joshua Slive
fa4e866600 Merged the simple-conf branch changes r159781:160695 into the trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160696 13f79535-47bb-0310-9956-ffa450edef68
2005-04-09 16:59:15 +00:00
Joe Orton
a0570c8746 Move the POSIX reg* implementations into the ap_* namespace;
internalise the ap_reg*<->PCRE wrapper:

* configure.in: Add srclib/pcre to the include path.

* include/ap_regex.h: Renamed from include/pcreposix.h.  Prefix all
constants with AP_; prefix all functions and types with ap_.  Define
AP_DECLARE to nothing if necessary.  Remove regcomp error codes.

* include/httpd.h: Include ap_regex.h not pcreposix.h.
(ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/.
(ap_regexec, ap_regerror): Prototypes moved to ap_regex.h.

* server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree):
Adjust for ap_ prefixed types.  (ap_regexec, ap_regerror): Removed.

* server/Makefile.in: Build util_pcre.c.

* server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use
of PCRE-internals to do error mapping; rename types to add AP_/ap_
prefixes as above.  Use APR includes.  (ap_regerror): Use apr_snprintf.

* srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la.

* modules/*: Update to use new type and constant names.

PR: 27750 (part one)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:00:41 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Bill Stoddard
da635a93a4 Remove upper limit on the LimitRequestFieldSize directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@149269 13f79535-47bb-0310-9956-ffa450edef68
2005-01-31 16:32:18 +00:00
William A. Rowe Jr
d962fcfc8b FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME!
Bumped mmn, and ap module cookie, for this function rename.

  It's not a deprecation, as ap_http_method would be a lovely function
  name sometime in the future: to determine what the function name implies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 05:33:44 +00:00
Joe Orton
a756d60d81 Fix gcc "no previous prototype" warnings after reorganisation:
* server/core_filters.c (ap_core_input_filter, ap_core_output_filter,
ap_net_time_filter): Renamed to add ap_ prefixes for global symbols.

* include/ap_listen.h: Don't export ap_listen_open at all, it's not
used outside server/listen.c any more.

* server/listen.c (open_listeners): Renamed from ap_listen_open.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109498 13f79535-47bb-0310-9956-ffa450edef68
2004-12-02 13:28:04 +00:00
Paul Querna
c448a3d6c5 * server/core.c: Give an error instead of silently going on when a section is missing an argument.
PR: 25460
Submitted By: Geoffrey Young


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106879 13f79535-47bb-0310-9956-ffa450edef68
2004-11-29 04:15:24 +00:00
Justin Erenkrantz
439221058c Initial pass at refactoring some files to eliminate our 150K C source behemoths.
* Makefile.in: Change order of dependencies to bring in exports.o first so that
  we have every symbol 'used' before the linker starts processing.
* build/rules.mk.in: Add a 'program-install' target which just copies httpd.

* server/Makefile.in, modules/http/config2.m4: Add in new file targets.

* NWGNUmakefile, libhttpd.dsp: Blind updates for Netware and Win32.  (I tried.)

* server/core.c: Move core_input_filter, net_time_filter, and core_output_filter  and all supporting functions to...
* server/core_filters.c (copied): ...here.

* modules/http/http_protocol.c: Move functions from here to there...namely:
* modules/http/byterange_filter.c (copied): Relocate ap_byterange_filter() and
  friends.
* modules/http/chunk_filter.c (copied): Relocate chunk_filter().
* modules/http/http_etag.c (copied): Relocate ap_set_etag and ap_make_etag().
* modules/http/http_filters.c (copied): Relocate ap_http_filter(),
  ap_http_header_filter(), ap_discard_request_body(), ap_setup_client_block(),
  ap_should_client_block(), and ap_get_client_block().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106692 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 08:07:44 +00:00
William A. Rowe Jr
9585028722 Drop a worthless emit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106075 13f79535-47bb-0310-9956-ffa450edef68
2004-11-21 07:10:32 +00:00
Jeff Trawick
b16fe38fbb remove out-of-date comment... BillS reports that
AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK provides the
necessary capability to the MPM

Submitted by:	stoddard a.k.a. BillS a.k.a. FirstBill


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105682 13f79535-47bb-0310-9956-ffa450edef68
2004-11-04 16:04:55 +00:00
Jeff Trawick
43eb49ae9d Change core connection handling so that a connection-oriented
error disabling nagle* is logged with the client IP address and
a debug log level.  We filter out not-implemented errors from
platforms which don't support TCP_NODELAY.

*This is typically EINVAL, which means that the client already
dropped the connection.

Also, mention an earlier change to include the client IP address
when logging connection-oriented errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105652 13f79535-47bb-0310-9956-ffa450edef68
2004-11-01 13:06:51 +00:00
Jeff Trawick
81e4e36b0e add ap_log_cerror(); use it in a couple of places in core output filter
so that the client IP address is recorded in the log


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105625 13f79535-47bb-0310-9956-ffa450edef68
2004-10-29 14:45:24 +00:00
Roy T. Fielding
c76dd4ecef veto and revert win64 patch: 64bit changes must percolate from the
bottom (APR/system) up -- we can't give the client a 64bit API and
then cast it to 32bits internally without introducing security holes
on other platforms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105572 13f79535-47bb-0310-9956-ffa450edef68
2004-10-23 22:39:53 +00:00
Allan K. Edwards
6c775f9a3c WIN64: API changes to clean up Windows 64bit compile warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105545 13f79535-47bb-0310-9956-ffa450edef68
2004-10-22 15:22:05 +00:00
Allan K. Edwards
ba4d908410 WIN64: first in a series to get Windows IA64 builds clean, this serves pages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105257 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 18:21:30 +00:00
Joe Orton
91fdc42dc2 * server/core.c (merge_core_dir_configs): Fix Satisfy merging since
per-method Satisfy feature was added.

PR: 31315
Submitted by: Rici Lake <rici ricilake.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105215 13f79535-47bb-0310-9956-ffa450edef68
2004-09-20 20:12:20 +00:00
Joe Orton
7584e8b211 Fix typo in previous commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105112 13f79535-47bb-0310-9956-ffa450edef68
2004-09-13 13:19:10 +00:00
Joe Orton
b31fef4ee0 * server/core.c (default_handler): Fix the test for whether to split a
file into several buckets: it is needed regardless of whether sendfile
is enabled, and APR_HAS_LARGE_FILES is not sufficient to determine
whether sizeof(apr_off_t) is greater than sizeof(apr_off_t).

PR: 28898


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105111 13f79535-47bb-0310-9956-ffa450edef68
2004-09-13 13:16:32 +00:00
Joe Orton
0e41475192 * server/core.c (set_allow_opts): Fix gcc warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104313 13f79535-47bb-0310-9956-ffa450edef68
2004-07-17 08:29:48 +00:00
Bradley Nicholes
c54c2e126e Replace the strsep() call to the more portable apr_strtok() call so that we can build again
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104305 13f79535-47bb-0310-9956-ffa450edef68
2004-07-16 16:12:22 +00:00
Paul Querna
9d66007aa2 Added 'AllowOverride Options=Indexes,MultiViews' to give an admin better
control over what options can be used in .htaccess files.

PR: 29310
Submitted by: Tom Alsberg <alsbergt-apache cs.huji.ac.il>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104283 13f79535-47bb-0310-9956-ffa450edef68
2004-07-14 06:36:42 +00:00
André Malo
7accf16eed Nobody objected:
<IfModule> now takes the module identifier in addition to the
filename.

CAUTION: this commit breaks the build on netware. It still needs
to be adjusted. (but I don't have any netware knowledge...)
Also, developers need to re-run buildconf on unices.

PR: 29003
Submitted by: Edward Rudd <eddie omegaware.com>, Andr� Malo


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103849 13f79535-47bb-0310-9956-ffa450edef68
2004-06-04 22:40:47 +00:00
André Malo
6fb041d0ee allow LimitRequestBody to be reset to unlimited
PR: 29106


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103751 13f79535-47bb-0310-9956-ffa450edef68
2004-05-25 00:10:25 +00:00
André Malo
6b9b5a718a use new apr_strtoff function to parse limitrequestbody
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103750 13f79535-47bb-0310-9956-ffa450edef68
2004-05-24 22:55:08 +00:00
Joe Orton
bcb62c5b41 * server/core.c (core_output_filter): Don't explicitly delete the EOC
bucket, and don't buffer the brigade if it ends in an EOC.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103686 13f79535-47bb-0310-9956-ffa450edef68
2004-05-17 15:24:31 +00:00
André Malo
49f48fb4b4 changed the following APIs to return an error instead of hard exiting:
ap_add_module, ap_add_loaded_module, ap_setup_prelinked_modules,
and ap_process_resource_config


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103517 13f79535-47bb-0310-9956-ffa450edef68
2004-04-25 17:23:31 +00:00
André Malo
30b25881ba Recursive Include directives no longer crash. The server stops
including configuration files after a certain nesting level (128
as distributed). This is configurable at compile time using the
-DAP_MAX_INCLUDE_DEPTH switch.

PR: 28370


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103466 13f79535-47bb-0310-9956-ffa450edef68
2004-04-20 20:22:13 +00:00
André Malo
74fa214f4d accept URLs as ServerAdmin contact. If it's not recognized as an URL, assume
an email address and prepend it with mailto: in server outputs.

PR: 28174


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103339 13f79535-47bb-0310-9956-ffa450edef68
2004-04-10 21:44:43 +00:00
André Malo
b00e035fc4 "ErrorDocument default" changes broke inheritance. consider:
<Directory /foo>
ErrorDocument 404 blah
</Directory>
<DIrectory /foo/bar>
ErrorDocument 500 boo
# 404 is now fallen back to default
</Directory>

This patch solves the problem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103333 13f79535-47bb-0310-9956-ffa450edef68
2004-04-10 18:40:53 +00:00
André Malo
c7031febd3 Fix a bunch of cases where the return code of the regex compiler
was not checked properly. This affects: mod_setenvif, mod_usertrack,
mod_proxy, mod_proxy_ftp and core.

PR: 28218


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103328 13f79535-47bb-0310-9956-ffa450edef68
2004-04-10 13:57:39 +00:00
Geoffrey Young
3f8667a2c8 Enable special ErrorDocument value 'default' which restores the
canned server response for the scope of the directive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103310 13f79535-47bb-0310-9956-ffa450edef68
2004-04-09 00:56:26 +00:00
Joe Orton
be3881871a * server/core.c (core_output_filter): Tag the deferred_write pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103153 13f79535-47bb-0310-9956-ffa450edef68
2004-03-25 14:27:27 +00:00
Bill Stoddard
bac83264dc Can't assume the filepointer is really 0 when offset is 0. A handler can create brigades containing multiple file buckets with arbitrary offsets
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103125 13f79535-47bb-0310-9956-ffa450edef68
2004-03-24 19:57:06 +00:00
Jeff Trawick
e980bec536 Fix memory corruption problem with ap_custom_response() function.
The core per-dir config would later point to request pool data
that would be reused for different purposes on different requests.

This is based on an old 1.3 patch submitted by Will Lowe.
It needs a minor tweak before committing to 1.3, but he had
it pretty darn close.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103120 13f79535-47bb-0310-9956-ffa450edef68
2004-03-24 02:53:35 +00:00
Jeff Trawick
c940ea5b58 use existing directive name ThreadStackSize instead of
WorkerStackSize

as made obvious by: Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102975 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 23:08:41 +00:00
André Malo
093bd92973 Satisfy directives now can be influenced by a surrounding <Limit>
container.

PR: 14726.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102954 13f79535-47bb-0310-9956-ffa450edef68
2004-03-14 16:24:55 +00:00
Jeff Trawick
cb5c3dd6fd Threaded MPMs for Unix and Win32: Add WorkerStackSize directive
to override default thread stack size for threads which handle
client connections.  Required for some third-party modules on
platforms with small default thread stack size.

This is also useful for trimming back the stack size on
platforms with relatively large default stack size in order to
conserve address space for supporting more threads per child.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102931 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 03:57:50 +00:00
Paul J. Reder
38d03c5274 *) Remove compile-time length limit on request strings. Length is
now enforced solely with the LimitRequestLine config directive.
    [Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102840 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 21:40:44 +00:00