1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

2872 Commits

Author SHA1 Message Date
Jim Jagielski
91f25252ce Backport of PID table code from trunk to 2.2...
Create a branch for this until we test enough to
fold into 2.2


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-pid-table@546948 13f79535-47bb-0310-9956-ffa450edef68
2007-06-13 16:23:19 +00:00
Jeff Trawick
8d22ed37c5 merge from trunk:
core: Correct a regression since 2.0.x in the handling of AllowOverride
Options.

PR: 41829

Submitted by: Torsten Förtsch <torsten.foertsch gmx.net>
Reviewed by: niq, rpluem, trawick



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@526912 13f79535-47bb-0310-9956-ffa450edef68
2007-04-09 20:56:01 +00:00
Jeff Trawick
b3f5ff3df0 Merge from trunk:
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
2007-01-29 17:54:10 +00:00
William A. Rowe Jr
003a033071 Add .manifest post-processing to the httpd build for users of VC 8
(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
2007-01-11 05:44:54 +00:00
Jim Jagielski
378747067e Merge r487901 from trunk:
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
2006-12-20 02:04:39 +00:00
Jim Jagielski
da84fe8fd9 Delete mistakenly added files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484631 13f79535-47bb-0310-9956-ffa450edef68
2006-12-08 15:09:43 +00:00
Jim Jagielski
ef474b032f Merge r442758 from trunk:
PR 31759 (mutated) - reported by Jo Rhett
Don't return apr_status_t error value from input filter chain.

Submitted by: niq
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483980 13f79535-47bb-0310-9956-ffa450edef68
2006-12-08 13:07:14 +00:00
Jeff Trawick
c893b2201c merge from trunk:
*) 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
2006-12-08 12:41:20 +00:00
Jeff Trawick
225c63f0c0 backport simple list manipulation fix:
*) 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
2006-12-08 12:23:33 +00:00
William A. Rowe Jr
2f0242f26f Fix two flaws that make parallel testing of Apache2 (.0, .2, .x) very difficult,
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
2006-12-07 17:09:37 +00:00
Graham Leggett
957841ebee core: Deal with the widespread use of apr_status_t return values
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
2006-10-12 22:55:03 +00:00
Jeff Trawick
492e695c40 merge from trunk (but preserve ap_get_server_version()):
*) 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
2006-09-15 13:19:25 +00:00
Ruediger Pluem
855ef76388 Merge r399947, r406697 from trunk:
* 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
2006-07-24 13:34:19 +00:00
Jeff Trawick
b8f37285d1 merge from trunk:
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
2006-07-24 01:43:24 +00:00
Jeff Trawick
1f70d9e273 merge from trunk:
worker and event MPMs: fix excessive forking if fork() or child_init
  take a long time.

PR: 39275
Reviewed by: trawick, gregames, pquerna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424874 13f79535-47bb-0310-9956-ffa450edef68
2006-07-24 01:34:58 +00:00
Roy T. Fielding
ae1748a99f update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 03:38:44 +00:00
Ruediger Pluem
5e85c41db6 Merge r377291 from trunk:
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
2006-06-01 20:12:51 +00:00
William A. Rowe Jr
967c94daee Remove all /machine:I386 references, these are getting in the way
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
2006-04-27 21:47:41 +00:00
Paul Querna
786089eef9 Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard to the copyright statements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68
2006-04-22 01:53:06 +00:00
Nick Kew
7d67dd0f63 Backport fix to PR#39282
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395985 13f79535-47bb-0310-9956-ffa450edef68
2006-04-21 18:43:36 +00:00
William A. Rowe Jr
84871ce3fe Backport 395419, replace /GX win32 compile flag with /EHsc to match.
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
2006-04-21 17:47:19 +00:00
Colm MacCarthaigh
8ffd8c554b Update the last year of copyright for the 2.2.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395231 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:33:16 +00:00
Jeff Trawick
ee1c708c12 Default handler: Don't return output filter apr_status_t values.
PR:          31759
Reviewed by: rpleum, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@393002 13f79535-47bb-0310-9956-ffa450edef68
2006-04-10 17:56:14 +00:00
Paul Querna
8efebc65b8 Merge r390573 from trunk:
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
2006-04-01 06:22:25 +00:00
Ruediger Pluem
b5a7e38b91 Merge r370172, r371132 from trunk:
* 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
2006-03-31 21:27:18 +00:00
William A. Rowe Jr
7437caa989 uri_delims moved to aprutil EONS ago
Backports 384622

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@384623 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 21:29:55 +00:00
William A. Rowe Jr
9a8477b539 Solaris build fixes; don't fail on missing .h files within
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
2006-02-04 19:05:08 +00:00
Nick Kew
5c9b5bc30b Fix PR#38070
Avoid server-driven negotiation when a script has sent a Status: header.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@374895 13f79535-47bb-0310-9956-ffa450edef68
2006-02-04 17:45:51 +00:00
Nick Kew
143f2c5b3f Trival backports having 3 * +1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@356764 13f79535-47bb-0310-9956-ffa450edef68
2005-12-14 10:05:48 +00:00
Mark J. Cox
245c5818ae Fix moderate security issue CVE-2005-3352 mod_imap cross-site scripting flaw
Submitted by: Mark Cox <mjc apache.org>
Reviewed by: jorton, mjc, fielding
PR: 37874



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@356291 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 17:27:59 +00:00
Joe Orton
11400378ee Merge r327008 from trunk:
keep the proxied Content-Length header for a HEAD response. 

