Initial upstream merge for php8.1

Author: barshaul

config.m4

@@ -28,7 +28,7 @@ PHP_ARG_ENABLE(memcached-protocol, whether to enable memcached protocol support,
 [  --enable-memcached-protocol     Enable memcached protocol support], no, no)
 
 PHP_ARG_WITH(system-fastlz, whether to use system FastLZ library,
-[  --with-system-fastlz                 Use system FastLZ library], no, no)
+[  --with-system-fastlz            Use system FastLZ library], no, no)
 
 if test -z "$PHP_ZLIB_DIR"; then
 PHP_ARG_WITH(zlib-dir, for ZLIB,

config.w32

@@ -8,7 +8,7 @@ ARG_ENABLE('memcached-json', 'whether to enable memcached json serializer suppor
 
 if (PHP_MEMCACHED == "yes") {
 
-  if (!CHECK_LIB("memcached.lib", "memcached", PHP_MEMCACHED)) { 
+  if (!CHECK_LIB("memcached.lib;libmemcached.lib", "memcached", PHP_MEMCACHED)) {
 	ERROR("memcached: library 'memcached' not found");
   }
 
@@ -36,7 +36,7 @@ if (PHP_MEMCACHED == "yes") {
 	  }
   }
 
-  EXTENSION("memcached", "php_memcached.c php_libmemcached_compat.c g_fmt.c"+memcached_extra_src);
+  EXTENSION("memcached", "php_memcached.c php_libmemcached_compat.c g_fmt.c"+memcached_extra_src, null, " /DHAVE_SSIZE_T");
   ADD_SOURCES(configure_module_dirname+"\\fastlz", "fastlz.c", "memcached");
   AC_DEFINE("HAVE_MEMCACHED", 1, "memcached support");
   AC_DEFINE("MEMCACHED_EXPORTS", 1)

g_fmt.c

@@ -27,12 +27,17 @@
  *        // Teddy Grenman <[email protected]>, 2010-05-18.
  */
 
-#include <zend_operators.h>
+#include <php.h>
 
 char *php_memcached_g_fmt(register char *b, double x) {
 	register int i, k;
 	register char *s;
-	int decpt, j, sign;
+	int decpt, j;
+#if PHP_VERSION_ID < 80100
+	int sign;
+#else
+	bool sign;
+#endif
 	char *b0, *s0, *se;
 
 	b0 = b;

memcached.ini

@@ -60,7 +60,7 @@
 
 ; Write data to a number of additional memcached servers
 ; This is "poor man's HA" as libmemcached calls it.
-; If this value is positive and sess_remove_failed is enabled
+; If this value is positive and sess_remove_failed_servers is enabled
 ; when a memcached server fails the session will continue to be available
 ; from a replica. However, if the failed memcache server
 ; becomes available again it will read the session from there

package.xml

@@ -59,6 +59,9 @@ Fixes
    <file role='src' name='config.w32'/>
    <file role='src' name='php_memcached.c'/>
    <file role='src' name='php_memcached.h'/>
+   <file role='src' name='php_memcached.stub.php'/>
+   <file role='src' name='php_memcached_arginfo.h'/>
+   <file role='src' name='php_memcached_legacy_arginfo.h'/>
    <file role='src' name='php_memcached_private.h'/>
    <file role='src' name='php_memcached_session.c'/>
    <file role='src' name='php_memcached_session.h'/>
@@ -84,6 +87,7 @@ Fixes
     <file role='test' name='cas_multi.phpt'/>
     <file role='test' name='check_if_persistent.phpt'/>
     <file role='test' name='check_if_pristine.phpt'/>
+    <file role='test' name='check_key.phpt'/>
     <file role='test' name='clone.phpt'/>
     <file role='test' name='compression_conditions.phpt'/>
     <file role='test' name='compression_types.phpt'/>
@@ -100,6 +104,7 @@ Fixes
     <file role='test' name='gh_21.phpt'/>
     <file role='test' name='gh_77.phpt'/>
     <file role='test' name='gh_90.phpt'/>
+    <file role='test' name='gh_500.phpt'/>
     <file role='test' name='invoke_callback.phpt'/>
     <file role='test' name='invoke_callback_2.phpt'/>
     <file role='test' name='invoke_callback_twice.phpt'/>
@@ -134,10 +139,13 @@ Fixes
     <file role='test' name='types_php_multi.phpt'/>
     <file role='test' name='undefined_set.phpt'/>
     <file role='test' name='vbucket.phpt'/>
+    <file role='test' name='vbucket_error_7.phpt'/>
+    <file role='test' name='vbucket_error_8.phpt'/>
     <file role='test' name='user-flags.phpt'/>
     <file role='test' name='gh_93.phpt'/>
     <file role='test' name='add.phpt'/>
     <file role='test' name='bad_construct.phpt'/>
+    <file role='test' name='bad_construct_8.phpt'/>
     <file role='test' name='append.phpt'/>
     <file role='test' name='prepend.phpt'/>
     <file role='test' name='replace.phpt'/>
@@ -167,8 +175,11 @@ Fixes
     <file role='test' name='stats_hang.phpt'/>
     <file role='test' name='default_behavior.phpt'/>
     <file role='test' name='reset_keyprefix.phpt'/>
-    <file role='test' name='session_lock-php71.phpt'/>
-    <file role='test' name='tls_basic.phpt'/>
+	<file role='test' name='session_lock-php71.phpt'/>
+	<file role='test' name='server.inc'/>
+	<file role='test' name='server.php'/>
+	<file role='test' name='memcachedserver.phpt'/>
+	<file role='test' name='memcachedserver6.phpt'/>
   </dir>
  </dir>
  </contents>