Skip to content

Commit 27bde17

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Fix GH-9518: Disabling IPv6 support disables unrelated constants
2 parents 59b9b45 + 76dccd8 commit 27bde17

File tree

2 files changed

+22
-44
lines changed

2 files changed

+22
-44
lines changed

ext/standard/file.stub.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@
278278
* @cvalue PF_INET
279279
*/
280280
const STREAM_PF_INET = UNKNOWN;
281+
#endif
281282
#if (!defined(PF_INET) && defined(AF_INET))
282283
/**
283284
* @var int
@@ -286,13 +287,15 @@
286287
const STREAM_PF_INET = UNKNOWN;
287288
#endif
288289

290+
289291
#ifdef HAVE_IPV6
290292
#ifdef PF_INET6
291293
/**
292294
* @var int
293295
* @cvalue PF_INET6
294296
*/
295297
const STREAM_PF_INET6 = UNKNOWN;
298+
#endif
296299
#if (!defined(PF_INET6) && defined(AF_INET6))
297300
/**
298301
* @var int
@@ -308,6 +311,7 @@
308311
* @cvalue PF_UNIX
309312
*/
310313
const STREAM_PF_UNIX = UNKNOWN;
314+
#endif
311315
#if (!defined(PF_UNIX) && defined(AF_UNIX))
312316
/**
313317
* @var int

ext/standard/file_arginfo.h

Lines changed: 18 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)