PR: 18757
Submitted by: gregames
Reviewed by: jorton, jerenkrantz, niq, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@354800 13f79535-47bb-0310-9956-ffa450edef68
2005-12-07 16:58:01 +00:00
Jim Jagielski
0f7b6563e8 Merge r345053 from trunk:
No functional change: remove "internal" tab spacing/formatting.



Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@345239 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 13:39:15 +00:00
Jim Jagielski
61d978167d Fold in the UseCanonicalPhysicalPort code, along with the
docs changes (just source currently)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@344416 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 19:39:15 +00:00
Jim Jagielski
0a93716a36 No functional change: more indenting/formatting changes due to
tabbing



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332318 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 16:05:09 +00:00
Jim Jagielski
b3181bddae No functional change: remove trailing whitespace. This also means
that "blank" lines, which had consisted of just spaces
and/or tabs are now truly blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332309 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:20:05 +00:00
Jim Jagielski
ec2468d2ae No functional change: detab all indenting to be consistent
with our formatting standards.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332307 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:15:41 +00:00
Nick Kew
b03a458c2c Remove experimental MPMs that show no signs of going anywhere:
perchild, threadpool, leader


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@329591 13f79535-47bb-0310-9956-ffa450edef68
2005-10-30 17:05:26 +00:00
Colm MacCarthaigh
81b61d3e26 Merge r292111 from trunk:
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
2005-10-24 01:08:25 +00:00
Ruediger Pluem
69ce4c1478 Merge r327179 from trunk:
* 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
2005-10-23 14:14:45 +00:00
Colm MacCarthaigh
3a1c760550 merge r265737 from trunk.
Author: trawick
Reviewed by: colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312906 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 16:11:16 +00:00
Jeff Trawick
e5a1d5970e use Greg's cleaner fix for CAN-2005-2970
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307222 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 00:11:36 +00:00
William A. Rowe Jr
1de9f5c6a5 Backport Revision: 306495
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
2005-10-07 06:41:23 +00:00
William A. Rowe Jr
947a36b25f Backport 295141
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
2005-10-06 15:53:58 +00:00
Colm MacCarthaigh
6f2c6d5ae4 Merge r293364 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293365 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 15:15:36 +00:00
Colm MacCarthaigh
13e31a56bd Whitespace and comment changes; inconsequential - but synchronises
with trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293292 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 10:34:43 +00:00
Colm MacCarthaigh
0288158bac Sync with trunk: remove an unneccessary over-lapping variable (jorton)
and fix a style nit (colm).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293170 13f79535-47bb-0310-9956-ffa450edef68
2005-10-02 21:32:29 +00:00
Colm MacCarthaigh
e555afb985 Merge r265518-9 from trunk; explicit assignment of some global variables
to zero. These should not be neccessary, but help us get around a gcc
(on ia64 at least) optimisation bug. They are harmless anyway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293164 13f79535-47bb-0310-9956-ffa450edef68
2005-10-02 20:56:56 +00:00
Joe Orton
fa768e66ec Merge r264886 from trunk:
* server/main.c (suck_in_APR): Remove weird gzeof reference which
broke all the -Werror builds.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292965 13f79535-47bb-0310-9956-ffa450edef68
2005-10-01 12:11:45 +00:00
Jeff Trawick
6e78bad864 merge from trunk:
*) 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
2005-10-01 11:02:10 +00:00
Colm MacCarthaigh
69b359cfdc Backport the Doxygen changes to the 2.2.x branch. No functional changes,
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
2005-09-29 20:44:53 +00:00