]> granicus.if.org Git - apache/log
apache
11 years agosubpool
Jim Jagielski [Tue, 18 Jun 2013 14:31:36 +0000 (14:31 +0000)]
subpool

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

11 years agomake opaque
Jim Jagielski [Tue, 18 Jun 2013 14:31:24 +0000 (14:31 +0000)]
make opaque

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

11 years agoUpdate transformations.
Rainer Jung [Mon, 17 Jun 2013 20:57:23 +0000 (20:57 +0000)]
Update transformations.

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

11 years agoCorrect the use of the printf formatter.
Graham Leggett [Mon, 17 Jun 2013 20:34:26 +0000 (20:34 +0000)]
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

11 years agomod_socache_shmcb.c: Remove arbitrary restriction on shared memory size
Graham Leggett [Mon, 17 Jun 2013 20:22:10 +0000 (20:22 +0000)]
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

11 years agoFold in Eric Covener's socket callback
Jim Jagielski [Mon, 17 Jun 2013 12:43:52 +0000 (12:43 +0000)]
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

11 years agoupdate auto-generated code
Stefan Fritsch [Sat, 15 Jun 2013 21:20:09 +0000 (21:20 +0000)]
update auto-generated code

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

11 years agoThe new bison version now also includes the uppercased builddir in a
Stefan Fritsch [Sat, 15 Jun 2013 21:19:04 +0000 (21:19 +0000)]
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

11 years agoDescribe mod_auth_digest changes more accurately
Stefan Fritsch [Sat, 15 Jun 2013 20:57:01 +0000 (20:57 +0000)]
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

11 years agoUpdate auto-generated source
Stefan Fritsch [Sat, 15 Jun 2013 20:49:40 +0000 (20:49 +0000)]
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

11 years agoProvide better token names for error messages
Stefan Fritsch [Sat, 15 Jun 2013 20:48:34 +0000 (20:48 +0000)]
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

11 years agoCorrect typo in error message
Christophe Jaillet [Sat, 15 Jun 2013 08:59:00 +0000 (08:59 +0000)]
Correct typo in error message

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

11 years agoMove initialization of the secret to the pre_config hook. Use
Stefan Fritsch [Fri, 14 Jun 2013 21:43:30 +0000 (21:43 +0000)]
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

11 years agoAdded new funtions to mod_lua docu.
Guenter Knauf [Thu, 13 Jun 2013 17:50:25 +0000 (17:50 +0000)]
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

11 years agobetter descript
Jim Jagielski [Thu, 13 Jun 2013 16:01:07 +0000 (16:01 +0000)]
better descript

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

11 years agoxforms
Jim Jagielski [Thu, 13 Jun 2013 15:49:56 +0000 (15:49 +0000)]
xforms

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

11 years agoAdd
Jim Jagielski [Thu, 13 Jun 2013 15:44:47 +0000 (15:44 +0000)]
Add

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

11 years agomod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
Graham Leggett [Thu, 13 Jun 2013 13:16:18 +0000 (13:16 +0000)]
mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
correctly.

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

11 years agoActually use the secret when generating nonces.
Stefan Fritsch [Wed, 12 Jun 2013 19:34:19 +0000 (19:34 +0000)]
Actually use the secret when generating nonces.

This change may cause problems if used with round robin load balancers.
Before it is backported, we should add a directive to use a user specified
secret.

PR: 54637

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

11 years agoupdate transformation
André Malo [Wed, 12 Jun 2013 13:58:19 +0000 (13:58 +0000)]
update transformation

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

11 years agoReduce stack usage by 3k
Christophe Jaillet [Tue, 11 Jun 2013 10:17:02 +0000 (10:17 +0000)]
Reduce stack usage by 3k

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

11 years agoAdded missing bump.
Guenter Knauf [Tue, 11 Jun 2013 07:50:11 +0000 (07:50 +0000)]
Added missing bump.

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

11 years agoAccording to comment in 'magic_rsl_add' and to the way 'magic_rsl_printf' manages...
Christophe Jaillet [Tue, 11 Jun 2013 07:41:40 +0000 (07:41 +0000)]
According to comment in 'magic_rsl_add' and to the way 'magic_rsl_printf' manages its buffer, I think that this memory should be apr_pstrdup'ed.

This has been like that forever, but seems broken to me.

Untested.

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

11 years agofix typo
Stefan Fritsch [Mon, 10 Jun 2013 21:31:35 +0000 (21:31 +0000)]
fix typo

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

