1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

86 Commits

Author SHA1 Message Date
Jim Jagielski
b8574b7140 These are more than debug errors...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1621373 13f79535-47bb-0310-9956-ffa450edef68
2014-08-29 19:42:54 +00:00
Jeff Trawick
1598eac14e follow-up to r1562472, 1561262, and 1561923:
Improve messaging...

* easier to tell what went wrong in some cases
* reduce number of debug messages without losing information in some cases


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1574151 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 17:45:36 +00:00
Jim Jagielski
0027e12f44 More debugging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1562472 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 15:10:08 +00:00
Eric Covener
8308f88d58 c89 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561923 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 01:49:21 +00:00
Jim Jagielski
075465f7e7 Remove wonky and unneeded code. We have access
cross forks, so child processes have access.

When we need true external access, this is something
that APR shm must provide. We should have no
knowledge of APR internals.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561385 13f79535-47bb-0310-9956-ffa450edef68
2014-01-25 20:11:50 +00:00
Jim Jagielski
b6bc90c796 More debug messaging... useful for tracking down
if we used attach or create

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561262 13f79535-47bb-0310-9956-ffa450edef68
2014-01-25 06:06:54 +00:00
Jim Jagielski
7f11f97354 not needed any longer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561242 13f79535-47bb-0310-9956-ffa450edef68
2014-01-25 01:14:58 +00:00
Jim Jagielski
315cd74509 Revert to assuming APR uses ftok(..,1)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561211 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 22:10:12 +00:00
Jim Jagielski
b98527874d Avoid APR check.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561200 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 21:40:35 +00:00
Jim Jagielski
ec1e7e9ca0 Handle the gugz fix in APR 1.5.1 regarding duplicate
keys.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542732 13f79535-47bb-0310-9956-ffa450edef68
2013-11-17 14:22:58 +00:00
Jeff Trawick
a26a8b2c68 Follow-up to r1540161:
The last arg to apr_file_write_full() isn't needed
unless you need to know the number of bytes written before
an error occurred.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542413 13f79535-47bb-0310-9956-ffa450edef68
2013-11-15 21:52:58 +00:00
Jim Jagielski
7a0c59f66f Avoid the confusion... the digests are NOT strings.
Add some debug logging

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540220 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 23:42:50 +00:00
Jim Jagielski
51875adb6d If apr_file_read did return APR_EOF, then ensure that,
as long as we read the right number of bytes, we
return APR_SUCCESS

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540179 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 20:51:44 +00:00
Jim Jagielski
33ea79e4d7 Allow for backwards compatibility for the md5 check...
if we've read the slotmem data and we are at EOF, then
don't bother checking the md5 and assume all is OK.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540178 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 20:48:16 +00:00
Jim Jagielski
39591a08aa whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540163 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 19:41:34 +00:00
Jim Jagielski
48c9ad298d Error detection and a quick validity check when restoring...
Designed to address errors, not nefarious changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540161 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 19:38:20 +00:00
Jim Jagielski
beb2c2eef5 Ensure that the file-based shm file is removed...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540051 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 14:30:08 +00:00
Stefan Fritsch
2ed057894d fix valgrind warnings about uninitialized memory in syscall arguments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1442309 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 19:37:18 +00:00
Jim Jagielski
fdce7c3307 Fix mistaken reset of num_free with restored shm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1430869 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 14:14:42 +00:00
Gregg Lewis Smith
d559055384 Fix various clone/edit and search/replace errors
in MSVC project files



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420975 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 21:14:57 +00:00
Stefan Fritsch
146f57021f Replace duplicate log tags
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406068 13f79535-47bb-0310-9956-ffa450edef68
2012-11-06 08:25:56 +00:00
Jeff Trawick
dcc65915d8 axe unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1388445 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 11:53:22 +00:00
Guenter Knauf
0ffd5543af Whoups?!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387389 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 22:03:11 +00:00
Jim Jagielski
bbc1e878f5 Add in new type CLEARINUSE which allows the inuse table to
be cleared upon storage. This may be expected/wanted/required
by some applications


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387088 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 10:59:20 +00:00
Jim Jagielski
9026f9fac0 Use our private function and just allow for conditonal
concat of .persist suffix


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387085 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 10:42:54 +00:00
Jim Jagielski
6e77cfce51 Allow for a forced grab of a slotmem slot.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1386880 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 22:26:28 +00:00
Jim Jagielski
95a7b9f48a More consistent return errors...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1386822 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 20:38:59 +00:00
Jim Jagielski
f217b5997a Add debug output when slotmem is persisting shm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1386726 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 17:19:44 +00:00
Guenter Knauf
7814748ab3 NetWare build tweaks.
Make more use of internal makefile macros;
axed now obsolete include paths.
Submitted by: normw gknw net.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1371177 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 12:11:09 +00:00
Jeff Trawick
f375bea5b1 mod_slotmem_plain: make the "filename" key relative to
DefaultRuntimeDir if not absolute

