idanoo/php-resque
1
0
Fork 0
mirror of https://github.com/idanoo/php-resque synced 2025-07-01 05:32:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'blocking-list-pop' of github.com:ruudk/php-resque into blocking-list-pop

Browse source 
Conflicts:
	bin/resque
	lib/Resque.php
	lib/Resque/Job.php
This commit is contained in:
Ruud Kamphuis 2013-05-29 09:31:53 +02:00
commit 2794dd54a9
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Resque.php
View file

@ -62,7 +62,7 @@ class Resque
self::$redis = new Resque_Redis($server, self::$redisDatabase);
return self::$redis;
}
/**
* fork() helper method for php-resque that handles issues PHP socket
* and phpredis have with passing around sockets between child/parent