Skip to content

Commit f9ea103

Browse files
committed
Remove mod_dav_lock, which was useful only to provide drop-in
locking for mod_dav_svn from Apache Subversion older than 1.2.0. mod_dav_svn from 1.2.0 onwards provides a locking mechanism. Remove mod_dav_lock from cmake and Windows build system: * CMakeLists.txt: Remove mod_dav_lock from MODULE_LIST, mod_dav_lock_extra_sources and mod_dav_lock_extra_libs. * Apache.dsw, Apache-apr2.dsw: Remove mod_dav_lock project and dependency entries. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Github: closes #646 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1934214 13f79535-47bb-0310-9956-ffa450edef68
1 parent b5ad35b commit f9ea103

14 files changed

Lines changed: 0 additions & 2145 deletions

Apache-apr2.dsw

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@ Package=<4>
186186
Project_Dep_Name mod_dav_fs
187187
End Project Dependency
188188
Begin Project Dependency
189-
Project_Dep_Name mod_dav_lock
190-
End Project Dependency
191-
Begin Project Dependency
192189
Project_Dep_Name mod_dir
193190
End Project Dependency
194191
Begin Project Dependency
@@ -1507,27 +1504,6 @@ Package=<4>
15071504

15081505
###############################################################################
15091506

1510-
Project: "mod_dav_lock"=.\modules\dav\lock\mod_dav_lock.dsp - Package Owner=<4>
1511-
1512-
Package=<5>
1513-
{{{
1514-
}}}
1515-
1516-
Package=<4>
1517-
{{{
1518-
Begin Project Dependency
1519-
Project_Dep_Name libapr
1520-
End Project Dependency
1521-
Begin Project Dependency
1522-
Project_Dep_Name libhttpd
1523-
End Project Dependency
1524-
Begin Project Dependency
1525-
Project_Dep_Name mod_dav
1526-
End Project Dependency
1527-
}}}
1528-
1529-
###############################################################################
1530-
15311507
Project: "mod_dbd"=.\modules\database\mod_dbd.dsp - Package Owner=<4>
15321508

15331509
Package=<5>

Apache.dsw

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,6 @@ Package=<4>
201201
Project_Dep_Name mod_dav_fs
202202
End Project Dependency
203203
Begin Project Dependency
204-
Project_Dep_Name mod_dav_lock
205-
End Project Dependency
206-
Begin Project Dependency
207204
Project_Dep_Name mod_dir
208205
End Project Dependency
209206
Begin Project Dependency
@@ -1792,30 +1789,6 @@ Package=<4>
17921789

17931790
###############################################################################
17941791

1795-
Project: "mod_dav_lock"=.\modules\dav\lock\mod_dav_lock.dsp - Package Owner=<4>
1796-
1797-
Package=<5>
1798-
{{{
1799-
}}}
1800-
1801-
Package=<4>
1802-
{{{
1803-
Begin Project Dependency
1804-
Project_Dep_Name libapr
1805-
End Project Dependency
1806-
Begin Project Dependency
1807-
Project_Dep_Name libaprutil
1808-
End Project Dependency
1809-
Begin Project Dependency
1810-
Project_Dep_Name libhttpd
1811-
End Project Dependency
1812-
Begin Project Dependency
1813-
Project_Dep_Name mod_dav
1814-
End Project Dependency
1815-
}}}
1816-
1817-
###############################################################################
1818-
18191792
Project: "mod_dbd"=.\modules\database\mod_dbd.dsp - Package Owner=<4>
18201793

18211794
Package=<5>

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ SET(MODULE_LIST
337337
"modules/core/mod_watchdog+I+Watchdog module"
338338
"modules/database/mod_dbd+I+Apache DBD Framework"
339339
"modules/dav/fs/mod_dav_fs+I+DAV provider for the filesystem."
340-
"modules/dav/lock/mod_dav_lock+I+DAV provider for generic locking"
341340
"modules/dav/main/mod_dav+I+WebDAV protocol handling."
342341
"modules/debugging/mod_bucketeer+O+buckets manipulation filter. Useful only for developers and testing purposes."
343342
"modules/debugging/mod_dumpio+I+I/O dump filter"
@@ -460,8 +459,6 @@ SET(mod_dav_fs_extra_sources
460459
modules/dav/fs/quota.c modules/dav/fs/repos.c
461460
)
462461
SET(mod_dav_fs_extra_libs mod_dav)
463-
SET(mod_dav_lock_extra_sources modules/dav/lock/locks.c)
464-
SET(mod_dav_lock_extra_libs mod_dav)
465462
SET(mod_dbd_extra_defines DBD_DECLARE_EXPORT)
466463
SET(mod_deflate_requires ZLIB_FOUND)
467464
IF(ZLIB_FOUND)

docs/manual/mod/mod_dav_lock.xml

Lines changed: 0 additions & 93 deletions
This file was deleted.

docs/manual/mod/mod_dav_lock.xml.fr

Lines changed: 0 additions & 107 deletions
This file was deleted.

docs/manual/mod/mod_dav_lock.xml.ja

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)