Skip to content

Commit 6fdc31e

Browse files
author
nono303
committed
https://github.com/websupport-sk/pecl-memcache/issues/119
websupport-sk/pecl-memcache#120
1 parent 04a0103 commit 6fdc31e

File tree

1 file changed

+63
-6
lines changed

1 file changed

+63
-6
lines changed

patches/pecl-memcache.patch

Lines changed: 63 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
1-
diff --git "a/src/memcache.c" "b/src/memcache.c"
2-
index 524ca47..b541d99 100644
3-
--- "a/src/memcache.c"
4-
+++ "b/src/memcache.c"
1+
diff --git a/src/memcache.c b/src/memcache.c
2+
index 524ca47..e73aa75 100644
3+
--- a/src/memcache.c
4+
+++ b/src/memcache.c
5+
@@ -26,7 +26,7 @@
6+
#include "php.h"
7+
#include "php_ini.h"
8+
#include "ext/standard/info.h"
9+
-#include "ext/standard/php_string.h"
10+
+#include "Zend/zend_smart_string.h"
11+
#include "php_memcache.h"
12+
13+
/* True global resources - no need for thread safety here */
514
@@ -901,14 +901,25 @@ static void php_mmc_store(INTERNAL_FUNCTION_PARAMETERS, int op) /* {{{ */
615
zend_long flags = 0, exptime = 0, cas = 0;
716

@@ -471,7 +480,7 @@ index 524ca47..b541d99 100644
471480
if (user_length < 1 || password_length < 1) {
472481
RETURN_FALSE;
473482
diff --git a/src/memcache_binary_protocol.c b/src/memcache_binary_protocol.c
474-
index b14093b..06b180a 100644
483+
index 77a93f9..38f32c9 100644
475484
--- a/src/memcache_binary_protocol.c
476485
+++ b/src/memcache_binary_protocol.c
477486
@@ -26,7 +26,7 @@
@@ -483,8 +492,20 @@ index b14093b..06b180a 100644
483492
# include "win32/php_stdint.h"
484493
# else
485494
# include <stdint.h>
495+
diff --git a/src/memcache_pool.c b/src/memcache_pool.c
496+
index bd1429c..767fcb2 100644
497+
--- a/src/memcache_pool.c
498+
+++ b/src/memcache_pool.c
499+
@@ -35,7 +35,6 @@
500+
#include "php_network.h"
501+
#include "ext/standard/crc32.h"
502+
#include "ext/standard/php_var.h"
503+
-#include "ext/standard/php_string.h"
504+
#include "Zend/zend_smart_string.h"
505+
#include "zend_smart_str.h"
506+
#include "memcache_pool.h"
486507
diff --git a/src/memcache_pool.h b/src/memcache_pool.h
487-
index c37b6d5..b2b03c9 100644
508+
index 106bf4e..cbf1380 100644
488509
--- a/src/memcache_pool.h
489510
+++ b/src/memcache_pool.h
490511
@@ -35,7 +35,7 @@
@@ -496,3 +517,39 @@ index c37b6d5..b2b03c9 100644
496517
# include "win32/php_stdint.h"
497518
# else
498519
# include <stdint.h>
520+
diff --git a/src/memcache_session.c b/src/memcache_session.c
521+
index 55a6e82..970854f 100644
522+
--- a/src/memcache_session.c
523+
+++ b/src/memcache_session.c
524+
@@ -29,7 +29,7 @@
525+
#include "php_variables.h"
526+
527+
#include "SAPI.h"
528+
-#include "Zend/zend_smart_string.h"
529+
+#include "memcache_pool.h"
530+
#include "ext/standard/url.h"
531+
#include "ext/session/php_session.h"
532+
#ifdef PHP_WIN32
533+
From 0fa9b4a7f50bb31da7eb45ed3b3eba82f985f06c Mon Sep 17 00:00:00 2001
534+
From: Remi Collet <remi@remirepo.net>
535+
Date: Wed, 15 Oct 2025 09:56:40 +0200
536+
Subject: [PATCH] clean deprecated ini
537+
538+
---
539+
tests/pecl63142.phpt | 3 ---
540+
1 file changed, 3 deletions(-)
541+
542+
diff --git a/tests/pecl63142.phpt b/tests/pecl63142.phpt
543+
index 5eef5f9..bea5697 100644
544+
--- a/tests/pecl63142.phpt
545+
+++ b/tests/pecl63142.phpt
546+
@@ -2,9 +2,6 @@
547+
PECL bug #63142 (memcache 3.0.7 segfaults with object (un)serialization)
548+
--SKIPIF--
549+
<?php include 'connect.inc'; ?>
550+
---INI--
551+
-;fix me later
552+
-report_memleaks=0
553+
--FILE--
554+
<?php
555+

0 commit comments

Comments
 (0)