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

24974 Commits

Author SHA1 Message Date
Guenter Knauf
e44c118ccc Update doccu.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496501 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 14:49:56 +00:00
Jeff Trawick
fdafc9e397 core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
on Linux kernel versions 3.x and above.

PR: 55121
Submitted by: Bradley Heilbrun <apache heilbrun.org>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496429 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 11:45:19 +00:00
Jeff Trawick
08a72883ad avoid "mixed declarations and code"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496427 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 11:37:24 +00:00
Eric Covener
7cf845c151 correct CHANGES for r1496339, confused myself. Normal merge from global config to vhost.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496340 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 02:49:51 +00:00
Eric Covener
286e82c27d *) core: merge AllowEncodedSlashes from the base configuration into
(non-default) name-based virtual hosts. [Eric Covener]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496339 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 02:48:25 +00:00
Eric Covener
1c3427493e provide a simple (no <If>) way to set a header only if it's not already there.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496338 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 02:20:36 +00:00
Eric Covener
1cc32d26f6 Use cp on AIX too. /usr/bin/install isn't compatible on recent systems
and it's a pain to install and force /opt/freeware/bin.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496230 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 21:48:50 +00:00
Eric Covener
8d7c3860fe re-try LDAP connections in a few authz paths.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496207 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 20:40:05 +00:00
Eric Covener
d2b57d3440 revert r1496183, leave at DEBUG. This not a subgroup message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496202 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 20:32:31 +00:00
Eric Covener
7439853cc5 attribute and error reason reversed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496194 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 20:16:57 +00:00
Eric Covener
482a66207f Drop severity from DEBUG to trace4: "... didn't match with attr DN failed group verification."
(This is just mod_authnz_ldap trying multiple atribbutes to discover LDAP subgroups)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496183 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 19:48:34 +00:00
Eric Covener
b62a407779 Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496178 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 19:44:38 +00:00
Eric Covener
f12c832f5c uldap_simple_bind was subsequently rewritten to use the op_timeout with ldap_result()
which is portable, which means LDAPTimeout is used for bind & search regardless of
this LDAP options availability.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496177 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 19:42:15 +00:00
Eric Covener
4e9b551354 prevent excessive delays retrying new connections that timed out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496176 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 19:40:24 +00:00
André Malo
961dcb996a update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495861 13f79535-47bb-0310-9956-ffa450edef68
2013-06-23 18:09:04 +00:00
Eric Covener
d0b9d09842 xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495844 13f79535-47bb-0310-9956-ffa450edef68
2013-06-23 16:57:00 +00:00
Eric Covener
650d3d87ef doc another moved directive, also mentioned in an old comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495843 13f79535-47bb-0310-9956-ffa450edef68
2013-06-23 16:56:46 +00:00
Eric Covener
231d3a9278 protect 'AP_DECLARE_MODULE(deflate)' from expansion to
'AP_DECLARE_MODULE(z_deflate)' if zlib has been built with
-DZ_PREFIX.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495825 13f79535-47bb-0310-9956-ffa450edef68
2013-06-23 14:56:27 +00:00
Lucien Gentis
fe5b2c6264 Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495753 13f79535-47bb-0310-9956-ffa450edef68
2013-06-22 16:41:49 +00:00
Guenter Knauf
7c89f70739 Fixed touch function docu.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495666 13f79535-47bb-0310-9956-ffa450edef68
2013-06-22 05:32:33 +00:00
Guenter Knauf
b006aecd3e Added new mod_lua functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495665 13f79535-47bb-0310-9956-ffa450edef68
2013-06-22 05:24:02 +00:00
André Malo
f8f79e1f34 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495584 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 20:24:16 +00:00
André Malo
ba26c1969d fix properties.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495582 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 20:15:12 +00:00
Jeff Trawick
cfb752e8e4 fix doc for ap_pregsub_ex() return code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495501 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 16:45:51 +00:00
Guenter Knauf
35012f8883 Added new r:touch() function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1495270 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 01:51:45 +00:00
Eric Covener
d157706fa4 Document apxs -p paramter.
Submitted by: Jan Kaluža <jkaluza@redhat.com>
Reviewed by: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494952 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 12:30:20 +00:00
Graham Leggett
0632971eac Update the log message number.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494549 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 11:19:50 +00:00
Rainer Jung
472f2a43ba Fix "variable 'rv' may be used uninitialized
in this function" warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494536 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 10:21:46 +00:00
Rainer Jung
aa4befc8b9 Fix "unused variable" warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494532 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 10:16:35 +00:00
Rainer Jung
67e9e54493 Fix "unused variable" warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494531 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 10:16:03 +00:00
Jim Jagielski
80f0769562 use a simple allocation list to enable re-use of
"freed" chunks. If not using pools, we assume malloc/free
is sane.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494407 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 01:00:46 +00:00
Guenter Knauf
e169772873 Make MSVC compilers happy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494317 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 21:30:53 +00:00
Guenter Knauf
b8f413778d Fix for stupid CodeWarrior compiler.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494196 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 16:51:17 +00:00
Jim Jagielski
a3aff5b836 subpool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494157 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 14:31:36 +00:00
Jim Jagielski
67615cc81c make opaque
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494156 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 14:31:24 +00:00
Rainer Jung
e25ca71620 Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493933 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 20:57:23 +00:00
Graham Leggett
8bad51f56a Correct the use of the printf formatter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493925 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 20:34:26 +00:00
Graham Leggett
96d4951170 mod_socache_shmcb.c: Remove arbitrary restriction on shared memory size
previously limited to 64MB.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493921 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 20:22:10 +00:00
Jim Jagielski
f632ed1df1 Fold in Eric Covener's socket callback
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493741 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 12:43:52 +00:00
Stefan Fritsch
93b299891f update auto-generated code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493422 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 21:20:09 +00:00
Stefan Fritsch
5c39db5205 The new bison version now also includes the uppercased builddir in a
preprocessor symbol. Remove it to avoid spurious diffs.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493421 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 21:19:04 +00:00
Stefan Fritsch
73b15db2fa Describe mod_auth_digest changes more accurately
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493419 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 20:57:01 +00:00
Stefan Fritsch
2da3e9b560 Update auto-generated source
Now using bison 2.7.12


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493416 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 20:49:40 +00:00
Stefan Fritsch
96131fdd9e Provide better token names for error messages
Use either human readable names or the exact spelling from the BNF from the
docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493414 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 20:48:34 +00:00
Christophe Jaillet
2e581fd49e Correct typo in error message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493330 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 08:59:00 +00:00
Stefan Fritsch
4b8ed77a46 Move initialization of the secret to the pre_config hook. Use
ap_retained_data_*() because we don't have access to process->pool there.

This makes the code shorter and a lot more clear, but cannot directly be
backported to 2.2 which doesn't have ap_retained_data_*().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493257 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 21:43:30 +00:00
Guenter Knauf
d014ead524 Added new funtions to mod_lua docu.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1492782 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 17:50:25 +00:00
Jim Jagielski
9c63be9a93 better descript
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1492724 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 16:01:07 +00:00
Jim Jagielski
1003800a82 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1492714 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 15:49:56 +00:00
Jim Jagielski
51951f66d7 Add
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1492710 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 15:44:47 +00:00