[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/rpmio/ rpmdav.c
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2008-06-19 15:36:16
Message-ID: 20080619153616.C7D8D34848A () rpm5 ! org
[Download RAW message or body]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   19-Jun-2008 17:36:16
  Branch: rpm-5_1                          Handle: 2008061915361600

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/rpmio               rpmdav.c

  Log:
    - jbj: http: ignore 501 from OPTIONS attempt to non-DAV server.

  Summary:
    Revision    Changes     Path
    1.2288.2.69 +1  -0      rpm/CHANGES
    2.71.2.1    +10 -0      rpm/rpmio/rpmdav.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.68 -r1.2288.2.69 CHANGES
  --- rpm/CHANGES	19 Jun 2008 15:32:21 -0000	1.2288.2.68
  +++ rpm/CHANGES	19 Jun 2008 15:36:16 -0000	1.2288.2.69
  @@ -1,4 +1,5 @@
   5.1.3 -> 5.1.4:
  +    - jbj: http: ignore 501 from OPTIONS attempt to non-DAV server.
       - jbj: fix: "%description -n foo-bar" needs an additional comparison.
       - jbj: add non-{GIF,XPM} formats opaquely using arbitrary Icon: tagno.
       - jbj: fix: allocate Icon: buffer after iconsize is initialized.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdav.c
  ============================================================================
  $ cvs diff -u -r2.71 -r2.71.2.1 rpmdav.c
  --- rpm/rpmio/rpmdav.c	19 Mar 2008 15:19:58 -0000	2.71
  +++ rpm/rpmio/rpmdav.c	19 Jun 2008 15:36:16 -0000	2.71.2.1
  @@ -559,6 +559,10 @@
       if (_dav_nooptions && u->allow & RPMURL_SERVER_OPTIONSDONE)
   	return 0;
   
  +    u->allow &= ~(RPMURL_SERVER_HASDAVCLASS1 |
  +		  RPMURL_SERVER_HASDAVCLASS2 |
  +		  RPMURL_SERVER_HASDAVEXEC);
  +
       /* HACK: where should server capabilities be read? */
       (void) urlPath(u->url, &path);
       /* HACK: perhaps capture Allow: tag, look for PUT permitted. */
  @@ -582,6 +586,12 @@
   	    u->allow &= ~RPMURL_SERVER_HASDAVEXEC;
       }	break;
       case NE_ERROR:
  +	/* HACK: "501 Not Implemented" if OPTIONS not permitted. */
  +	if (!strncmp("501 ", ne_get_error(u->sess), sizeof("501 ")-1)) {
  +	    u->allow |= RPMURL_SERVER_OPTIONSDONE;
  +	    rc = NE_OK;
  +	    break;
  +	}
   	/* HACK: "301 Moved Permanently" on empty subdir. */
   	if (!strncmp("301 ", ne_get_error(u->sess), sizeof("301 ")-1))
   	    break;
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]