]> granicus.if.org Git - apache/log
apache
11 years agoTransforms.
Joe Orton [Mon, 28 Oct 2013 10:53:20 +0000 (10:53 +0000)]
Transforms.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1536311 13f79535-47bb-0310-9956-ffa450edef68

11 years ago* docs/manual/upgrading.xml: Note 2.4 backwards-compat break for
Joe Orton [Mon, 28 Oct 2013 10:51:36 +0000 (10:51 +0000)]
* docs/manual/upgrading.xml: Note 2.4 backwards-compat break for
  some piped logging configurations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1536310 13f79535-47bb-0310-9956-ffa450edef68

11 years agothis was backported to 2.2, so not an upgrade issue.
Eric Covener [Sat, 26 Oct 2013 19:05:31 +0000 (19:05 +0000)]
this was backported to 2.2, so not an upgrade issue.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1536021 13f79535-47bb-0310-9956-ffa450edef68

11 years ago/. Initialisations
Lucien Gentis [Sat, 26 Oct 2013 14:33:57 +0000 (14:33 +0000)]
/. Initialisations
if (! laCouleurFond) setCouleurFond(MENU_POPUP_COULEUR_FOND); else setCouleurFond(laCouleurFond);

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1535995 13f79535-47bb-0310-9956-ffa450edef68

11 years agoAllow for format specifiers to be used in the base substitution string for Header...
Daniel Ruggeri [Fri, 25 Oct 2013 17:16:46 +0000 (17:16 +0000)]
Allow for format specifiers to be used in the base substitution string for Header edit

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1535788 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRemove unused APXS setting from template for generated Makefile
Jeff Trawick [Fri, 25 Oct 2013 11:36:00 +0000 (11:36 +0000)]
Remove unused APXS setting from template for generated Makefile

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1535699 13f79535-47bb-0310-9956-ffa450edef68

11 years agoSECURITY (CVE-2014-0231): Fix for DoS due to hang waiting for CGI script.
Eric Covener [Wed, 23 Oct 2013 19:26:08 +0000 (19:26 +0000)]
SECURITY (CVE-2014-0231): Fix for DoS due to hang waiting for CGI script.
Patch one of two.

Permit a read timeout to be used in mod_cgid to give up on a slow CGI script.

In trunk, it defaults to the servers Timeout.  PR43494

Submitted By: Eric Covener, Toshikuni Fukaya
Reviewed By: Eric Covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1535125 13f79535-47bb-0310-9956-ffa450edef68

11 years agoaxe some useless assignments (clang scan-build)
Jeff Trawick [Wed, 23 Oct 2013 12:03:04 +0000 (12:03 +0000)]
axe some useless assignments (clang scan-build)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534997 13f79535-47bb-0310-9956-ffa450edef68

11 years agodon't ignore some apr_procattr failures (clang scan-build)
Jeff Trawick [Wed, 23 Oct 2013 11:59:35 +0000 (11:59 +0000)]
don't ignore some apr_procattr failures (clang scan-build)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534995 13f79535-47bb-0310-9956-ffa450edef68

11 years agorotatelogs: Remove last constant length error buffer.
Ben Reser [Wed, 23 Oct 2013 05:14:45 +0000 (05:14 +0000)]
rotatelogs: Remove last constant length error buffer.

* support/rotatelogs.c
  (ERRMSGSZ): Remove.
  (rotate_status): Remove errbuff member.
  (truncate_and_write_error): Accept the error message as an argument.
  (doRotate): Shift the pool destruction slightly later and use it to generate
    the error message to pass truncate_and_write_error().
  (main): In case of write errors create a pool to generate the error message,
    since the other pools available may never been freed.  Adjust to pass
    message directly to truncate_and_write_error().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534914 13f79535-47bb-0310-9956-ffa450edef68

11 years agorotatelogs: Remove another use of a consant length buffer for errors.
Ben Reser [Wed, 23 Oct 2013 03:12:46 +0000 (03:12 +0000)]
rotatelogs: Remove another use of a consant length buffer for errors.