11 years agoconst goodness with nasty strrchr and strchr functions
Jeff Trawick [Mon, 10 Jun 2013 18:43:45 +0000 (18:43 +0000)]
const goodness with nasty strrchr and strchr functions
(resolve warning in maintainer mode)

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

11 years agoReduce stack usage, 32 bytes are enough here, no need to
Rainer Jung [Mon, 10 Jun 2013 17:46:53 +0000 (17:46 +0000)]
Reduce stack usage, 32 bytes are enough here, no need to
take 8k in the stack. (19 would be enough, but be safe...)
Use the size of the buffer as opposed to MAX_STRING_LEN.

Followup to r1491221+r1491479: change consistently
the same code used in another place in the same file.

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

11 years agoUse the size of the buffer as opposed to MAX_STRING_LEN.
Graham Leggett [Mon, 10 Jun 2013 14:49:26 +0000 (14:49 +0000)]
Use the size of the buffer as opposed to MAX_STRING_LEN.

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

11 years agomod_cache_socache: Use the name of the socache implementation when performing
Graham Leggett [Mon, 10 Jun 2013 14:08:43 +0000 (14:08 +0000)]
mod_cache_socache: Use the name of the socache implementation when performing
a lookup rather than using the raw arguments.

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

11 years agoClose file in error path.
Christophe Jaillet [Sun, 9 Jun 2013 16:00:18 +0000 (16:00 +0000)]
Close file in error path.

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

