fixes for crash on x86_64 and startup script problems
This commit is contained in:
parent
f858079bf3
commit
888f13ffa1
18
memcached-1.2.3-save_pid_fix.patch
Normal file
18
memcached-1.2.3-save_pid_fix.patch
Normal file
@ -0,0 +1,18 @@
|
||||
--- memcached-1.2.3/memcached.c.save_pid_fix 2007-08-06 07:12:55.000000000 -0700
|
||||
+++ memcached-1.2.3/memcached.c 2007-08-06 07:13:44.000000000 -0700
|
||||
@@ -2723,11 +2723,12 @@ int main (int argc, char **argv) {
|
||||
fprintf(stderr, "failed to create listening connection");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
- /* save the PID in if we're a daemon */
|
||||
- if (daemonize)
|
||||
- save_pid(getpid(), pid_file);
|
||||
/* start up worker threads if MT mode */
|
||||
thread_init(settings.num_threads, main_base);
|
||||
+ /* save the PID in if we're a daemon, do this after thread_init due to
|
||||
+ a file descriptor handling bug somewhere in libevent */
|
||||
+ if (daemonize)
|
||||
+ save_pid(getpid(), pid_file);
|
||||
/* initialise clock event */
|
||||
clock_handler(0, 0, 0);
|
||||
/* initialise deletion array and timer event */
|
@ -1,6 +1,6 @@
|
||||
Name: memcached
|
||||
Version: 1.2.3
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Summary: High Performance, Distributed Memory Object Cache
|
||||
|
||||
Group: System Environment/Daemons
|
||||
@ -100,6 +100,10 @@ exit 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 6 2007 Paul Lindner <lindner@inuus.com> - 1.2.3-5
|
||||
- Fix problem with -P and -d flag combo on x86_64
|
||||
- Fix init script for FC-6
|
||||
|
||||
* Fri Jul 13 2007 Paul Lindner <lindner@inuus.com> - 1.2.3-4
|
||||
- Remove test that fails in fedora build system on ppc64
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
# config: /etc/sysconfig/memcached
|
||||
|
||||
# Standard LSB functions
|
||||
. /lib/lsb/init-functions
|
||||
#. /lib/lsb/init-functions
|
||||
|
||||
# Source function library.
|
||||
. /etc/init.d/functions
|
||||
|
Loading…
Reference in New Issue
Block a user