summaryrefslogtreecommitdiffstats
path: root/unit-github639.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-12-15 16:57:45 +0100
committerRemi Collet <remi@php.net>2022-12-15 16:57:45 +0100
commit243249614a65b966095543eb37c154c446b84b84 (patch)
treea0cc13a523ecb61b9bb61483e681160d81b047c3 /unit-github639.patch
parent29cd3f7dfb0d9146a2aa02dce6a84ca6f5301e96 (diff)
update to 1.29.0
drop patches merged upstream
Diffstat (limited to 'unit-github639.patch')
-rw-r--r--unit-github639.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/unit-github639.patch b/unit-github639.patch
deleted file mode 100644
index a06e79c..0000000
--- a/unit-github639.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-# HG changeset patch
-# User Zhidao HONG <z.hong@f5.com>
-# Date 1645410293 -28800
-# Mon Feb 21 10:24:53 2022 +0800
-# Node ID 5419d81ccd877b80249bfee71e37b122a68eda6d
-# Parent 00faecc2c4b6ad1bddb5b4d083e415851e9f93b1
-Improved realloc() wrapper.
-
-This closes #639 issue on Github.
-
-diff -r 00faecc2c4b6 -r 5419d81ccd87 src/nxt_malloc.c
---- a/src/nxt_malloc.c Tue Feb 15 21:43:02 2022 +0000
-+++ b/src/nxt_malloc.c Mon Feb 21 10:24:53 2022 +0800
-@@ -61,6 +61,33 @@ nxt_zalloc(size_t size)
- }
-
-
-+#if (NXT_DEBUG)
-+
-+void *
-+nxt_realloc(void *p, size_t size)
-+{
-+ void *n;
-+ uintptr_t ptr;
-+
-+ ptr = (uintptr_t) p;
-+
-+ n = realloc(p, size);
-+
-+ if (nxt_fast_path(n != NULL)) {
-+ nxt_log_debug(nxt_malloc_log(), "realloc(%p, %uz): %p", ptr, size, n);
-+
-+ } else {
-+ nxt_log_alert_moderate(&nxt_malloc_log_moderation, nxt_malloc_log(),
-+ "realloc(%p, %uz) failed %E",
-+ ptr, size, nxt_errno);
-+ }
-+
-+ return n;
-+}
-+
-+
-+#else
-+
- void *
- nxt_realloc(void *p, size_t size)
- {
-@@ -80,6 +107,8 @@ nxt_realloc(void *p, size_t size)
- return n;
- }
-
-+#endif /* NXT_DEBUG */
-+
-
- /* nxt_lvlhsh_* functions moved here to avoid references from nxt_lvlhsh.c. */