--- libphp-predis-0.8.3.orig/debian/changelog +++ libphp-predis-0.8.3/debian/changelog @@ -0,0 +1,13 @@ +libphp-predis (0.8.3-1ubuntu1) artful; urgency=medium + + * Backport + https://github.com/nrk/predis/commit/ea9809d4e859746f7369c564bc8af92a47cc0c53 + to fix PHP7.1 testcase regression(s). + + -- Nishanth Aravamudan Tue, 02 May 2017 20:27:58 -0700 + +libphp-predis (0.8.3-1) unstable; urgency=low + + * Initial release (Closes: #702709). + + -- Cyril Bouthors Thu, 21 Feb 2013 16:15:00 +0100 --- libphp-predis-0.8.3.orig/debian/compat +++ libphp-predis-0.8.3/debian/compat @@ -0,0 +1 @@ +8 --- libphp-predis-0.8.3.orig/debian/control +++ libphp-predis-0.8.3/debian/control @@ -0,0 +1,24 @@ +Source: libphp-predis +Section: php +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Cyril Bouthors +Uploaders: Cyril Bouthors +Build-Depends: debhelper (>= 8.0.0) +Standards-Version: 3.9.3 +Homepage: https://github.com/nrk/predis + +Package: libphp-predis +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Flexible and feature-complete PHP client library for the Redis key-value store + The library does not require any additional extension loaded in PHP but it can + be optionally paired with the phpiredis (https://github.com/nrk/phpiredis) + C-based extension to lower the overhead of serializing and parsing the Redis + protocol. Predis is also available in an asynchronous fashion through the + experimental client provided by the Predis\Async + (http://github.com/nrk/predis-async) library. + . + For a list of frequently asked questions about Predis see our FAQ + (https://github.com/nrk/predis/blob/master/FAQ.md). More details are available + on the official wiki (http://wiki.github.com/nrk/predis) of the project. --- libphp-predis-0.8.3.orig/debian/copyright +++ libphp-predis-0.8.3/debian/copyright @@ -0,0 +1,46 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libphp-predis +Source: https://github.com/nrk/predis + +Files: * +Copyright: 2009-2013 Daniele Alessandri +License: MIT + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +Files: debian/* +Copyright: 2013 Cyril Bouthors +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". --- libphp-predis-0.8.3.orig/debian/rules +++ libphp-predis-0.8.3/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +%: + dh $@ + +override_dh_auto_install: + mkdir -p $$PWD/debian/libphp-predis/usr/share/php/Predis + cp -pr lib/Predis $$PWD/debian/libphp-predis/usr/share/php + --- libphp-predis-0.8.3.orig/lib/Predis/Connection/StreamConnection.php +++ libphp-predis-0.8.3/lib/Predis/Connection/StreamConnection.php @@ -78,14 +78,16 @@ */ private function tcpStreamInitializer(ConnectionParametersInterface $parameters) { - $uri = "tcp://{$parameters->host}:{$parameters->port}/"; + $uri = "tcp://{$parameters->host}:{$parameters->port}"; $flags = STREAM_CLIENT_CONNECT; if (isset($parameters->async_connect) && $parameters->async_connect) { $flags |= STREAM_CLIENT_ASYNC_CONNECT; } + if (isset($parameters->persistent) && $parameters->persistent) { $flags |= STREAM_CLIENT_PERSISTENT; + $uri .= strpos($path = $parameters->$path, '/') === 0 ? $path : "/$path"; } $resource = @stream_socket_client($uri, $errno, $errstr, $parameters->timeout, $flags);