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

List:       squid-cvs
Subject:    squid3-ipv6 squid3/src ftp.cc,1.26.2.24,1.26.2.25
From:       Amos Jeffries <amosjeffries () users ! sourceforge ! net>
Date:       2007-05-30 5:43:49
Message-ID: 20070530054353.57978.qmail () squid-cache ! org
[Download RAW message or body]

Update of cvs.devel.squid-cache.org:/cvsroot/squid/squid3/src

Modified Files:
      Tag: squid3-ipv6
	ftp.cc 
Log Message:
Modify some new code to use old String code.


Index: ftp.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ftp.cc,v
retrieving revision 1.26.2.24
retrieving revision 1.26.2.25
diff -C2 -d -r1.26.2.24 -r1.26.2.25
*** ftp.cc	30 May 2007 05:06:07 -0000	1.26.2.24
--- ftp.cc	30 May 2007 05:43:46 -0000	1.26.2.25
***************
*** 3375,3390 ****
  ftpUrlWith2f(HttpRequest * request)
  {
!     string newbuf = "%2f";
  
      if (request->protocol != PROTO_FTP)
          return NULL;
  
!     if( !strncmp(request->urlpath, "/", 1) ) {
          newbuf.append(request->urlpath);
          request->urlpath.absorb(newbuf);
          safe_free(request->canonical);
      }
!     else if( !strncmp(request->urlpath, "%2f", 3) ) {
!         newbuf.append(&request->urlpath[1]);
          request->urlpath.absorb(newbuf);
          safe_free(request->canonical);
--- 3375,3390 ----
  ftpUrlWith2f(HttpRequest * request)
  {
!     String newbuf = "%2f";
  
      if (request->protocol != PROTO_FTP)
          return NULL;
  
!     if( !strncmp(request->urlpath.buf(), "/", 1) ) {
          newbuf.append(request->urlpath);
          request->urlpath.absorb(newbuf);
          safe_free(request->canonical);
      }
!     else if( !strncmp(request->urlpath.buf(), "%2f", 3) ) {
!         newbuf.append(request->urlpath.buf() +1);
          request->urlpath.absorb(newbuf);
          safe_free(request->canonical);

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