mod_slotmem_plain does not externalize or check the full path
in any way, so this change is just for consistency with other
modules which build paths to run-time artifacts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1370763 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 13:45:57 +00:00
Stefan Fritsch
342a51c691 fixup for r1331110: pass correct argument
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331113 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 21:50:34 +00:00
Stefan Fritsch
fe4f92509b Replace use of apr_file_write() with apr_file_write_full() to prevent
incomplete writes.

Add comments in some places where error handling/logging is missing.

PR: 53131.
Submitted by: Nicolas Viennot <apache viennot biz>, Stefan Fritsch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 21:44:51 +00:00
Jim Jagielski
e7fdd879a7 Use new ap_runtime_dir_relative() API
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1298433 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 15:40:42 +00:00
Jim Jagielski
04ed74941a Allow for DEFAULT_REL_RUNTIMEDIR ala socache... prevent perm issues
with some configs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297560 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 16:20:17 +00:00
Stefan Fritsch
277ee6b6fc Add a bit of debug logging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1226375 13f79535-47bb-0310-9956-ffa450edef68
2012-01-02 09:00:55 +00:00
Stefan Fritsch
408b6818e6 Remove unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211637 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 21:13:57 +00:00
Graham Leggett
9b380c98b0 mod_slotmem_shm: Remove the colon syntax to indicate a relative path, and
make the relative path default behaviour. Remove the word "anonymous" as
a filename for special treatment, what used to be "anonymous" is now "none".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210261 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 22:28:40 +00:00
Stefan Fritsch
6f6ecbeae7 Change the provider names to match the module names:
mod_slotmem_shm: shared -> shm
mod_socache_memcache: mc -> memcache


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210221 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 21:03:34 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
Jeff Trawick
7eb1caed9a fix def'n of AP_SLOTMEM_PROVIDER_VERSION, use it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146737 13f79535-47bb-0310-9956-ffa450edef68
2011-07-14 14:47:59 +00:00
Stefan Fritsch
32d9e326ef adjustments of build priorities of modules without special dependencies
all -> most:
- mod_sed

reallyall -> most:
- mod_log_debug

reallyall -> all:
- mod_dav_lock
- mod_echo
- mod_charset_lite
- mod_slotmem_plain
- mod_dialup

few -> all:
- mod_data
- mod_reflector
- mod_asis

most -> all:
- mod_heartbeat
- mod_heartmonitor
- mod_watchdog

most -> reallyall:
- mod_imagemap
- mod_cern_meta
- mod_ident

See thread at
http://mail-archives.apache.org/mod_mbox/httpd-dev/201107.mbox/%3C201107052321.56063.sf@sfritsch.de%3E


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146227 13f79535-47bb-0310-9956-ffa450edef68
2011-07-13 18:59:28 +00:00
Jim Jagielski
15bce255d4 No mo subpool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1136947 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 17:15:57 +00:00
Jim Jagielski
24cce63536 More cleanups at cleanup... move to using pconf and then remove
any file-based shms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087862 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 19:25:19 +00:00
Jim Jagielski
c24001681a wrong stash
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087677 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 12:15:49 +00:00
Jim Jagielski
6967cb6930 Don't kill me mister...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087333 13f79535-47bb-0310-9956-ffa450edef68
2011-03-31 15:12:13 +00:00
Guenter Knauf
888ec80125 Use a var INSTALLBASE to simplify NetWare installation rules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 04:56:06 +00:00
Guenter Knauf
bab978c56e Use var for prelude so its possible to change it at one place.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082811 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 03:09:27 +00:00
Guenter Knauf
e8a8becc0f NetWare build overhaul in order to compile on Linux.
Removed absolute paths to imp files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079487 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 18:59:02 +00:00
Guenter Knauf
46b7e1d210 NetWare build overhaul in order to compile on Linux.
Take 1.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079407 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 16:04:40 +00:00
Stefan Fritsch
385da96d50 Use ap_state_query() to fix many modules that were not correctly initializing
if they were not active during server startup but got enabled later during a
graceful restart (in which case they need to do all work during a single
config run).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070153 13f79535-47bb-0310-9956-ffa450edef68
2011-02-12 21:23:56 +00:00