11 years agoReduce stack usage, 32 bytes are enough here, no need to take 8k in the stack. (19...
Christophe Jaillet [Sun, 9 Jun 2013 13:52:17 +0000 (13:52 +0000)]
Reduce stack usage, 32 bytes are enough here, no need to take 8k in the stack. (19 would be enough, but be safe...)

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

11 years agodocument params
Stefan Fritsch [Sun, 9 Jun 2013 10:58:29 +0000 (10:58 +0000)]
document params

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

11 years agoAllow use of strtoul()
Stefan Fritsch [Sun, 9 Jun 2013 08:19:29 +0000 (08:19 +0000)]
Allow use of strtoul()

It conforms to C89 and we don't support older compilers than that.

PR: 55077

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

11 years agoUpdate.
Lucien Gentis [Sat, 8 Jun 2013 15:37:02 +0000 (15:37 +0000)]
Update.

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

11 years agoNULL terminate the right buffer
Christophe Jaillet [Sat, 8 Jun 2013 14:58:53 +0000 (14:58 +0000)]
NULL terminate the right buffer

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

11 years agoTypo
Rich Bowen [Fri, 7 Jun 2013 18:20:38 +0000 (18:20 +0000)]
Typo

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

11 years agoTypo, as per comment on doc.
Rich Bowen [Fri, 7 Jun 2013 18:19:04 +0000 (18:19 +0000)]
Typo, as per comment on doc.

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

11 years agodon't truncate the very first file opened (unless the truncate flag is there too)
Eric Covener [Fri, 7 Jun 2013 18:12:17 +0000 (18:12 +0000)]
don't truncate the very first file opened (unless the truncate flag is there too)

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

11 years agoMinor typo fix
Daniel Gruno [Fri, 7 Jun 2013 13:34:20 +0000 (13:34 +0000)]
Minor typo fix

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

11 years agospeling, pointed out by sluggr on freenode.
Eric Covener [Fri, 7 Jun 2013 13:19:35 +0000 (13:19 +0000)]
speling, pointed out by sluggr on freenode.

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

11 years agoFixed signed<->unsigned compiler warning.
Guenter Knauf [Fri, 7 Jun 2013 09:04:32 +0000 (09:04 +0000)]
Fixed signed<->unsigned compiler warning.

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

11 years agoReturn with error if we dont support an algorithm.
Guenter Knauf [Fri, 7 Jun 2013 08:08:55 +0000 (08:08 +0000)]
Return with error if we dont support an algorithm.
Modified error message slightly.

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

11 years agoFix commit 1465115.
Christophe Jaillet [Fri, 7 Jun 2013 04:41:45 +0000 (04:41 +0000)]
Fix commit 1465115.
truncpw was allocated from a pool and not via malloc

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

11 years agorotatelogs: add -n number-of-files option to roate through a number
Eric Covener [Fri, 7 Jun 2013 01:51:31 +0000 (01:51 +0000)]
rotatelogs: add -n number-of-files option to roate through a number
of fixed-name logfiles.

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

11 years agoPR55069 include line number in 'AH00113: cannot use a full URL in a 401 ErrorDocument'
Eric Covener [Thu, 6 Jun 2013 21:18:23 +0000 (21:18 +0000)]
PR55069 include line number in 'AH00113: cannot use a full URL in a 401 ErrorDocument'

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

11 years agoAdding ApacheHaus. Reorder alpha so that we don't appear to be endorsing
Rich Bowen [Thu, 6 Jun 2013 20:17:26 +0000 (20:17 +0000)]
Adding ApacheHaus. Reorder alpha so that we don't appear to be endorsing
one over the others.

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

11 years agoForgot to mention Apache Lounge.
Rich Bowen [Thu, 6 Jun 2013 20:12:40 +0000 (20:12 +0000)]
Forgot to mention Apache Lounge.

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

11 years agoVarious other rebuilds.
Rich Bowen [Thu, 6 Jun 2013 20:09:18 +0000 (20:09 +0000)]
Various other rebuilds.

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

11 years agoRebuild
Rich Bowen [Thu, 6 Jun 2013 20:05:27 +0000 (20:05 +0000)]
Rebuild

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

11 years agoAdds links to wamp, xampp, to answer frequent complaint that we don't
Rich Bowen [Thu, 6 Jun 2013 20:05:14 +0000 (20:05 +0000)]
Adds links to wamp, xampp, to answer frequent complaint that we don't
tell people where to obtain httpd for MSWin

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

11 years agoNote that the function will be available in APR.
Graham Leggett [Thu, 6 Jun 2013 14:11:04 +0000 (14:11 +0000)]
Note that the function will be available in APR.

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

11 years agoNote the given functions will be available in APR.
Graham Leggett [Thu, 6 Jun 2013 14:06:22 +0000 (14:06 +0000)]
Note the given functions will be available in APR.

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

11 years ago* truncpw was allocated from a pool and not via malloc
Ruediger Pluem [Thu, 6 Jun 2013 14:03:28 +0000 (14:03 +0000)]
* truncpw was allocated from a pool and not via malloc

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

11 years agobump
Eric Covener [Thu, 6 Jun 2013 01:04:26 +0000 (01:04 +0000)]
bump

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

11 years agotolerate LuaMapHandler scripts that don't return anything
Eric Covener [Thu, 6 Jun 2013 01:04:17 +0000 (01:04 +0000)]
tolerate LuaMapHandler scripts that don't return anything

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

11 years agoxforms
Eric Covener [Thu, 6 Jun 2013 00:46:53 +0000 (00:46 +0000)]
xforms

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

11 years agomake the example a bit more instructive about the nuances
Eric Covener [Thu, 6 Jun 2013 00:46:17 +0000 (00:46 +0000)]
make the example a bit more instructive about the nuances
of returning OK w/ r.status set vs. returning a HTTP error code.

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

11 years agoxform
Eric Covener [Thu, 6 Jun 2013 00:39:23 +0000 (00:39 +0000)]
xform

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

11 years agoadd proper return values to example.
Eric Covener [Thu, 6 Jun 2013 00:38:32 +0000 (00:38 +0000)]
add proper return values to example.

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

11 years agoFollow-up to r1488773 for configure builds.
Guenter Knauf [Tue, 4 Jun 2013 12:27:24 +0000 (12:27 +0000)]
Follow-up to r1488773 for configure builds.

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

11 years agoAdded new function r.date_parse_rfc() to mod_lua.
Guenter Knauf [Tue, 4 Jun 2013 12:12:14 +0000 (12:12 +0000)]
Added new function r.date_parse_rfc() to mod_lua.

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

11 years agoFixed crash condition when r.module_info() is called
Guenter Knauf [Mon, 3 Jun 2013 22:05:07 +0000 (22:05 +0000)]
Fixed crash condition when r.module_info() is called
for modules which dont have directives.
Bug found and fix submitted by gsmith, slightly modified by fuankg.

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

11 years agoAdded new functions r:mkdir(), r:mkrdir(), r:rmdir() to mod_lua.
Guenter Knauf [Mon, 3 Jun 2013 13:02:46 +0000 (13:02 +0000)]
Added new functions r:mkdir(), r:mkrdir(), r:rmdir() to mod_lua.

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

11 years agoAdded new function r:htpassword() to mod_lua.
Guenter Knauf [Sun, 2 Jun 2013 19:31:16 +0000 (19:31 +0000)]
Added new function r:htpassword() to mod_lua.

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

11 years agoAdd a new -l parameter in order not to check the length of the responses. This can...
Christophe Jaillet [Sun, 2 Jun 2013 06:30:03 +0000 (06:30 +0000)]
Add a new -l parameter in order not to check the length of the responses. This can be usefull with dynamic pages.
PR9945, PR27888, PR42040

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

11 years agoUpdate.
Lucien Gentis [Sat, 1 Jun 2013 13:01:06 +0000 (13:01 +0000)]
Update.

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

11 years agoAdded header protection.
Guenter Knauf [Sat, 1 Jun 2013 08:52:35 +0000 (08:52 +0000)]
Added header protection.

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

11 years agoCheck if malloc succeeded
Christophe Jaillet [Sat, 1 Jun 2013 08:43:12 +0000 (08:43 +0000)]
Check if malloc succeeded
PR54344 [Bill Parker, wp02855 gmail com]

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

11 years agoAdded optional parameter wanted to r:stat().
Guenter Knauf [Sat, 1 Jun 2013 07:47:29 +0000 (07:47 +0000)]
Added optional parameter wanted to r:stat().

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

11 years ago3rd patch from PR45355
Christophe Jaillet [Sat, 1 Jun 2013 06:03:32 +0000 (06:03 +0000)]
3rd patch from PR45355

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

11 years ago* modules/ssl/ssl_util_ocsp.c (read_response): Ignore empty buckets in
Joe Orton [Fri, 31 May 2013 16:17:36 +0000 (16:17 +0000)]
* modules/ssl/ssl_util_ocsp.c (read_response): Ignore empty buckets in
  the brigade, which can be left over from line splitting.  Fixes case
  where the OCSP response was only partially read from the wire.

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

11 years agomod_session_dbd: Update the sql query for sessions updates.
Graham Leggett [Fri, 31 May 2013 11:21:14 +0000 (11:21 +0000)]
mod_session_dbd: Update the sql query for sessions updates.

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

11 years agoCVE-2013-2249
Graham Leggett [Fri, 31 May 2013 11:13:25 +0000 (11:13 +0000)]
CVE-2013-2249

mod_session_dbd: Make sure that dirty flag is respected when saving
sessions, and ensure the session ID is changed each time the session
changes.

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

11 years agocosmetics.
Guenter Knauf [Fri, 31 May 2013 07:05:03 +0000 (07:05 +0000)]
cosmetics.

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

11 years agoRemove unneeded exports from mod_lua - part 2.
Guenter Knauf [Fri, 31 May 2013 07:03:15 +0000 (07:03 +0000)]
Remove unneeded exports from mod_lua - part 2.

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

11 years agoAdd missing LoadModule line for mod_auth_form
Gregg Lewis Smith [Thu, 30 May 2013 21:38:06 +0000 (21:38 +0000)]
Add missing LoadModule line for mod_auth_form

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

11 years agoRemove unneeded exports from mod_lua.
Guenter Knauf [Thu, 30 May 2013 18:28:24 +0000 (18:28 +0000)]
Remove unneeded exports from mod_lua.

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

11 years agoRemove unnecessary global declarations of optional function
Joe Orton [Thu, 30 May 2013 07:23:52 +0000 (07:23 +0000)]
Remove unnecessary global declarations of optional function
implementations:

* modules/ssl/mod_ssl.c (ssl_proxy_enable, ssl_engine_disable): Mark
  static.

* modules/ssl/ssl_private.h (ssl_proxy_enable, ssl_engine_disable):
  Remove declarations.

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

11 years agomod_ssl: Redesign NPN (Next Protocol Negotiation) API to avoid use of
Joe Orton [Thu, 30 May 2013 07:19:07 +0000 (07:19 +0000)]
mod_ssl: Redesign NPN (Next Protocol Negotiation) API to avoid use of
hooks API and inter-module hard linkage:

* modules/ssl/mod_ssl.h: Remove NPN hooks, add "modssl_register_npn"
  optional function and callback function type declarations for
  ssl_npn_advertise_protos, ssl_npn_proto_negotiated.

* modules/ssl/mod_ssl.c: Drop hooks.
  (modssl_register_npn): New optional function implementation.
  (ssl_register_hooks): Register it.

* modules/ssl/ssl_private.h (SSLConnRec): Add npn_advertfns,
  npn_negofns array fields.

* modules/ssl/ssl_engine_kernel.c (ssl_callback_AdvertiseNextProtos):
  Replace use of hook API with array iteration.

* modules/ssl/ssl_engine_io.c (ssl_io_filter_input): Likewise.

Reviewed by: Matthew Steele <mdsteele google.com>

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

11 years agoProvide proper module extension.
Guenter Knauf [Thu, 30 May 2013 06:58:19 +0000 (06:58 +0000)]
Provide proper module extension.

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

11 years agoRemoved non-existent funcions from header.
Guenter Knauf [Thu, 30 May 2013 02:43:03 +0000 (02:43 +0000)]
Removed non-existent funcions from header.

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

11 years agoRemoved non-existent funcion from header.
Guenter Knauf [Thu, 30 May 2013 02:03:09 +0000 (02:03 +0000)]
Removed non-existent funcion from header.

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

11 years ago* modules/filters/mod_ratelimit.c (rate_limit_filter): Log the error
Joe Orton [Wed, 29 May 2013 16:12:10 +0000 (16:12 +0000)]
* modules/filters/mod_ratelimit.c (rate_limit_filter): Log the error
  code.

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

11 years ago* server/protocol.c (r_flush): Use int return type as per declaration
Joe Orton [Wed, 29 May 2013 16:09:24 +0000 (16:09 +0000)]
* server/protocol.c (r_flush): Use int return type as per declaration
  of apr_vformatter(); no functional change.

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

11 years ago'make docs' xforms
Jeff Trawick [Wed, 29 May 2013 12:27:34 +0000 (12:27 +0000)]
'make docs' xforms

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

11 years agos/proxy image/proxy/
Jeff Trawick [Wed, 29 May 2013 12:26:17 +0000 (12:26 +0000)]
s/proxy image/proxy/

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

11 years agoUse proper type to kill compiler warning.
Guenter Knauf [Mon, 27 May 2013 08:26:33 +0000 (08:26 +0000)]
Use proper type to kill compiler warning.

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

11 years agoInform MSVC compiler there is a Lexical target so the compiler is
Gregg Lewis Smith [Sun, 26 May 2013 23:23:14 +0000 (23:23 +0000)]
Inform MSVC compiler there is a Lexical target so the compiler is
not confused which causes it to absorb some properties of the Lexical
target into the Debug target.

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

11 years agolink to win_compiling from Install doc.
Eric Covener [Sun, 26 May 2013 18:49:32 +0000 (18:49 +0000)]
link to win_compiling from Install doc.

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

11 years agoWhoops - one empty line too much.
Guenter Knauf [Sat, 25 May 2013 01:14:45 +0000 (01:14 +0000)]
Whoops - one empty line too much.

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

11 years agoRemoved a bunch of empty lines.
Guenter Knauf [Sat, 25 May 2013 00:59:12 +0000 (00:59 +0000)]
Removed a bunch of empty lines.

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

11 years agoChanged r.sleep(s) to r.usleep(ms).
Guenter Knauf [Sat, 25 May 2013 00:56:22 +0000 (00:56 +0000)]
Changed r.sleep(s) to r.usleep(ms).

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

11 years agoClarify the existing behavior.
Graham Leggett [Fri, 24 May 2013 12:02:28 +0000 (12:02 +0000)]
Clarify the existing behavior.

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

11 years agoReverting as per veto in http://svn.apache.org/r1486021.
Graham Leggett [Fri, 24 May 2013 11:59:51 +0000 (11:59 +0000)]
Reverting as per veto in http://svn.apache.org/r1486021.

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

11 years agoEnsure that any meta buckets are stripped while parsing a chunk.
Graham Leggett [Thu, 23 May 2013 16:31:01 +0000 (16:31 +0000)]
Ensure that any meta buckets are stripped while parsing a chunk.

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

11 years agoCVE-2013-1896
Graham Leggett [Thu, 23 May 2013 12:52:06 +0000 (12:52 +0000)]
CVE-2013-1896

mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn with
the source href (sent as part of the request body as XML) pointing to a
URI that is not configured for DAV will trigger a segfault.

Submitted by: Ben Reser <ben reser.org>

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

11 years agoBe more clever when allocating memory for log item to be escaped.
Christophe Jaillet [Wed, 22 May 2013 20:38:35 +0000 (20:38 +0000)]
Be more clever when allocating memory for log item to be escaped.
This should be faster and save about 70-100 bytes in the request pool with the default config.

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

11 years agoRevert change in order to apply a better solution.
Christophe Jaillet [Wed, 22 May 2013 19:45:23 +0000 (19:45 +0000)]
Revert change in order to apply a better solution.

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

11 years agoRemoved obsolete define (already exists in mod_lua.h).
Guenter Knauf [Wed, 22 May 2013 17:19:47 +0000 (17:19 +0000)]
Removed obsolete define (already exists in mod_lua.h).

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

11 years agoRemoved obsolete header include.
Guenter Knauf [Wed, 22 May 2013 17:18:20 +0000 (17:18 +0000)]
Removed obsolete header include.

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

11 years agocore: Use a matching counter type.
Graham Leggett [Wed, 22 May 2013 16:11:23 +0000 (16:11 +0000)]
core: Use a matching counter type.

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