www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
26,231 Commits 62 Branches 306 Tags
16e3fcd37cab594fbb134d386fbbe2b324f9eaaf
Commit Graph

26231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Covener
16e3fcd37c be more general 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1604351 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-21 13:05:07 +00:00
Eric Covener
191be1b5d6 missed a case in r1538490: 
PR56639

Always NULL c->sbh before putting a connection back in a pollset or queue.

We can't NULL c->sbh at the bottom of process_socket() after putting a socket back on 
the event_pollset or having it go into lingering close, because the listener or a worker
thread could A) continue on the connection or B) free and allocate the same conn_rec
pointer before we get to the bottom of process_socket().

Submitted By: Edward Lu
Committed By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1604350 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-21 13:03:19 +00:00
Takashi Sato
83b56e81a0 Do not call a timeout callback after the asociated socket 
woke and the socket callback was called.
PR 56642


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1604347 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-21 12:58:35 +00:00
Daniel Gruno
0ac4c9dc26 Revert early|late argument for LuaHookCheckUserID as it does not work right now. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1604336 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-21 10:36:56 +00:00
Joe Orton
33ef4d63bc * modules/ssl/ssl_engine_init.c (make_dh_params): Remove redundant 
temporary variable; no functional change.
  (free_dh_params): Add comment.

Submitted by: rpluem, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1603915 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 15:09:15 +00:00
Yann Ylavic
ff4ff27e69 Use unsigned bit flags (otherwise the non-zero value to be used is -1). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1603863 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 12:43:05 +00:00
Yann Ylavic
98bba830b4 Remove backported changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1603192 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-17 14:57:19 +00:00
Yann Ylavic
c704cdb517 Add missing CHANGES entries for r1572655,1572663,1572668-1572671,1573224,1586745,1587594,1587639,1590509, r1572092, and r1572896,1572911. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1603156 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-17 13:07:34 +00:00
Yann Ylavic
aa5ca9770e mod_proxy_fcgi: follow up to r1592032. 
Also break the outer loop when "sending stdin" fails.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1603122 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-17 10:37:15 +00:00
Jeff Trawick
e22212a41b Reindent after small fix in r1603027 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1603029 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 23:57:19 +00:00
Jeff Trawick
d6d845cfcd Fix bug introduced in r1591508 which resulted in the final empty 
FCGI_STDIN not being sent.  Interaction with latest uWSGI (and
probably other protocol implementations) breaks without this.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1603027 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 23:56:06 +00:00
Yann Ylavic
ec95d72c5a mod_proxy: Don't limit the size of the connectable Unix Domain Socket paths. 
Since connect() to UDS path is used at several places, introduce
ap_proxy_connect_uds() in proxy_util.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602989 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 20:26:24 +00:00
Yann Ylavic
45c913ca24 Core filters do not need mod_proxy.h 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602978 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 19:48:12 +00:00
Yann Ylavic
5d05482970 Fixed unused "ap_listen_rec *lr;" in prefork_run(). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602827 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 09:34:36 +00:00
Yann Ylavic
d2e9cc1e16 Mark all unused/duplicated/closed child listeners as inactive. 
Fix unused "ap_listen_rec *lr;" in worker_run().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602826 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 09:28:01 +00:00
Rich Bowen
4fd8828745 html build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602769 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 20:31:42 +00:00
Rich Bowen
8ffc70ffa2 metafiles 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602767 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 20:31:22 +00:00
Rich Bowen
60a11d4c98 Example of loading mpm with LoadModule, and what happens when you do it 
wrong.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602764 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 20:30:18 +00:00
Rich Bowen
a75326c3ec Rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602763 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 20:11:32 +00:00
Rich Bowen
2cc5d2909d Markup errors. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602761 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 20:09:50 +00:00
Rich Bowen
b22fa20999 <page> not valid in this context. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602758 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 20:05:04 +00:00
Rich Bowen
7fa89c62dd More relevant links in the getting started doc. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602755 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 20:03:17 +00:00
Rich Bowen
3f684784f8 Stray whitespace 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602730 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 16:46:24 +00:00
Rich Bowen
42031ba846 Should probably move this to something on the docs-project website so 
that someone other than me ever actually looks at it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602709 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 15:44:08 +00:00
Rich Bowen
bf65444dad Start slogging through the STATUS file again 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602704 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 15:20:43 +00:00
Rich Bowen
ea32160df8 Rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602703 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 15:20:04 +00:00
Rich Bowen
e3a98b4a1f Kill the "IE on Mac" example. Replace with simpler example. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602702 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 15:19:01 +00:00
Jim Jagielski
637f263141 revert 1602523, until there is understanding 
about what the actual issue and "requirement" are.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602697 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 13:54:55 +00:00
Rich Bowen
46ba7bad97 Apply patch to spanish error messages, from PR 56214 (Thanks Javier Llorente) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602693 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 13:45:25 +00:00
Rich Bowen
044061e203 Rebuild quickrefs 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602692 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 13:33:07 +00:00
Lucien Gentis
961d71ccc2 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602686 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 13:10:00 +00:00
Lucien Gentis
4ba9fab28f XML Updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602685 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 13:08:48 +00:00
Lucien Gentis
465a262b6c Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602600 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-14 16:49:57 +00:00
Lucien Gentis
229b182c26 XML updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602599 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-14 16:48:15 +00:00
Takashi Sato
273671f6fd style fix, no functional change. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602544 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-14 02:49:35 +00:00
Jim Jagielski
74820dfc57 Allow for "magic" scheme "auto" which makes the scheme of 
the backend worker match whatever the scheme of the
incoming request was...

