summaryrefslogtreecommitdiff
path: root/server
Commit message (Collapse)AuthorAgeFilesLines
* Refactoring of ap_read_request() to store partial request stateBrian Pane2005-12-311-267/+280
| | | | | | | | | in the request rec. The point of this is to allow asynchronous MPMs do do nonblocking reads of requests. (Backported from the async-read-dev branch) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@360461 13f79535-47bb-0310-9956-ffa450edef68
* Removed the destruction of the bucket allocator prior toBrian Pane2005-12-311-1/+0
| | | | | | | | | | | clearing the transaction pool. The bucket allocator will now get destroyed when apr_pool_clear() invokes its cleanup callback. With the old logic, memory corruption was possible if the pool contained any brigades that referenced any buckets allocated from the bucket allocator. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@360257 13f79535-47bb-0310-9956-ffa450edef68
* * Move code for broken backend detection out of core filter into a new httpRuediger Pluem2005-12-181-18/+5
| | | | | | | | protocol filter (ap_http_broken_backend_filter) that is only run in the proxy case. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357519 13f79535-47bb-0310-9956-ffa450edef68
* * If the mod_proxy backend connection broke in the middle of the response,Ruediger Pluem2005-12-181-5/+18
| | | | | | | | | | | | | | | | | | | | | then - Do not cache it. - Signal the client that something went wrong by closing the connection and not sending the last-chunk marker if the response was T-E chunked. server/core_filters.c : Close the connection to the client by setting c->keepalive to AP_CONN_CLOSE. modules/http/chunk_filter.c : Do not send last-chunk marker in the case the backend broke. modules/proxy/mod_proxy_http.c: Signal that the backend connection broke. modules/cache/mod_disk_cache.c: Respect r->no_cache for discarding the response Submitted by: Roy T. Fielding, Jim Jagielski, Ruediger Pluem Reviewed by: Roy T. Fielding, Jim Jagielski, Ruediger Pluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357461 13f79535-47bb-0310-9956-ffa450edef68
* * server/protocol.c (ap_old_write_filter): Use NULL for the NULLJoe Orton2005-12-161-1/+1
| | | | | | | pointer not 0. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357170 13f79535-47bb-0310-9956-ffa450edef68
* Bring forward the fix for CVE-2005-3352 already on the branches:Joe Orton2005-12-161-0/+6
| | | | | | | | | | | | * modules/mappers/mod_imagemap.c (imap_url): Escape the referer. * server/util.c (ap_escape_html): Escape the " character. Submitted by: mjc Reviewed by: fielding, jorton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357161 13f79535-47bb-0310-9956-ffa450edef68
* Fix for Bug 37790 (hangs on error return from post_read_request)Nick Kew2005-12-051-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@354085 13f79535-47bb-0310-9956-ffa450edef68
* Only define sendfile_nonblocking if APR_HAS_SENDFILE is true.Paul Querna2005-12-031-0/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@351997 13f79535-47bb-0310-9956-ffa450edef68
* When computing the timeouts for keepalives and write completion,Brian Pane2005-11-271-5/+3
| | | | | | | | | get the current time _after_ processing the event that led to the timeout, rather than before. [forward-port of commit 349189 from the async-read-dev branch] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349190 13f79535-47bb-0310-9956-ffa450edef68
* remove an obsolete commentBrian Pane2005-11-201-4/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345726 13f79535-47bb-0310-9956-ffa450edef68
* No functional change: remove "internal" tab spacing/formatting.Jim Jagielski2005-11-167-42/+42
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345053 13f79535-47bb-0310-9956-ffa450edef68
* Revert UCN default change - set back to Off, which isJim Jagielski2005-11-151-2/+2
| | | | | | | what 2.1/2.2 has been but is opposite from the 2.0 default. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344408 13f79535-47bb-0310-9956-ffa450edef68
* Add in the UseCanonicalPhysicalPort directive, whichJim Jagielski2005-11-151-45/+92
| | | | | | | | | | | 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
* drop dependency on apr_wait_for_io_or_timeout()Jeff Trawick2005-11-131-2/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@343999 13f79535-47bb-0310-9956-ffa450edef68
* Minor refactoring: move the creation of the pollset and associatedBrian Pane2005-11-131-35/+48
| | | | | | | | | | data structures outside of the listener thread function. The point of this is to facilitate future experiments with different concurrency models like Leader/Followers as potential alternatives to the current Reactor design. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332879 13f79535-47bb-0310-9956-ffa450edef68
* No functional change: more indenting/formatting changes due toJim Jagielski2005-11-104-23/+23
| | | | | | | tabbing git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332316 13f79535-47bb-0310-9956-ffa450edef68
* No functional Change: Removing trailing whitespace. This alsoJim Jagielski2005-11-1043-1436/+1436
| | | | | | | | 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
* No functional change: simple detabbing of indented code.Jim Jagielski2005-11-1019-172/+172
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
* Moved the extended_status scoreboard update from ap_process_http_connectionBrian Pane2005-10-301-0/+4
| | | | | | | | to the EOR bucket destructor. Also, added some defensive code and comments regarding r->pool lifetime to ap_process_http_connection. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@329664 13f79535-47bb-0310-9956-ffa450edef68
* Restore the socket timeout after setting it to zero for nonblockingBrian Pane2005-10-281-19/+36
| | | | | | | | writes in ap_core_output_filter. (This fixes the mod_proxy errors that the new core output filter had been causing.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@329075 13f79535-47bb-0310-9956-ffa450edef68
* * server/eor_bucket.c: Pick up ap_run_log_transaction prototype.Joe Orton2005-10-241-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@328069 13f79535-47bb-0310-9956-ffa450edef68
* Async write completion for Event MPMBrian Pane2005-10-241-14/+83
| | | | | | | (backported from async-dev branch to 2.3 trunk) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327945 13f79535-47bb-0310-9956-ffa450edef68
* Redesign of request cleanup and logging to use End-Of-Request bucketBrian Pane2005-10-242-1/+67
| | | | | | | (backport from async-dev branch to 2.3 trunk) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327925 13f79535-47bb-0310-9956-ffa450edef68
* remove debugging codeBrian Pane2005-10-231-1/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327875 13f79535-47bb-0310-9956-ffa450edef68
* New version of ap_core_output_filter that does nonblocking writesBrian Pane2005-10-231-545/+373
| | | | | | | (backport from async-dev branch to 2.3 trunk) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327872 13f79535-47bb-0310-9956-ffa450edef68
* Add new connection states for handler and write completionBrian Pane2005-10-231-0/+8
| | | | | | | (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
* * Fix PR31226 (AddOutputFilterByType deflate not active with mod_proxy), byRuediger Pluem2005-10-211-4/+3
| | | | | | | | | | | | | 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
* keep the proxied Content-Length header for a HEAD response. PR 18757Greg Ames2005-10-201-1/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327008 13f79535-47bb-0310-9956-ffa450edef68
* Make ap_register_output_filter back into a function (*sigh*)Nick Kew2005-10-121-0/+9
| | | | | | | but update its API doc git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@315041 13f79535-47bb-0310-9956-ffa450edef68
* Make ap_register_output_filter a #defineNick Kew2005-10-121-9/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@315024 13f79535-47bb-0310-9956-ffa450edef68
* remove the recycled_pool variable to keep it more in sync with worker.Greg Ames2005-10-081-6/+2
| | | | | | | | event already had logic in the listener thread error legs to prevent leaking ptrans, so this is mostly cosmetic. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307250 13f79535-47bb-0310-9956-ffa450edef68
* remove obsolete constantGreg Ames2005-10-081-11/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307239 13f79535-47bb-0310-9956-ffa450edef68
* use Greg's cleaner fix for CAN-2005-2970Jeff Trawick2005-10-081-13/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307221 13f79535-47bb-0310-9956-ffa450edef68
* NET_TIME, as a standalone feature, was a horrid idea.William A. Rowe Jr2005-10-063-45/+36
| | | | | | | | | | | | | | | | | | | 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
* Pay close attention to core_create_req() ... and noteWilliam A. Rowe Jr2005-10-053-5/+10
| | | | | | | | | | | | 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
* Initialise a variable, to avoid a gcc warning.Colm MacCarthaigh2005-10-031-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@293364 13f79535-47bb-0310-9956-ffa450edef68
* Remove some trailing spaces. Syncs with 2.2.x.Colm MacCarthaigh2005-10-031-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@293307 13f79535-47bb-0310-9956-ffa450edef68
* SECURITY: CAN-2005-2970 (cve.mitre.org)Jeff Trawick2005-09-301-0/+5
| | | | | | | | worker MPM: Fix a memory leak which can occur after an aborted connection in some limited circumstances. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@292809 13f79535-47bb-0310-9956-ffa450edef68
* Clean up c2x code-path by not double-setting the prefix variable.Justin Erenkrantz2005-09-281-8/+7
| | | | | | | | | | | * server/util.c (c2x): Take a new prefix parameter instead of hard-coding '%' and then conditionally setting 'x' for half of the cases. Reviewed by: nd git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@292111 13f79535-47bb-0310-9956-ffa450edef68
* When doing a subrequest lookup, do not lookup using the quickhandler ifColm MacCarthaigh2005-09-271-2/+10
| | | | | | | | | next_filter is NULL, since this implies that the subrequest will be internal_fast_redirect'ed or will never be called. See line request.c:1513 onwards (in make_sub_request) also. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291914 13f79535-47bb-0310-9956-ffa450edef68
* * server/connection.c (ap_lingering_close): Cleanup; no functional change.Joe Orton2005-09-251-7/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291454 13f79535-47bb-0310-9956-ffa450edef68
* * server/connection.c (ap_lingering_close): Fix lingering close toJoe Orton2005-09-251-10/+16
| | | | | | | | | | | really match the 1.3 behaviour: read from the client for up to ~30 seconds in total. Current behaviour will attempt only 15 read() calls then give up. PR: 35292 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291452 13f79535-47bb-0310-9956-ffa450edef68
* * server/request.c (core_opts_merge): When AllowOverride is specifiedJoe Orton2005-09-231-2/+0
| | | | | | | | | | for the directory, ignore the inherited override_opts field. PR: 35330 Submitted by: kabe <kabe sra-tohoku.co.jp> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291120 13f79535-47bb-0310-9956-ffa450edef68
* * server/mpm/prefork/prefork.c: Add volatile qualifier to die_nowJoe Orton2005-09-191-1/+1
| | | | | | | since it is changed by a signal handler. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290124 13f79535-47bb-0310-9956-ffa450edef68
* get rid of an obsolete comment. the separate event thread disappeared whenGreg Ames2005-09-171-3/+2
| | | | | | | the event MPM moved into svn. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@289681 13f79535-47bb-0310-9956-ffa450edef68
* Remove a call to strerror(). Possibly a leftover from prior debugging code.Colm MacCarthaigh2005-09-121-1/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@280401 13f79535-47bb-0310-9956-ffa450edef68
* Any failure in apr_stat on a symlink currently givesJoshua Slive2005-09-101-1/+2
| | | | | | | | | | | | | "Symbolic link not allowed", which results in much head-scratching if the actual problem is a broken link of some sort. The real fix would be to propogate the correct apr_stat error into the error log, but that would require more refactoring than I'm prepared to do. This change simply expands the error message to include both possibilities. It improves the situation for PR28515 but does not solve it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@280018 13f79535-47bb-0310-9956-ffa450edef68
* Move the timeout mutex up, to limit the time we are holding it.Paul Querna2005-09-091-2/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279794 13f79535-47bb-0310-9956-ffa450edef68
* New provider function, ap_list_provider_names(), which lists allJim Jagielski2005-09-091-2/+69
| | | | | | | | available registered providers for a specified group and version number. Visible change so add CHANGES entry. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279750 13f79535-47bb-0310-9956-ffa450edef68
* httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT settingJeff Trawick2005-09-011-0/+2
| | | | | | | (1.3 has done that for a while) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265737 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status