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

25352 Commits

Author SHA1 Message Date
Ruediger Pluem
69bc7d594e * Fix logical flaw introduced in r1531340. We checked for the opposite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533444 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 13:30:52 +00:00
Jim Jagielski
d897f098f9 Rüdiger and Yann suggestions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533440 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 13:10:45 +00:00
Igor Galić
7fa552c097 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533276 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 22:18:34 +00:00
Igor Galić
fefa44311c So, Fix pet-peeve!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533275 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 22:15:29 +00:00
Igor Galić
c161119cae Fix typos and grammar.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533274 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 22:14:30 +00:00
Jim Jagielski
c418702714 another suggestion by Yann... use a shorter lifetime pool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533272 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 22:04:31 +00:00
Rich Bowen
a4ef54fbbc Grammar
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533255 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 20:40:47 +00:00
Jeff Trawick
10476aa08f s/sometimes maybe not what/sometimes may not be what/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533224 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 19:32:33 +00:00
Rich Bowen
6e94c232c7 Rebuild doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533198 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:23:51 +00:00
Rich Bowen
81ab5bdbe4 Broken markup in example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533197 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:23:19 +00:00
Jim Jagielski
b71b312095 typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533170 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 17:21:37 +00:00
Jim Jagielski
0b4520d54c from an idea by Yann Ylavic <ylavic.dev@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533169 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 17:21:04 +00:00
Jim Jagielski
3d76743798 docco update now that we can support URL paths
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533154 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 16:54:53 +00:00
Jim Jagielski
27b314b4e6 move pool creation to the single instance when we need it...
but be pool aware anyway, just in case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533153 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 16:52:04 +00:00
Jim Jagielski
d152f386a0 Only assume localhost in the special case where the person
just has the lone scheme after the |

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533113 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 15:24:44 +00:00
Jim Jagielski
81e827c11c ap_proxy_strncpy should correctly handle src being NULL.
Actually, apr_cpystrn() should as well...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533100 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 15:02:04 +00:00
Jim Jagielski
347c75b3c5 Put the uds path in its own field, and adjust the logic
to look for an empty string rather than a flag.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533087 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 14:10:43 +00:00
Jim Jagielski
43fb7fa32f Eclipse code analysis warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533065 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 12:53:53 +00:00
Jeff Trawick
81254bebb7 axe svn:mime-type, add svn:eol-style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532840 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:16:16 +00:00
Jeff Trawick
a0a6b456c1 add generated files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532822 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 17:16:14 +00:00
Jeff Trawick
2fc962a22a generated files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532819 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 17:12:57 +00:00
Jeff Trawick
9db7c3545d Interpolation worked within the scheme portion of URLs for
ProxyPass and ProxyPassReverse until a fix to apr_uri_parse()
in APR-Util 1.5.2 closed the hole that had previously allowed
the necessary {} characters within the scheme.

Lack of support for interpolation within the scheme will be a
permanent limitation.

The mod_proxy documentation is updated to provide an alternate
configuration solution.

PR: 55315
Submitted by: Mike Rumph <mike.rumph oracle.com>
Tweaked by: trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532816 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 17:11:29 +00:00
Jim Jagielski
a91c47c2e5 No more magic numbers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532746 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 12:21:49 +00:00
Jim Jagielski
a00a928dd2 don't use what could have been freed...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532507 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 20:02:30 +00:00
Jim Jagielski
bfa6d07466 Update LOGNO
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532456 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 17:45:47 +00:00
Jim Jagielski
56397983aa in 2.4.7
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532405 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 16:03:26 +00:00
Jim Jagielski
c4a8285899 docco userland change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532403 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 15:58:37 +00:00
Jim Jagielski
6c23d1338a xforms update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532397 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 15:45:30 +00:00
Jim Jagielski
9b6fb3d615 Standardize on:
unix:/path/to/socket|scheme://ignored

for ProxyPass UDS.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532394 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 15:38:09 +00:00
Jeff Trawick
86014a1423 Follow-up to r1525597:
Initialize error log providers in vhosts, solving crashes
when logging from those vhosts as well as allowing a different
provider (or provider configuration) for vhosts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532344 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 14:09:29 +00:00
Joe Orton
ce61f94003 * support/rotatelogs.c (get_now): Fix the NULL ptr dereferences
added in r1532281.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532289 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 11:19:38 +00:00
Joe Orton
fd4ae8e200 * support/rotatelogs.c (get_now): Return the offset applied to the
Unix time as a parameter.
  (doRotate): When exploding the time for strtfime formatting, iff in
  -l mode, subtract the offset and explode the real Unix time as a
  local time so %Z etc works correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532281 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 10:44:17 +00:00
Jeff Trawick
4073515aa5 avoid needless apr_pstrdup()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532122 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 22:51:44 +00:00
Jim Jagielski
e8d701a8ed check that we have a pool...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531971 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 16:38:52 +00:00
Jim Jagielski
3af21fb887 Just use the def global... consistency is important
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531969 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 16:31:17 +00:00
Jim Jagielski
c984a2e5f3 Ensure that userland format of UDS is the same as how it is
configured, no matter how we store and use it internally.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531962 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 16:12:30 +00:00
Chris Darroch
cc4c936c2e Support optional initialization arguments for socache providers in
mod_authn_socache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531961 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 16:08:41 +00:00
Jim Jagielski
5f17fef1a5 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531934 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 15:03:05 +00:00
Jim Jagielski
0b40ddae79 IDE typo error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531933 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 15:02:50 +00:00
Jim Jagielski
935f822f44 Update doccos about UDS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531930 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 14:59:40 +00:00
Jim Jagielski
76927e7a34 clean up socket definition... just the sock: path matters,
and we adjust relative to DefaultRuntimeDir

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531929 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 14:59:38 +00:00
Graham Leggett
c8b1ad8f55 mod_session: Reset the max-age on session save. PR 47476.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531683 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 13:07:19 +00:00
Graham Leggett
0d9b5c81a5 mod_session: After parsing the value of the header specified by the
SessionHeader directive, remove the value from the response. PR 55279.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531679 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 12:27:54 +00:00
Graham Leggett
6330b052dd mod_auth_form: Make sure the optional functions are loaded even when
the AuthFormProvider isn't specified.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531672 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 12:14:39 +00:00
Lucien Gentis
ce430a69ee Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531538 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 15:03:05 +00:00
Ben Reser
31a3eab6d7 Followup to r1529559: mod_dav_fs: Fix encoding of hrefs in PROPFIND response.
Previous commit missed encoding the names of the children of the PROPFIND
request when the depth wasn't 0.

* modules/dav/fs/repos.c
  (dav_fs_append_uri): New function
  (dav_fs_walker): Use dav_fs_append_uri() and adjust length calculations to
    use the encoded length.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531505 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 06:13:20 +00:00
Jim Jagielski
0605393196 syntax sugar... if the worker is associated w/ a UDS,
then make sure the log reporting has a visual clue.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531370 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 17:36:24 +00:00
Jim Jagielski
e40e0a785b Reformat the UDS support inline with a new naming structure.
Use a flag for speed for testing.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531340 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 16:12:41 +00:00
Jim Jagielski
13af10453a save a possible lookup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530813 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 22:22:17 +00:00
Jeff Trawick
b299ff2e98 core: Don't truncate output when sending is interrupted by a signal,
such as from an exiting CGI process.

PR: 55643


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530793 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 21:09:41 +00:00