RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 12-Jul-2008 15:52:48
Branch: HEAD Handle: 2008071213524800
Modified files:
rpm/rpmio rpmdav.c
Log:
- jbj: rpmdav: parse html iff directory container.
Summary:
Revision Changes Path
2.83 +5 -5 rpm/rpmio/rpmdav.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.c
============================================================================
$ cvs diff -u -r2.82 -r2.83 rpmdav.c
--- rpm/rpmio/rpmdav.c 11 Jul 2008 22:06:38 -0000 2.82
+++ rpm/rpmio/rpmdav.c 12 Jul 2008 13:52:48 -0000 2.83
@@ -1488,18 +1488,18 @@
* followed by GET through htmlNLST() to find the contained href's.
*/
if (u->allow & RPMURL_SERVER_HASDAV)
- rc = davFetch(u, ctx); /* use PROPFIND to get contentLength */
+ rc = davFetch(u, ctx); /* use PROPFIND to get contentLength */
else {
/[EMAIL PROTECTED]@*/ /* XXX annotate ctx->st correctly */
- rc = davHEAD(u, ctx->st); /* use HEAD to get contentLength */
+ rc = davHEAD(u, ctx->st); /* use HEAD to get contentLength */
/[EMAIL PROTECTED]@*/
+ /* Parse directory elements. */
+ if (rc == NE_OK && S_ISDIR(ctx->st->st_mode))
+ rc = htmlNLST(u, ctx);
}
switch (rc) {
case NE_OK:
- if (!(u->allow & RPMURL_SERVER_HASDAV)) {
- rc = htmlNLST(u, ctx);
- }
break;
case NE_ERROR:
/* HACK: "405 Method Not Allowed" for PROPFIND on non-DAV servers. */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