* support/rotatelogs.c
  (doRotate): Use apr_psprintf() and %pm.  Move the destruction of the pool
    after we're done with the error message so the error string stays allocated
    long enough.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534896 13f79535-47bb-0310-9956-ffa450edef68

11 years agorotatelogs: Use apr_psprintf() with %pm instead of a constant length buffer for
Ben Reser [Wed, 23 Oct 2013 03:01:05 +0000 (03:01 +0000)]
rotatelogs: Use apr_psprintf() with %pm instead of a constant length buffer for
errors.

* support/rotatelogs.c
  (post_rotate, doRotate): Switch to using apr_psprintf() with %pm.

Suggested by: rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534895 13f79535-47bb-0310-9956-ffa450edef68

11 years agodon't pass uninitialized rv passed to ap_log_rerror()
Jeff Trawick [Wed, 23 Oct 2013 01:32:32 +0000 (01:32 +0000)]
don't pass uninitialized rv passed to ap_log_rerror()
  (rv wasn't interesting / follow an existing example)

stop throwing away a pointer on the heap

(clang scan-build)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534892 13f79535-47bb-0310-9956-ffa450edef68

11 years agoaxe attempt to close a previously-closed apr socket
Jeff Trawick [Wed, 23 Oct 2013 01:25:05 +0000 (01:25 +0000)]
axe attempt to close a previously-closed apr socket
(clang scan-build says "uninitialized", but it doesn't know
how apr_sockaddr_info_get() reports errors)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534890 13f79535-47bb-0310-9956-ffa450edef68

11 years agoaxe unused autodata+heap (clang scan-build)
Jeff Trawick [Wed, 23 Oct 2013 01:23:18 +0000 (01:23 +0000)]
axe unused autodata+heap (clang scan-build)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534888 13f79535-47bb-0310-9956-ffa450edef68

11 years agoSSL_CONF support for files and directories.
Stephen Henson [Tue, 22 Oct 2013 19:55:43 +0000 (19:55 +0000)]
SSL_CONF support for files and directories.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534754 13f79535-47bb-0310-9956-ffa450edef68

11 years ago* modules/proxy/mod_proxy_http.c (ap_proxy_http_request): Use the same
Joe Orton [Mon, 21 Oct 2013 18:58:26 +0000 (18:58 +0000)]
* modules/proxy/mod_proxy_http.c (ap_proxy_http_request): Use the same
  brigade lifetime for the header brigade as the other brigades.
  POSSIBLE (but as yet unconfirmed) fix for crashes seen with threaded
  servers, e.g. PR 50335; appears correct or at least not harmful.

PR: 50335

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534321 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFix r1533728. Not a great idea to dereference process after pool destroy!
Nick Kew [Mon, 21 Oct 2013 00:30:26 +0000 (00:30 +0000)]
Fix r1533728.  Not a great idea to dereference process after pool destroy!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534015 13f79535-47bb-0310-9956-ffa450edef68

11 years agoupdate transformation
André Malo [Sun, 20 Oct 2013 18:33:04 +0000 (18:33 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533943 13f79535-47bb-0310-9956-ffa450edef68

11 years agoproperty fix.
André Malo [Sun, 20 Oct 2013 18:27:07 +0000 (18:27 +0000)]
property fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533940 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFollowup to r1533810: Put the rotatelogs docs in the right place.
Ben Reser [Sun, 20 Oct 2013 18:12:23 +0000 (18:12 +0000)]
Followup to r1533810: Put the rotatelogs docs in the right place.

* docs/man/rotatelogs.8,
  docs/manual/programs/rotatelogs.html.en: Remove changes from r1533810.

* docs/manual/programs/rotatelogs.xml: Adjust docs for new -d option.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533935 13f79535-47bb-0310-9956-ffa450edef68

11 years agoAdd an option to autocreate directories to rotatelogs.
Ben Reser [Sat, 19 Oct 2013 19:10:33 +0000 (19:10 +0000)]
Add an option to autocreate directories to rotatelogs.

* support/rotatelogs.c
  (rotate_config): Remove const from szLogRoot since we'll be passing it to
    apr_filepath_merge.  Add create_path member.
  (usage, dumpConfig): Update to reflect new -d option.
  (doRotate): Add code that knows how to create the directories a log file
    is going to go into.
  (main): Add the -d option and canonicalize the incoming path with
    apr_filepath_merge() so that the code in doRotate can work properly.

* docs/man/rotatelogs.8,
  docs/manual/programs/rotatelogs.html.en: Update for -d option.

PR: 46669
Submitted by: Philippe Lantin <plantin cobaltgroup.com>
              (which was actually a patch written by myself when I worked there)
Tweaked by: breser (ported to trunk and changed option from -p to -d)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533810 13f79535-47bb-0310-9956-ffa450edef68

11 years agoUpdates.
Lucien Gentis [Sat, 19 Oct 2013 14:11:05 +0000 (14:11 +0000)]
Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533767 13f79535-47bb-0310-9956-ffa450edef68

11 years agoLike r1532122: Axe needless string duplication in
Jeff Trawick [Sat, 19 Oct 2013 13:59:31 +0000 (13:59 +0000)]
Like r1532122: Axe needless string duplication in
               setup for call to apr_proc_create().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533765 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRemove erroneous space reported in pr55676
Daniel Ruggeri [Sat, 19 Oct 2013 12:50:25 +0000 (12:50 +0000)]
Remove erroneous space reported in pr55676

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533750 13f79535-47bb-0310-9956-ffa450edef68

11 years agoPR 55670
Nick Kew [Sat, 19 Oct 2013 11:01:11 +0000 (11:01 +0000)]
PR 55670
Don't risk failing silently at startup when running in a tty.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533728 13f79535-47bb-0310-9956-ffa450edef68

11 years ago* Fix logical flaw introduced in r1531340. We checked for the opposite.
Ruediger Pluem [Fri, 18 Oct 2013 13:30:52 +0000 (13:30 +0000)]
* 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

11 years agoRüdiger and Yann suggestions
Jim Jagielski [Fri, 18 Oct 2013 13:10:45 +0000 (13:10 +0000)]
Rüdiger and Yann suggestions

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533440 13f79535-47bb-0310-9956-ffa450edef68

11 years agoxforms
Igor Galić [Thu, 17 Oct 2013 22:18:34 +0000 (22:18 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533276 13f79535-47bb-0310-9956-ffa450edef68

11 years agoSo, Fix pet-peeve!
Igor Galić [Thu, 17 Oct 2013 22:15:29 +0000 (22:15 +0000)]
So, Fix pet-peeve!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533275 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFix typos and grammar.
Igor Galić [Thu, 17 Oct 2013 22:14:30 +0000 (22:14 +0000)]
Fix typos and grammar.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533274 13f79535-47bb-0310-9956-ffa450edef68

11 years agoanother suggestion by Yann... use a shorter lifetime pool
Jim Jagielski [Thu, 17 Oct 2013 22:04:31 +0000 (22:04 +0000)]
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

11 years agoGrammar
Rich Bowen [Thu, 17 Oct 2013 20:40:47 +0000 (20:40 +0000)]
Grammar

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533255 13f79535-47bb-0310-9956-ffa450edef68

11 years agos/sometimes maybe not what/sometimes may not be what/
Jeff Trawick [Thu, 17 Oct 2013 19:32:33 +0000 (19:32 +0000)]
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

11 years agoRebuild doc.
Rich Bowen [Thu, 17 Oct 2013 18:23:51 +0000 (18:23 +0000)]
Rebuild doc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533198 13f79535-47bb-0310-9956-ffa450edef68

11 years agoBroken markup in example
Rich Bowen [Thu, 17 Oct 2013 18:23:19 +0000 (18:23 +0000)]
Broken markup in example

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533197 13f79535-47bb-0310-9956-ffa450edef68

11 years agotypo
Jim Jagielski [Thu, 17 Oct 2013 17:21:37 +0000 (17:21 +0000)]
typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533170 13f79535-47bb-0310-9956-ffa450edef68

11 years agofrom an idea by Yann Ylavic <ylavic.dev@gmail.com>
Jim Jagielski [Thu, 17 Oct 2013 17:21:04 +0000 (17:21 +0000)]
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

11 years agodocco update now that we can support URL paths
Jim Jagielski [Thu, 17 Oct 2013 16:54:53 +0000 (16:54 +0000)]
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

11 years agomove pool creation to the single instance when we need it...
Jim Jagielski [Thu, 17 Oct 2013 16:52:04 +0000 (16:52 +0000)]
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

11 years agoOnly assume localhost in the special case where the person
Jim Jagielski [Thu, 17 Oct 2013 15:24:44 +0000 (15:24 +0000)]
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

11 years agoap_proxy_strncpy should correctly handle src being NULL.
Jim Jagielski [Thu, 17 Oct 2013 15:02:04 +0000 (15:02 +0000)]
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

11 years agoPut the uds path in its own field, and adjust the logic
Jim Jagielski [Thu, 17 Oct 2013 14:10:43 +0000 (14:10 +0000)]
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

11 years agoEclipse code analysis warning
Jim Jagielski [Thu, 17 Oct 2013 12:53:53 +0000 (12:53 +0000)]
Eclipse code analysis warning

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533065 13f79535-47bb-0310-9956-ffa450edef68

11 years agoaxe svn:mime-type, add svn:eol-style
Jeff Trawick [Wed, 16 Oct 2013 18:16:16 +0000 (18:16 +0000)]
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

11 years agoadd generated files
Jeff Trawick [Wed, 16 Oct 2013 17:16:14 +0000 (17:16 +0000)]
add generated files

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532822 13f79535-47bb-0310-9956-ffa450edef68

11 years agogenerated files
Jeff Trawick [Wed, 16 Oct 2013 17:12:57 +0000 (17:12 +0000)]
generated files

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532819 13f79535-47bb-0310-9956-ffa450edef68

11 years agoInterpolation worked within the scheme portion of URLs for
Jeff Trawick [Wed, 16 Oct 2013 17:11:29 +0000 (17:11 +0000)]
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

11 years agoNo more magic numbers.
Jim Jagielski [Wed, 16 Oct 2013 12:21:49 +0000 (12:21 +0000)]
No more magic numbers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532746 13f79535-47bb-0310-9956-ffa450edef68

11 years agodon't use what could have been freed...
Jim Jagielski [Tue, 15 Oct 2013 20:02:30 +0000 (20:02 +0000)]
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

11 years agoUpdate LOGNO
Jim Jagielski [Tue, 15 Oct 2013 17:45:47 +0000 (17:45 +0000)]
Update LOGNO

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532456 13f79535-47bb-0310-9956-ffa450edef68

11 years agoin 2.4.7
Jim Jagielski [Tue, 15 Oct 2013 16:03:26 +0000 (16:03 +0000)]
in 2.4.7

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532405 13f79535-47bb-0310-9956-ffa450edef68

11 years agodocco userland change
Jim Jagielski [Tue, 15 Oct 2013 15:58:37 +0000 (15:58 +0000)]
docco userland change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532403 13f79535-47bb-0310-9956-ffa450edef68

11 years agoxforms update
Jim Jagielski [Tue, 15 Oct 2013 15:45:30 +0000 (15:45 +0000)]
xforms update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532397 13f79535-47bb-0310-9956-ffa450edef68

11 years agoStandardize on:
Jim Jagielski [Tue, 15 Oct 2013 15:38:09 +0000 (15:38 +0000)]
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

11 years agoFollow-up to r1525597:
Jeff Trawick [Tue, 15 Oct 2013 14:09:29 +0000 (14:09 +0000)]
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

11 years ago* support/rotatelogs.c (get_now): Fix the NULL ptr dereferences
Joe Orton [Tue, 15 Oct 2013 11:19:38 +0000 (11:19 +0000)]
* 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

11 years ago* support/rotatelogs.c (get_now): Return the offset applied to the
Joe Orton [Tue, 15 Oct 2013 10:44:17 +0000 (10:44 +0000)]
* 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

11 years agoavoid needless apr_pstrdup()
Jeff Trawick [Mon, 14 Oct 2013 22:51:44 +0000 (22:51 +0000)]
avoid needless apr_pstrdup()

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532122 13f79535-47bb-0310-9956-ffa450edef68

11 years agocheck that we have a pool...
Jim Jagielski [Mon, 14 Oct 2013 16:38:52 +0000 (16:38 +0000)]
check that we have a pool...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531971 13f79535-47bb-0310-9956-ffa450edef68

11 years agoJust use the def global... consistency is important
Jim Jagielski [Mon, 14 Oct 2013 16:31:17 +0000 (16:31 +0000)]
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

11 years agoEnsure that userland format of UDS is the same as how it is
Jim Jagielski [Mon, 14 Oct 2013 16:12:30 +0000 (16:12 +0000)]
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

11 years agoSupport optional initialization arguments for socache providers in
Chris Darroch [Mon, 14 Oct 2013 16:08:41 +0000 (16:08 +0000)]
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

11 years agoxforms
Jim Jagielski [Mon, 14 Oct 2013 15:03:05 +0000 (15:03 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531934 13f79535-47bb-0310-9956-ffa450edef68

11 years agoIDE typo error
Jim Jagielski [Mon, 14 Oct 2013 15:02:50 +0000 (15:02 +0000)]
IDE typo error

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531933 13f79535-47bb-0310-9956-ffa450edef68

11 years agoUpdate doccos about UDS
Jim Jagielski [Mon, 14 Oct 2013 14:59:40 +0000 (14:59 +0000)]
Update doccos about UDS

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531930 13f79535-47bb-0310-9956-ffa450edef68

11 years agoclean up socket definition... just the sock: path matters,
Jim Jagielski [Mon, 14 Oct 2013 14:59:38 +0000 (14:59 +0000)]
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

11 years agomod_session: Reset the max-age on session save. PR 47476.
Graham Leggett [Sun, 13 Oct 2013 13:07:19 +0000 (13:07 +0000)]
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

11 years agomod_session: After parsing the value of the header specified by the
Graham Leggett [Sun, 13 Oct 2013 12:27:54 +0000 (12:27 +0000)]
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

11 years agomod_auth_form: Make sure the optional functions are loaded even when
Graham Leggett [Sun, 13 Oct 2013 12:14:39 +0000 (12:14 +0000)]
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

11 years agoUpdates.
Lucien Gentis [Sat, 12 Oct 2013 15:03:05 +0000 (15:03 +0000)]
Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531538 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFollowup to r1529559: mod_dav_fs: Fix encoding of hrefs in PROPFIND response.
Ben Reser [Sat, 12 Oct 2013 06:13:20 +0000 (06:13 +0000)]
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

11 years agosyntax sugar... if the worker is associated w/ a UDS,
Jim Jagielski [Fri, 11 Oct 2013 17:36:24 +0000 (17:36 +0000)]
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

11 years agoReformat the UDS support inline with a new naming structure.
Jim Jagielski [Fri, 11 Oct 2013 16:12:41 +0000 (16:12 +0000)]
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

11 years agosave a possible lookup
Jim Jagielski [Wed, 9 Oct 2013 22:22:17 +0000 (22:22 +0000)]
save a possible lookup

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530813 13f79535-47bb-0310-9956-ffa450edef68

11 years agocore: Don't truncate output when sending is interrupted by a signal,
Jeff Trawick [Wed, 9 Oct 2013 21:09:41 +0000 (21:09 +0000)]
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

11 years agofollow-up to r1530603: fix typo/syntax error
Jeff Trawick [Wed, 9 Oct 2013 21:08:55 +0000 (21:08 +0000)]
follow-up to r1530603: fix typo/syntax error

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530792 13f79535-47bb-0310-9956-ffa450edef68

11 years agoping tuning via Yann Ylavic <ylavic.dev@gmail.com>
Jim Jagielski [Wed, 9 Oct 2013 13:38:45 +0000 (13:38 +0000)]
ping tuning via Yann Ylavic <ylavic.dev@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530603 13f79535-47bb-0310-9956-ffa450edef68

11 years agoBreak long lines.
Christophe Jaillet [Wed, 9 Oct 2013 07:15:29 +0000 (07:15 +0000)]
Break long lines.
Add missing <code></code>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530514 13f79535-47bb-0310-9956-ffa450edef68

11 years agoAdd no's
Jim Jagielski [Tue, 8 Oct 2013 17:21:27 +0000 (17:21 +0000)]
Add no's

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530361 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFix typo
Christophe Jaillet [Tue, 8 Oct 2013 06:03:48 +0000 (06:03 +0000)]
Fix typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530161 13f79535-47bb-0310-9956-ffa450edef68

11 years agoCorrect typo in comments for ap_map_http_request_error().
Chris Darroch [Mon, 7 Oct 2013 16:14:39 +0000 (16:14 +0000)]
Correct typo in comments for ap_map_http_request_error().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529991 13f79535-47bb-0310-9956-ffa450edef68

11 years agoCorrect typo in comments for ap_map_http_request_error().
Chris Darroch [Mon, 7 Oct 2013 16:10:07 +0000 (16:10 +0000)]
Correct typo in comments for ap_map_http_request_error().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529988 13f79535-47bb-0310-9956-ffa450edef68

11 years agoFix PR 55397: dav_resource->uri treated as an unparsed uri.
Ben Reser [Sun, 6 Oct 2013 01:08:51 +0000 (01:08 +0000)]
Fix PR 55397: dav_resource->uri treated as an unparsed uri.

The change made for PR 54611 caused this field to be treated as
unescaped.  mod_dav_svn however, provided escaped URIs.  Essentially
breaking support for paths with non-URI safe characters in SVN.

Adjust the code so that dav_resource->uri is assumed to be escaped and
adjust mod_dav_fs so that it uses escaped URIs in this field.

* modules/dav/fs/repos.c
  (dav_fs_get_resource): Use the unparsed_uri to contruct the resource uri.

* modules/dav/main/mod_dav.c
  (dav_xml_escape_uri): Do not uri escape, just handle xml escaping.
  (dav_created): Assume that locn if provided is escaped.
  (dav_method_copymove, dav_method_bind): Use the unparsed_uri on the request
    when calling dav_created() to adjust to locn assuming it is escaped.

* modules/dav/main/mod_dav.h
  (dav_resource): Document that uri is escaped.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529559 13f79535-47bb-0310-9956-ffa450edef68

11 years agoWhen building modules with prereqs, search httpd include dirs
Jeff Trawick [Sat, 5 Oct 2013 13:49:22 +0000 (13:49 +0000)]
When building modules with prereqs, search httpd include dirs
before prereq include dirs in case httpd is installed to the same
place as the prereq, in which case we might be using an older
httpd .h file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529452 13f79535-47bb-0310-9956-ffa450edef68

11 years agoap_rputs() silently truncated size_t to int, resulting in 130+ warnings
Jeff Trawick [Sat, 5 Oct 2013 13:14:36 +0000 (13:14 +0000)]
ap_rputs() silently truncated size_t to int, resulting in 130+ warnings
when building httpd and a rich set of modules on Windows.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529449 13f79535-47bb-0310-9956-ffa450edef68

11 years agoUpdate.
Lucien Gentis [Sat, 5 Oct 2013 13:09:18 +0000 (13:09 +0000)]
Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529447 13f79535-47bb-0310-9956-ffa450edef68

11 years agoDisable event/eventopt if apr skiplist isn't available
Jeff Trawick [Sat, 5 Oct 2013 12:44:36 +0000 (12:44 +0000)]
Disable event/eventopt if apr skiplist isn't available

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529442 13f79535-47bb-0310-9956-ffa450edef68

11 years agoskiplist is gone
Jeff Trawick [Sat, 5 Oct 2013 12:11:58 +0000 (12:11 +0000)]
skiplist is gone

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529440 13f79535-47bb-0310-9956-ffa450edef68

11 years agoWebSocket support requires Winsock2
Gregg Lewis Smith [Fri, 4 Oct 2013 20:03:50 +0000 (20:03 +0000)]
WebSocket support requires Winsock2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529277 13f79535-47bb-0310-9956-ffa450edef68

11 years agocore: Add missing Reason-Phrase in HTTP response headers.
Rainer Jung [Thu, 3 Oct 2013 21:50:07 +0000 (21:50 +0000)]
core: Add missing Reason-Phrase in HTTP response headers.
PR 54946.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529014 13f79535-47bb-0310-9956-ffa450edef68

11 years agoRemove backported items from CHANGES.
Rainer Jung [Thu, 3 Oct 2013 19:00:03 +0000 (19:00 +0000)]
Remove backported items from CHANGES.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528972 13f79535-47bb-0310-9956-ffa450edef68

11 years agomod_dav: Fix PR 55306.
Ben Reser [Thu, 3 Oct 2013 05:29:35 +0000 (05:29 +0000)]
mod_dav: Fix PR 55306.

Makes mod_dav no longer require that the lock token be provided when the
source of a COPY is locked.  The prior behavior was in violating of
RFC 4918 which says that the lock token is only required on resources
that may be modified by the method.

* modules/dav/main/mod_dav.h
  (DAV_VALIDATE_NO_MODIFY): New flag to be passed to dav_validate_* functions.

* modules/dav/main/mod_dav.c
  (dav_method_copymove): Use the new flag when calling dav_validate_request()
    on the COPY source.

* modules/dav/main/util.c
  (dav_validate_resource_state): Use the flag to decide to ignore if the lock
    token is not provided.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528718 13f79535-47bb-0310-9956-ffa450edef68

11 years ago *) mod_rewrite: Make rewrite websocket aware to allow proxying.
Jim Jagielski [Wed, 2 Oct 2013 16:38:39 +0000 (16:38 +0000)]
  *) mod_rewrite: Make rewrite websocket aware to allow proxying.
     PR 55598. [Chris Harris <chris.harris kitware com>]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528556 13f79535-47bb-0310-9956-ffa450edef68

11 years agoskiplist is now in apr 1.5 and above
Jim Jagielski [Wed, 2 Oct 2013 12:12:36 +0000 (12:12 +0000)]
skiplist is now in apr 1.5 and above

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528437 13f79535-47bb-0310-9956-ffa450edef68

11 years agoadd attribution
Kaspar Brand [Tue, 1 Oct 2013 17:30:45 +0000 (17:30 +0000)]
add attribution

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528155 13f79535-47bb-0310-9956-ffa450edef68

11 years agoDon't use a hardcoded cn=* in case the subgroup has no CN.
Eric Covener [Tue, 1 Oct 2013 16:41:37 +0000 (16:41 +0000)]
Don't use a hardcoded cn=* in case the subgroup has no CN.

Submitted By: David Hawes <dhawes vt.edu>
Committed By: Eric Covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528143 13f79535-47bb-0310-9956-ffa450edef68

11 years agoin 2.4.x
Jim Jagielski [Tue, 1 Oct 2013 11:53:10 +0000 (11:53 +0000)]
in 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528054 13f79535-47bb-0310-9956-ffa450edef68

11 years ago* build/config_vars.sh.in: Trim more stuff from installed config_vars.mk.
Joe Orton [Tue, 1 Oct 2013 10:28:29 +0000 (10:28 +0000)]
* build/config_vars.sh.in: Trim more stuff from installed config_vars.mk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528035 13f79535-47bb-0310-9956-ffa450edef68

11 years agoDon't link support/* against systemd libs.
Joe Orton [Tue, 1 Oct 2013 10:25:02 +0000 (10:25 +0000)]
Don't link support/* against systemd libs.

* Makefile.in: Link httpd using $(HTTPD_LIBS).

* configure.in: Add systemd to HTTPD_LIBS rather than LIBS.  Add PCRE
  libs to HTTPD_LIBS.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528034 13f79535-47bb-0310-9956-ffa450edef68