new version 4.7.2

This commit is contained in:
Luboš Uhliarik 2016-05-19 12:09:20 +02:00
parent 3aaf5d6b9e
commit 2211996da1
4 changed files with 16 additions and 11 deletions

1
.gitignore vendored
View File

@ -40,3 +40,4 @@ lftp-4.0.10.tar.xz
/lftp-4.6.5.tar.xz
/lftp-4.7.0.tar.xz
/lftp-4.7.1.tar.xz
/lftp-4.7.2.tar.xz

View File

@ -1,7 +1,8 @@
diff -up lftp-4.2.1/src/Http.cc.date_fmt lftp-4.2.1/src/Http.cc
--- lftp-4.2.1/src/Http.cc.date_fmt 2011-03-25 15:35:42.000000000 +0100
+++ lftp-4.2.1/src/Http.cc 2011-03-30 14:40:54.170096624 +0200
@@ -29,6 +29,7 @@
diff --git a/src/Http.cc b/src/Http.cc
index 5364c94..0018670 100644
--- a/src/Http.cc
+++ b/src/Http.cc
@@ -26,6 +26,7 @@
#include <errno.h>
#include <stdarg.h>
#include <time.h>
@ -9,12 +10,12 @@ diff -up lftp-4.2.1/src/Http.cc.date_fmt lftp-4.2.1/src/Http.cc
#include <fnmatch.h>
#include <locale.h>
#include <assert.h>
@@ -565,15 +566,10 @@ void Http::SendRequest(const char *conne
@@ -744,15 +745,10 @@ void Http::SendRequest(const char *connection,const char *f)
(long long)((limit==FILE_END || limit>entity_size ? entity_size : limit)-1),
(long long)entity_size);
}
- if(entity_date!=NO_DATE)
+ if(entity_date!=NO_DATE && entity_date>0L && entity_date<INT_MAX)
+ if((entity_date!=NO_DATE) && (entity_date>0L && entity_date<INT_MAX))
{
- static const char weekday_names[][4]={
- "Sun","Mon","Tue","Wed","Thu","Fri","Sat"
@ -23,8 +24,8 @@ diff -up lftp-4.2.1/src/Http.cc.date_fmt lftp-4.2.1/src/Http.cc
- const char *d=xstring::format("%s, %2d %s %04d %02d:%02d:%02d GMT",
- weekday_names[t->tm_wday],t->tm_mday,month_names[t->tm_mon],
- t->tm_year+1900,t->tm_hour,t->tm_min,t->tm_sec);
+ char d[256];
+ strftime(d, sizeof(d), "%a, %d %b %H:%M:%S %Y GMT", gmtime(&entity_date));
+ char d[256];
+ strftime(d, sizeof(d), "%a, %d %b %H:%M:%S %Y GMT", gmtime(&entity_date));
Send("Last-Modified: %s\r\n",d);
Send("X-OC-MTime: %ld\r\n",(long)entity_date); // for OwnCloud
}
break;

View File

@ -1,6 +1,6 @@
Summary: A sophisticated file transfer program
Name: lftp
Version: 4.7.1
Version: 4.7.2
Release: 1%{?dist}
License: GPLv3+
Group: Applications/Internet
@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu May 19 2016 Luboš Uhliarik <luhliari@redhat.com> - 4.7.2-1
- new version 4.7.2
* Mon Apr 04 2016 Luboš Uhliarik <luhliari@redhat.com> - 4.7.1-1
- new version 4.7.1

View File

@ -1 +1 @@
7dfb03c6544efeef633bc28ba7df8b77 lftp-4.7.1.tar.xz
24b64dcd74426803eb1e9bf75a5a590a lftp-4.7.2.tar.xz