pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adapt to libserverframe 1.2.5

master V6.12.2
YuQing 2024-09-17 11:50:06 +08:00
parent f1650d9b45
commit fe647b81c2
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,4 +1,7 @@
Version 6.12.2 2024-09-16
* use libfastcommon V1.75 and libserverframe 1.2.5
Version 6.12.1 2024-03-06 Version 6.12.1 2024-03-06
* adapt to libserverframe 1.2.3 * adapt to libserverframe 1.2.3
* bugfixed: notify_leader_changed support IPv6 correctly * bugfixed: notify_leader_changed support IPv6 correctly

6
INSTALL
View File

@ -11,7 +11,7 @@ Chinese language: http://www.fastken.com/
# command lines as: # command lines as:
git clone https://github.com/happyfish100/libfastcommon.git git clone https://github.com/happyfish100/libfastcommon.git
cd libfastcommon; git checkout V1.0.73 cd libfastcommon; git checkout V1.0.75
./make.sh clean && ./make.sh && ./make.sh install ./make.sh clean && ./make.sh && ./make.sh install
@ -21,7 +21,7 @@ Chinese language: http://www.fastken.com/
# command lines as: # command lines as:
git clone https://github.com/happyfish100/libserverframe.git git clone https://github.com/happyfish100/libserverframe.git
cd libserverframe; git checkout V1.2.3 cd libserverframe; git checkout V1.2.5
./make.sh clean && ./make.sh && ./make.sh install ./make.sh clean && ./make.sh && ./make.sh install
# step 3. download fastdfs source codes and install it, # step 3. download fastdfs source codes and install it,
@ -30,7 +30,7 @@ Chinese language: http://www.fastken.com/
# command lines as: # command lines as:
git clone https://github.com/happyfish100/fastdfs.git git clone https://github.com/happyfish100/fastdfs.git
cd fastdfs; git checkout V6.12.1 cd fastdfs; git checkout V6.12.2
./make.sh clean && ./make.sh && ./make.sh install ./make.sh clean && ./make.sh && ./make.sh install

2
common/fdfs_global.c
View File

@ -20,7 +20,7 @@
#include "fastcommon/logger.h" #include "fastcommon/logger.h"
#include "fdfs_global.h" #include "fdfs_global.h"
Version g_fdfs_version = {6, 12, 1}; Version g_fdfs_version = {6, 12, 2};
bool g_use_connection_pool = false; bool g_use_connection_pool = false;
ConnectionPool g_connection_pool; ConnectionPool g_connection_pool;
int g_connection_pool_max_idle_time = 3600; int g_connection_pool_max_idle_time = 3600;

8
fastdfs.spec
View File

@ -7,7 +7,7 @@
%define CommitVersion %(echo $COMMIT_VERSION) %define CommitVersion %(echo $COMMIT_VERSION)
Name: %{FastDFS} Name: %{FastDFS}
Version: 6.12.1 Version: 6.12.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: FastDFS server and client Summary: FastDFS server and client
License: GPL License: GPL
@ -16,7 +16,7 @@ URL: https://github.com/happyfish100/fastdfs/
Source: https://github.com/happyfish100/fastdfs/%{name}-%{version}.tar.gz Source: https://github.com/happyfish100/fastdfs/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libserverframe-devel >= 1.2.3 BuildRequires: libserverframe-devel >= 1.2.5
Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
Requires: %{FDFSServer} = %{version}-%{release} Requires: %{FDFSServer} = %{version}-%{release}
Requires: %{FDFSTool} = %{version}-%{release} Requires: %{FDFSTool} = %{version}-%{release}
@ -26,7 +26,7 @@ This package provides tracker & storage of fastdfs
commit version: %{CommitVersion} commit version: %{CommitVersion}
%package -n %{FDFSServer} %package -n %{FDFSServer}
Requires: libserverframe >= 1.2.3 Requires: libserverframe >= 1.2.5
Requires: %{FDFSConfig} Requires: %{FDFSConfig}
Summary: fastdfs tracker & storage Summary: fastdfs tracker & storage
@ -35,7 +35,7 @@ Requires: %{FDFSClient}
Summary: fastdfs tools Summary: fastdfs tools
%package -n %{FDFSClient} %package -n %{FDFSClient}
Requires: libserverframe >= 1.2.3 Requires: libserverframe >= 1.2.5
Requires: %{FDFSConfig} Requires: %{FDFSConfig}
Summary: The client dynamic library of fastdfs Summary: The client dynamic library of fastdfs