Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More work on pecl-memcache #76

Merged
merged 15 commits into from
Oct 16, 2020
Merged

More work on pecl-memcache #76

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2a5de3c
Use zend_bool for ini bool settings
TysonAndre Aug 9, 2020
2b25d81
Initial work for php 8
Zaffy Sep 24, 2020
0737585
php7 -> php8
Zaffy Sep 24, 2020
4fdcbf9
Merge pull request #71 from TysonAndre/fix-prefix_host_key
tomassrnka Sep 24, 2020
5c1afc0
Merge NON_BLOCKING_IO_php7 into NON_BLOCKING_IO_php8
Zaffy Sep 24, 2020
eb5593a
Add test for #53
Zaffy Oct 1, 2020
cab69b8
Fix support for binary protocol
Zaffy Oct 1, 2020
2ee0fff
php8 -> src
Zaffy Oct 3, 2020
dd73db8
Backwards compatibility with php 7.3, 7.4
Zaffy Oct 3, 2020
6d9a49d
Add test for pecl bug #77900
Zaffy Oct 3, 2020
edb2e4a
Fix some memory leaks
Zaffy Oct 4, 2020
d91338a
Support for reflection
Zaffy Oct 4, 2020
2bded1b
Merge remote-tracking branch 'origin/NON_BLOCKING_IO_php8' into NON_B…
Zaffy Oct 8, 2020
4dd4b80
Fix typo
Zaffy Oct 8, 2020
252f28a
Update config.w32
Zaffy Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ if (PHP_MEMCACHE != "no") {
var dll = get_define('PHPDLL');
var old_conf_dir = configure_module_dirname;

if (dll.match(/^php8/) != null) {
configure_module_dirname = configure_module_dirname + "\\php8";
if (dll.match(/^src/) != null) {
Zaffy marked this conversation as resolved.
Show resolved Hide resolved
configure_module_dirname = configure_module_dirname + "\\src";
} else if (dll.match(/^php5/) != null) {
ERROR("PHP 7.x required for pecl-php-memcache ver 4+. Use pecl-php-meachce ver 3.x for PHP 5.x.");
} else {
Expand Down
4 changes: 2 additions & 2 deletions config9.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if test "$PHP_MEMCACHE" != "no"; then
fi

AC_MSG_CHECKING(PHP version)
if test -d $abs_srcdir/php8 ; then
if test -d $abs_srcdir/src ; then
dnl # only when for PECL, not for PHP
export OLD_CPPFLAGS="$CPPFLAGS"
export CPPFLAGS="$CPPFLAGS $INCLUDES"
Expand All @@ -73,7 +73,7 @@ if test "$PHP_MEMCACHE" != "no"; then
#error "PHP < 7"
#endif
], [
subdir=php8
subdir=src
AC_MSG_RESULT([PHP 7.x])
],
AC_MSG_ERROR([PHP 7.x required for pecl-php-memcache ver 4+. Use pecl-php-memcache ver 3.x for PHP 5.x.])
Expand Down
6 changes: 5 additions & 1 deletion docker/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,8 @@ chown memcache:memcache /var/run/memcached

# Let's start tests
cd /usr/src/pecl-memcache
NO_INTERACTION=1 TEST_PHP_ARGS="--show-diff --keep-all -w fails.log" make test
export NO_INTERACTION=1
export TEST_PHP_ARGS="--show-diff --keep-all -w fails.log"

MEMCACHE_PROTOCOL=ascii make test
MEMCACHE_PROTOCOL=binary make test
2 changes: 1 addition & 1 deletion package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
<file name="host.conf" role="src" />
<file name="start.sh" role="src" />
</dir>
<dir name="php8">
<dir name="src">
<file name="memcache.c" role="src" />
<file name="memcache_pool.c" role="src" />
<file name="memcache_queue.c" role="src" />
Expand Down
Loading