For example:

   ProxyPass / auto://foo.example.com/

If the incoming request is http:.../lala then
the resultant will be http://foo.example.com/lala

If it's wws:.../lolo then we'd send
wws://foo.example.com/lolo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602523 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 21:10:51 +00:00
Jeff Trawick
6ab8d6c0dd mod_proxy_fcgi iobuffersize support in 2.4.x via r1601749 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602411 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 12:38:37 +00:00
Takashi Sato
de08177faf eventMPM: 
fix SEGV in the case socket callback was registered
and no timeout function was registered.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602409 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 12:30:12 +00:00
Ben Reser
3bda0de20f Fix PR 56480: PROPFIND walker doesn't encode hrefs properly 
Reverts r1529559 partially (specifically the dav_xml_escape_uri) bit.
Reverts r1531505 entirely.

* modules/dav/main/mod_dav.c
  (dav_xml_escape_uri): Revert the piece of r1529559 that removes the URI
    escaping from this function.

* modules/dav/main/props.c
  (dav_do_prop_subreq): Escape the URI before doing a sub request with it.
    This resolves some properties like getcontenttype from failing to be
    returned for files that contain characters that require encoding in their
    path.

* modules/dav/main/mod_dav.h
  (dav_resource): Note the inconsistency in the documentation.

* modules/dav/fs/repos.c
  (dav_fs_get_resource): Don't use the unparsed_uri to set the uri field of
    the resource.  This is the correct fix for the double encoding in mod_dav_fs
    that led to the dav_xml_escape_uri() change and r1531505.
  (dav_fs_walker, dav_fs_append_uri): Revert r1531505 changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602338 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 08:34:05 +00:00
Takashi Sato
2d240e9c71 Follow up r1601943: 
Fix typo. No functional change.

Pointed out by mrumph


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602058 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 03:32:50 +00:00
Jeff Trawick
66b5e4834b fix AP_IS_DEAULT_HANDLER_NAME 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601995 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 19:30:01 +00:00
Takashi Sato
0e4cf76a64 Socket event callback now takes pollfd. 
User (e.g. mod_proxy_wstunnel) can know
which socket is ready.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601943 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 16:39:34 +00:00
Yann Ylavic
c14ecfa1dd mod_ssl: dump SSL IO/state for the write side of the connection(s), like reads. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601919 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 14:42:32 +00:00
Yann Ylavic
5c063de927 mod_sed: Reuse ctx->bb in sed_response_filter() and be safe with its 
reentrance. The single return point helps to not duplicate cleanup code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601877 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 12:50:29 +00:00
Yann Ylavic
bc39e11342 mod_sed: 
Avoid the call to APR_BUCKET_REMOVE() + apr_bucket_delete() on the
same bucket.
Also, empty the input brigade while looping to avoid the trailing
apr_brigade_cleanup() call (no functional change).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601864 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 11:47:26 +00:00
Yann Ylavic
ec2a594b25 Fix ab's r1601076 changelog credits. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601700 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 17:39:24 +00:00
Yann Ylavic
15e049fcae Add ab's r1601076 changelog. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601680 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 16:46:57 +00:00
Yann Ylavic
3dd42c024f mod_proxy: follow up to r1601291. 
Since deferred_write_pool is needed by the core_output_filter and is a subpool
of the connection, shutdown in a pre_cleanup of the connection's pool to avoid
a freed memory access (SEGV).

Reported By: takashi


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601630 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 13:23:20 +00:00
Yann Ylavic
9614c0b8e6 Strip useless apr_brigade_cleanup() calls. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601624 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 12:44:15 +00:00
Takashi Sato
854c7a5611 * apr_status_t vs HTTP status code fix 
* use APR_STATUS_IS_ENOTIMPL rather than direct comparison


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601604 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 11:21:22 +00:00