1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

25891 Commits

Author SHA1 Message Date
Jeff Trawick
e19c8aabd4 don't log bogus rv
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1583007 13f79535-47bb-0310-9956-ffa450edef68
2014-03-29 14:57:37 +00:00
Jeff Trawick
ccaaf93e87 Report OpenSSL directories in configuration summary
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1583005 13f79535-47bb-0310-9956-ffa450edef68
2014-03-29 13:50:37 +00:00
Daniel Gruno
b6899453ab Add a note on t->r checking, as per Rüdiger's email.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1582881 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 20:43:15 +00:00
Daniel Gruno
29e243b1fb mod_lua: Since c->notes is the only place where r will be NULL, we don't need to check a second time, since we'll never meddle with tables named 'notes'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1582877 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 20:33:08 +00:00
Daniel Gruno
d38e1b6e83 mod_lua: Redesign the table construction/access mechanism, so we pass on a struct with the request_rec, the table pointer and the table name instead of just the table pointer. This allows us to use the request_rec for logging/editing purposes, as well as inform the user which exact table in the request_rec was modified.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1582858 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 18:38:41 +00:00
Daniel Gruno
8ae663bc78 mod_lua: Prevent HTTP Response Splitting by not allowing tables in the request_rec to be set with values containing newlines. This is a semi-ugly hack, but it will have to do until we find another way of setting these values.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1582262 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 11:20:03 +00:00
Daniel Gruno
2514105ae4 mod_lua: escape key/value pairs when setting cookies to prevent header splitting with tainted cookies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1582253 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 10:58:35 +00:00
Daniel Gruno
8ad00113ae mod_lua: Reformat and escape script error output.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1582247 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 10:44:43 +00:00
Rich Bowen
13c6e50702 Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1581013 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 19:36:36 +00:00
Rich Bowen
bee607f895 It does more than just a ProxyPass, but also looks at the HOST header,
so this gives somewhat deeper insight into what the end result looks
like.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1581011 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 19:28:49 +00:00
Rich Bowen
e9630d9139 rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1580936 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 17:44:06 +00:00
Joe Orton
252dcdcf31 * support/ab.c: Revert accidental version bump in r1580928.
(Although it seems likely this *should* have been bumped sometime
   since 2006?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1580935 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 17:43:10 +00:00
Joe Orton
31badda9f4 * support/ab.c (write_request): Avoid redundant write(,,0) preceding
the write() of the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1580928 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 17:20:47 +00:00
Rich Bowen
4b7726b28b Suggest the 'require expr' syntax as an alternate way to do something.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1580895 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 16:00:58 +00:00
Eric Covener
575f6bef60 mod_reqtimeout: Resolve unexpected timeouts on keepalive requests
under the Event MPM. PR56216.  

Submitted By: Frank Meier <frank meier ergon ch>
Committed By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1580568 13f79535-47bb-0310-9956-ffa450edef68
2014-03-23 18:59:37 +00:00
Jim Jagielski
8feaa1f1e3 And use #error if we get past configure...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1579267 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 15:45:42 +00:00
Jim Jagielski
a0529d925c Check if PCRE_DUPNAMES exists at configure time
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1579259 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 15:23:35 +00:00
Vincent Deffontaines
a9467ff9a1 typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578895 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 13:49:33 +00:00
Daniel Gruno
266b5a6438 fix message number
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578882 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 13:40:03 +00:00
Daniel Gruno
8ae204c9b0 mod_lua: Actually check whether interpreting the base structure of a file works or not, don't just assume it works.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578870 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 13:32:36 +00:00
Daniel Gruno
31ad0e2d6b mod_lua: be a bit more verbose in error logging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578825 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 11:26:04 +00:00
Christophe Jaillet
6e69b3ceb0 Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578762 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 06:54:03 +00:00
Christophe Jaillet
e2643b38f9 Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578760 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 06:52:08 +00:00
Christophe Jaillet
845a77beca Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578759 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 06:51:49 +00:00
Lucien Gentis
61c6390a90 Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1577892 13f79535-47bb-0310-9956-ffa450edef68
2014-03-15 16:28:11 +00:00
Jim Jagielski
a42bebaee7 backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1577161 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 13:43:28 +00:00
Jim Jagielski
5b3f22a456 backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1577141 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 12:49:38 +00:00
Daniel Gruno
82e4ee75b0 mod_lua: Add a fixups hook that checks if the original request is intended for LuaMapHandler. This fixes a bug where FallbackResource invalidates the LuaMapHandler directive in certain cases by changing the URI before the map handler code executes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576981 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 22:56:44 +00:00
Rich Bowen
7e88b3fb12 Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576899 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 20:47:06 +00:00
Rich Bowen
231c982add Link AddHandler, SetHandler to docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576897 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 20:45:55 +00:00
Rich Bowen
bcb01b66ba Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576895 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 20:41:31 +00:00
Rich Bowen
1ce4ce92d1 Fixes weird syntax in example, and removes superfluos quote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576894 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 20:40:44 +00:00
Rich Bowen
b082ab87d9 Use the simpler Files syntax rather than FilesMatch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576890 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 20:37:08 +00:00
Stephen Henson
72889d15f8 A bug in some older versions of OpenSSL will cause a crash
in SSL_get_certificate for servers where the certificate hasn't
been sent.

Workaround by setting the ssl structure to client mode which
bypasses the faulty code in OpenSSL. Normally setting a server
ssl structure to client mode would cause problems later on:
but we are freeing the structure immediately without attempting
to use it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576741 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 13:52:26 +00:00
Ruediger Pluem
cf78476ac3 * This one is backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576496 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 20:37:34 +00:00
Rich Bowen
98271b109b Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576417 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 16:44:35 +00:00
Rich Bowen
fb7eb0949e Ensure that .lua.foo files aren't affected
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576415 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 16:43:39 +00:00
Jim Jagielski
d47b1c4677 These are in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576384 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 15:40:08 +00:00
Jan Kaluža
7c077f5aff mod_authn_socache.c: fix creation of default socache_instance.
In pre_config, default socache_provider is created, but socache_instance
initialization is missing. This leads to crash on startup if default
socache_provider is used (AuthnCacheSOCache is not called) and
AuthnCacheEnable or AuthnCacheProvideFor is used.

This problem has been introduced in r1531961.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1576233 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 08:52:54 +00:00
André Malo
67a7eb9f6d update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575986 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 16:06:18 +00:00
Jeff Trawick
d50ebf12a6 fix spelling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575958 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 14:57:14 +00:00
Eric Covener
43b91c5fa5 make it clear that B is for backreferences
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575709 13f79535-47bb-0310-9956-ffa450edef68
2014-03-09 13:54:22 +00:00
André Malo
5587a2c17a update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575630 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 22:56:56 +00:00
Lucien Gentis
1b5312ed6d Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575577 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 17:38:56 +00:00
Rich Bowen
fe68360bfd Rebuild HTML
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575407 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 21:05:32 +00:00
Rich Bowen
5021856e04 As per comment, removing quotes makes the example work
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575406 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 21:05:11 +00:00
William A. Rowe Jr
c82ccc8880 Module identification
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575403 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 21:01:33 +00:00
William A. Rowe Jr
0559370e7e CVE-2014-0098 (reported by Rainer Canavan <rainer-apache 7val com>)
Segfaults w/ truncated cookie logging.

Clean up the cookie logging parser to recognize only the cookie=value pairs,
not valueless cookies.  This refactors multiple passes over the same string
buffer into a single pass parser.

Submitted by: wrowe
Reviewed by: rpluem, jim 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575400 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 20:56:24 +00:00
William A. Rowe Jr
577eaf25cd Revert r1574518 to get 2.2/2.4/2.x all back in sync for a single fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575394 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 20:45:33 +00:00
Rich Bowen
2a0f6999e4 Add =~ and !~ to the table of comparison operators
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575392 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 20:35:07 +00:00