Unix MPMs: Catch SIGFPE so that exception hooks and CoreDumpDirectory
can work after that terminating signal.
Submitted by: Eric Covener <covener gmail.com>
Reviewed by: trawick, rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@501130 13f79535-47bb-0310-9956-ffa450edef68
(Studio 2005, 'free' Express or full edition) command line builds.
Backports 495126, adjusted for debugging/debug path change between
trunk and 2.2 branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495130 13f79535-47bb-0310-9956-ffa450edef68
PR#37680: fix socket block/nonblock on restart/graceful
Patch submitted by Darius Davis (darius-abz free-range.com.au)
Submitted by: niq
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488883 13f79535-47bb-0310-9956-ffa450edef68
*) Fix issue which could cause piped loggers to be orphaned and never
terminate after a graceful restart. PR 40651. [Joe Orton,
Ruediger Pluem]
Reviewed by: trawick, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483967 13f79535-47bb-0310-9956-ffa450edef68
*) Fix address-in-use startup failure caused by corruption of the list of
listen sockets in some configurations with multiple generic Listen
directives. [Jeff Trawick]
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483958 13f79535-47bb-0310-9956-ffa450edef68
change the default dir for command-line make to \Apache22 on Windows, and change
the service name to Apache2.2 by default (this *matches* the windows installer.)
Resolves recent bug reports and confusion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483553 13f79535-47bb-0310-9956-ffa450edef68
as HTTP status codes, as documented in PR#31759 (a bug shared by
the default handler, mod_cgi, mod_cgid, mod_proxy, and probably
others).
+1: niq, minfrin, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@463488 13f79535-47bb-0310-9956-ffa450edef68
*) The full server version information is now included in the error log at
startup as well as server status reports, irrespective of the setting
of the ServerTokens directive. ap_get_server_version() is now
deprecated, and is replaced by ap_get_server_banner() and
ap_get_server_description().
Reviewed by: rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446606 13f79535-47bb-0310-9956-ffa450edef68
* Add optional 'scheme://' prefix to ServerName directive. For
'https', mod_http returns "https" for the ap_hook_http_scheme and
DEFAULT_HTTPS_PORT for ap_hook_default_port. This fixes Redirect
responses to requests for directories without a trailing slash
when httpd runs behind a proxy or offload device that processes
SSL. It also enables support for Subversion in that
configuration. This change is completely backwards compatible
and passes the perl-framework. Minor mmn bump because I add a
field to server_rec.
* Document r399947, addition of optional scheme:// to ServerName directive
PR: 33398
Submitted by: sctemme
Reviewed by: sctemme, rpluem, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425051 13f79535-47bb-0310-9956-ffa450edef68
Worker MPM: On graceless shutdown or restart, send signals to
each worker thread to wake them up if they're polling on a
Keep-Alive connection. PR 38737. [Chris Darroch]
PR: 38737
Reviewed by: chrisd, trawick, niq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424876 13f79535-47bb-0310-9956-ffa450edef68
Make the worker and event MPMs support GracefulShutdownTimeout just like
the prefork MPM does.
Submitted by: Chris Darroch <chrisd pearsoncmg.com>
Ported to event MPM by: rooneg
Issue number: 38621
* server/mpm/worker/worker.c
(ap_mpm_run): Make the graceful shutdown log message refer to the right
signal, and respect the graceful shutdown timeout if there is one.
* server/mpm/experimental/event/event.c
(ap_mpm_run): Ditto.
* CHANGES: Note change.
Submitted by: chrisd, rooneg
Reviewed by: chrisd, rpluem, trawick
PR: 38621
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@410935 13f79535-47bb-0310-9956-ffa450edef68
of switching linkers from the x86 (default linker) to x64 or other
possible target platforms. (Also this commit cleans up lingering
/GX switches from the 'BASE' options that are supposed to be unused.)
Backports: 397407
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@397649 13f79535-47bb-0310-9956-ffa450edef68
Reviewed by all active win32 contributors, and committed as an arch
maintenance fix. This permits Win32 VisualStudio 2005 users to build
httpd without extranious 'deprectated option' emits.
Reviewed by: wrowe, colm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395961 13f79535-47bb-0310-9956-ffa450edef68
With all of the, uhm, interesting manners in which httpd
can be built and installed, let's ensure httpd -V gives the
reporter a chance to identify the APR flavor used to compile
and to run httpd when reporting bugs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@390597 13f79535-47bb-0310-9956-ffa450edef68
* Insert the HTTP_IN filter uncondionally before we call
ap_send_error_response or ap_die. This ensures that
ap_discard_request_body called by ap_die and by ap_send_error_response works
correctly on status codes that do not cause the connection to be dropped and
in situations where the connection should be kept alive.
PR: 38123
Reviewed by: rpluem, niq, jerenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@390503 13f79535-47bb-0310-9956-ffa450edef68
a VPATH build, and don't test trees with -d (simply -f the
expected files) in case a tree such as srclib/apr is actually
a symlink rather than a true directory in ./buildconf.
Reviewed by: wrowe, rpluem, colm
Backports: 374821
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@374907 13f79535-47bb-0310-9956-ffa450edef68
Clean up c2x code-path by not double-setting the prefix variable.
* server/util.c
(c2x): Take a new prefix parameter instead of hard-coding '%' and then
conditionally setting 'x' for half of the cases.
Submitted by: jerenkrantz
Reviewed by: nd, colm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@327898 13f79535-47bb-0310-9956-ffa450edef68
* 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/branches/2.2.x@327793 13f79535-47bb-0310-9956-ffa450edef68
NET_TIME, as a standalone feature, was a horrid idea, so eliminate it.
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. 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/branches/2.2.x@307031 13f79535-47bb-0310-9956-ffa450edef68
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/branches/2.2.x@306782 13f79535-47bb-0310-9956-ffa450edef68
*) SECURITY: CAN-2005-2970 (cve.mitre.org)
worker MPM: Fix a memory leak which can occur after an aborted
connection in some limited circumstances. [Greg Ames, Jeff Trawick]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292949 13f79535-47bb-0310-9956-ffa450edef68
however backporting these doxygen fixes makes it significantly easier to diff
trunk and the 2.2.x branch, to sort out what's what. And we might as well
release with nicer doxygen markup.
Submitted by: Neale Ranns <neale ranns.org>
Reviewed by: Ian Holsman
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292540 13f79535-47bb-0310-9956-ffa450edef68