projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
43c1b0f
)
Small fix to above
author
Art Cancro
<ajc@uncensored.citadel.org>
Thu, 3 Nov 2011 02:40:51 +0000
(22:40 -0400)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Mon, 5 Dec 2011 21:52:10 +0000
(22:52 +0100)
webcit/dav_main.c
patch
|
blob
|
history
diff --git
a/webcit/dav_main.c
b/webcit/dav_main.c
index d86c81034d1f76be662a01bcae98f1d2f4bf6756..97fcc9dc11f7423fbedeae9ebae9db5de8949a72 100644
(file)
--- a/
webcit/dav_main.c
+++ b/
webcit/dav_main.c
@@
-194,7
+194,7
@@
void groupdav_identify_host(void) {
}
}
-void tmplput_dav
.h
OSTNAME(StrBuf *Target, WCTemplputParams *TP)
+void tmplput_dav
_H
OSTNAME(StrBuf *Target, WCTemplputParams *TP)
{
StrBufAppendPrintf(Target, "%s", ChrPtr(site_prefix));
}
{
StrBufAppendPrintf(Target, "%s", ChrPtr(site_prefix));
}
@@
-335,11
+335,7
@@
InitModule_GROUPDAV
groupdav_main, GroupdavDispatchREST,
XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
groupdav_main, GroupdavDispatchREST,
XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
-<<<<<<< HEAD:webcit/dav_main.c
- RegisterNamespace("DAV:HOSTNAME", 0, 0, tmplput_groupdav_HOSTNAME, NULL, CTX_NONE);
-=======
- RegisterNamespace("DAV:HOSTNAME", 0, 0, tmplput_dav.hOSTNAME, NULL, CTX_NONE);
->>>>>>> c380e59... Renamed 'groupdav' to 'dav' in filenames:webcit/dav_main.c
+ RegisterNamespace("DAV:HOSTNAME", 0, 0, tmplput_davHOSTNAME, NULL, CTX_NONE);
RegisterConditional(HKEY("COND:DAV:NS"), 0, Conditional_DAV_NS, CTX_NONE);
RegisterConditional(HKEY("COND:DAV:NS"), 0, Conditional_DAV_NS, CTX_NONE);