author | Michael Nestler <Michael.Nestler@Oracle.COM> |
Fri, 05 Jun 2015 09:47:02 -0700 | |
branch | s11-update |
changeset 4418 | 7ae5fd823a4b |
permissions | -rw-r--r-- |
4418
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
1 |
# Source: upstream |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
2 |
# http://git.php.net/?p=php-src.git;a=patch;h=bbe4b87e1d1fa858c208368a28c0fb17c7774fe0;hp=676e0c0f7b294f8948f77a213d22ce9cdd014e4f |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
3 |
# Fixed in 5.6.9 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
4 |
# This patch also contains unnecessary whitespace changes but is left as is |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
5 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
6 |
From bbe4b87e1d1fa858c208368a28c0fb17c7774fe0 Mon Sep 17 00:00:00 2001 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
7 |
From: Stanislav Malyshev <[email protected]> |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
8 |
Date: Sat, 9 May 2015 23:13:06 -0700 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
9 |
Subject: [PATCH 1/1] Fixed bug #69418 - more s->p fixes for filenames |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
10 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
11 |
Conflicts: |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
12 |
ext/pcntl/pcntl.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
13 |
ext/standard/basic_functions.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
14 |
--- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
15 |
ext/pcntl/pcntl.c | 74 +++++++++++++++++++++--------------------- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
16 |
ext/standard/basic_functions.c | 29 ++++++++++------- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
17 |
ext/standard/dir.c | 62 +++++++++++++++++------------------ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
18 |
ext/standard/file.c | 4 +-- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
19 |
4 files changed, 88 insertions(+), 81 deletions(-) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
20 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
21 |
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
22 |
index bace3b0..09520a9 100644 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
23 |
--- a/ext/pcntl/pcntl.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
24 |
+++ b/ext/pcntl/pcntl.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
25 |
@@ -198,7 +198,7 @@ ZEND_GET_MODULE(pcntl) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
26 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
27 |
static void pcntl_signal_handler(int); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
28 |
static void pcntl_signal_dispatch(); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
29 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
30 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
31 |
void php_register_signal_constants(INIT_FUNC_ARGS) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
32 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
33 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
34 |
@@ -234,7 +234,7 @@ void php_register_signal_constants(INIT_FUNC_ARGS) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
35 |
REGISTER_LONG_CONSTANT("SIGTERM", (long) SIGTERM, CONST_CS | CONST_PERSISTENT); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
36 |
#ifdef SIGSTKFLT |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
37 |
REGISTER_LONG_CONSTANT("SIGSTKFLT",(long) SIGSTKFLT, CONST_CS | CONST_PERSISTENT); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
38 |
-#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
39 |
+#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
40 |
#ifdef SIGCLD |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
41 |
REGISTER_LONG_CONSTANT("SIGCLD", (long) SIGCLD, CONST_CS | CONST_PERSISTENT); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
42 |
#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
43 |
@@ -484,7 +484,7 @@ static void php_pcntl_register_errno_constants(INIT_FUNC_ARGS) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
44 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
45 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
46 |
static PHP_GINIT_FUNCTION(pcntl) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
47 |
-{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
48 |
+{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
49 |
memset(pcntl_globals, 0, sizeof(*pcntl_globals)); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
50 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
51 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
52 |
@@ -547,7 +547,7 @@ PHP_FUNCTION(pcntl_fork) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
53 |
PCNTL_G(last_error) = errno; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
54 |
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d", errno); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
55 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
56 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
57 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
58 |
RETURN_LONG((long) id); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
59 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
60 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
61 |
@@ -560,7 +560,7 @@ PHP_FUNCTION(pcntl_alarm) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
62 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
63 |
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &seconds) == FAILURE) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
64 |
return; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
65 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
66 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
67 |
RETURN_LONG ((long) alarm(seconds)); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
68 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
69 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
70 |
@@ -576,7 +576,7 @@ PHP_FUNCTION(pcntl_waitpid) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
71 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
72 |
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz|l", &pid, &z_status, &options) == FAILURE) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
73 |
return; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
74 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
75 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
76 |
convert_to_long_ex(&z_status); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
77 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
78 |
status = Z_LVAL_P(z_status); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
79 |
@@ -604,7 +604,7 @@ PHP_FUNCTION(pcntl_wait) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
80 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
81 |
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &z_status, &options) == FAILURE) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
82 |
return; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
83 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
84 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
85 |
convert_to_long_ex(&z_status); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
86 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
87 |
status = Z_LVAL_P(z_status); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
88 |
@@ -628,7 +628,7 @@ PHP_FUNCTION(pcntl_wait) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
89 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
90 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
91 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
92 |
-/* {{{ proto bool pcntl_wifexited(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
93 |
+/* {{{ proto bool pcntl_wifexited(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
94 |
Returns true if the child status code represents a successful exit */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
95 |
PHP_FUNCTION(pcntl_wifexited) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
96 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
97 |
@@ -646,7 +646,7 @@ PHP_FUNCTION(pcntl_wifexited) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
98 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
99 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
100 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
101 |
-/* {{{ proto bool pcntl_wifstopped(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
102 |
+/* {{{ proto bool pcntl_wifstopped(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
103 |
Returns true if the child status code represents a stopped process (WUNTRACED must have been used with waitpid) */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
104 |
PHP_FUNCTION(pcntl_wifstopped) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
105 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
106 |
@@ -664,7 +664,7 @@ PHP_FUNCTION(pcntl_wifstopped) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
107 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
108 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
109 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
110 |
-/* {{{ proto bool pcntl_wifsignaled(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
111 |
+/* {{{ proto bool pcntl_wifsignaled(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
112 |
Returns true if the child status code represents a process that was terminated due to a signal */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
113 |
PHP_FUNCTION(pcntl_wifsignaled) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
114 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
115 |
@@ -682,7 +682,7 @@ PHP_FUNCTION(pcntl_wifsignaled) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
116 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
117 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
118 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
119 |
-/* {{{ proto int pcntl_wexitstatus(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
120 |
+/* {{{ proto int pcntl_wexitstatus(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
121 |
Returns the status code of a child's exit */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
122 |
PHP_FUNCTION(pcntl_wexitstatus) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
123 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
124 |
@@ -700,7 +700,7 @@ PHP_FUNCTION(pcntl_wexitstatus) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
125 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
126 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
127 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
128 |
-/* {{{ proto int pcntl_wtermsig(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
129 |
+/* {{{ proto int pcntl_wtermsig(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
130 |
Returns the number of the signal that terminated the process who's status code is passed */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
131 |
PHP_FUNCTION(pcntl_wtermsig) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
132 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
133 |
@@ -718,7 +718,7 @@ PHP_FUNCTION(pcntl_wtermsig) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
134 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
135 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
136 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
137 |
-/* {{{ proto int pcntl_wstopsig(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
138 |
+/* {{{ proto int pcntl_wstopsig(int status) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
139 |
Returns the number of the signal that caused the process to stop who's status code is passed */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
140 |
PHP_FUNCTION(pcntl_wstopsig) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
141 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
142 |
@@ -754,19 +754,19 @@ PHP_FUNCTION(pcntl_exec) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
143 |
char *path; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
144 |
int path_len; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
145 |
ulong key_num; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
146 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
147 |
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|aa", &path, &path_len, &args, &envs) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
148 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
149 |
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|aa", &path, &path_len, &args, &envs) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
150 |
return; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
151 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
152 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
153 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
154 |
if (ZEND_NUM_ARGS() > 1) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
155 |
/* Build argument list */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
156 |
args_hash = HASH_OF(args); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
157 |
argc = zend_hash_num_elements(args_hash); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
158 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
159 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
160 |
argv = safe_emalloc((argc + 2), sizeof(char *), 0); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
161 |
*argv = path; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
162 |
- for ( zend_hash_internal_pointer_reset(args_hash), current_arg = argv+1; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
163 |
+ for ( zend_hash_internal_pointer_reset(args_hash), current_arg = argv+1; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
164 |
(argi < argc && (zend_hash_get_current_data(args_hash, (void **) &element) == SUCCESS)); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
165 |
(argi++, current_arg++, zend_hash_move_forward(args_hash)) ) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
166 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
167 |
@@ -784,9 +784,9 @@ PHP_FUNCTION(pcntl_exec) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
168 |
/* Build environment pair list */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
169 |
envs_hash = HASH_OF(envs); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
170 |
envc = zend_hash_num_elements(envs_hash); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
171 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
172 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
173 |
envp = safe_emalloc((envc + 1), sizeof(char *), 0); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
174 |
- for ( zend_hash_internal_pointer_reset(envs_hash), pair = envp; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
175 |
+ for ( zend_hash_internal_pointer_reset(envs_hash), pair = envp; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
176 |
(envi < envc && (zend_hash_get_current_data(envs_hash, (void **) &element) == SUCCESS)); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
177 |
(envi++, pair++, zend_hash_move_forward(envs_hash)) ) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
178 |
switch (return_val = zend_hash_get_current_key_ex(envs_hash, &key, &key_length, &key_num, 0, NULL)) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
179 |
@@ -802,13 +802,13 @@ PHP_FUNCTION(pcntl_exec) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
180 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
181 |
convert_to_string_ex(element); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
182 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
183 |
- /* Length of element + equal sign + length of key + null */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
184 |
+ /* Length of element + equal sign + length of key + null */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
185 |
pair_length = Z_STRLEN_PP(element) + key_length + 2; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
186 |
*pair = emalloc(pair_length); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
187 |
- strlcpy(*pair, key, key_length); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
188 |
+ strlcpy(*pair, key, key_length); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
189 |
strlcat(*pair, "=", pair_length); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
190 |
strlcat(*pair, Z_STRVAL_PP(element), pair_length); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
191 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
192 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
193 |
/* Cleanup */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
194 |
if (return_val == HASH_KEY_IS_LONG) efree(key); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
195 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
196 |
@@ -818,7 +818,7 @@ PHP_FUNCTION(pcntl_exec) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
197 |
PCNTL_G(last_error) = errno; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
198 |
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occurred: (errno %d) %s", errno, strerror(errno)); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
199 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
200 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
201 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
202 |
/* Cleanup */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
203 |
for (pair = envp; *pair != NULL; pair++) efree(*pair); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
204 |
efree(envp); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
205 |
@@ -831,7 +831,7 @@ PHP_FUNCTION(pcntl_exec) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
206 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
207 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
208 |
efree(argv); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
209 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
210 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
211 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
212 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
213 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
214 |
@@ -881,7 +881,7 @@ PHP_FUNCTION(pcntl_signal) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
215 |
zend_hash_index_del(&PCNTL_G(php_signal_table), signo); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
216 |
RETURN_TRUE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
217 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
218 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
219 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
220 |
if (!zend_is_callable(handle, 0, &func_name TSRMLS_CC)) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
221 |
PCNTL_G(last_error) = EINVAL; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
222 |
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s is not a callable function name error", func_name); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
223 |
@@ -889,11 +889,11 @@ PHP_FUNCTION(pcntl_signal) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
224 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
225 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
226 |
efree(func_name); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
227 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
228 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
229 |
/* Add the function name to our signal table */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
230 |
zend_hash_index_update(&PCNTL_G(php_signal_table), signo, (void **) &handle, sizeof(zval *), (void **) &dest_handle); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
231 |
if (dest_handle) zval_add_ref(dest_handle); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
232 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
233 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
234 |
if (php_signal4(signo, pcntl_signal_handler, (int) restart_syscalls, 1) == SIG_ERR) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
235 |
PCNTL_G(last_error) = errno; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
236 |
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error assigning signal"); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
237 |
@@ -1030,7 +1030,7 @@ static void pcntl_sigwaitinfo(INTERNAL_FUNCTION_PARAMETERS, int timedwait) /* {{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
238 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
239 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
240 |
/* |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
241 |
- * sigtimedwait and sigwaitinfo can return 0 on success on some |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
242 |
+ * sigtimedwait and sigwaitinfo can return 0 on success on some |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
243 |
* platforms, e.g. NetBSD |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
244 |
*/ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
245 |
if (!signo && siginfo.si_signo) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
246 |
@@ -1078,7 +1078,7 @@ static void pcntl_sigwaitinfo(INTERNAL_FUNCTION_PARAMETERS, int timedwait) /* {{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
247 |
EMPTY_SWITCH_DEFAULT_CASE(); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
248 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
249 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
250 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
251 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
252 |
RETURN_LONG(signo); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
253 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
254 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
255 |
@@ -1108,12 +1108,12 @@ PHP_FUNCTION(pcntl_getpriority) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
256 |
long who = PRIO_PROCESS; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
257 |
long pid = getpid(); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
258 |
int pri; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
259 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
260 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
261 |
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ll", &pid, &who) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
262 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
263 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
264 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
265 |
- /* needs to be cleared, since any returned value is valid */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
266 |
+ /* needs to be cleared, since any returned value is valid */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
267 |
errno = 0; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
268 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
269 |
pri = getpriority(who, pid); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
270 |
@@ -1173,7 +1173,7 @@ PHP_FUNCTION(pcntl_setpriority) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
271 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
272 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
273 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
274 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
275 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
276 |
RETURN_TRUE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
277 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
278 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
279 |
@@ -1206,7 +1206,7 @@ static void pcntl_signal_handler(int signo) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
280 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
281 |
struct php_pcntl_pending_signal *psig; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
282 |
TSRMLS_FETCH(); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
283 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
284 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
285 |
psig = PCNTL_G(spares); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
286 |
if (!psig) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
287 |
/* oops, too many signals for us to track, so we'll forget about this one */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
288 |
@@ -1239,7 +1239,7 @@ void pcntl_signal_dispatch() |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
289 |
if(!PCNTL_G(pending_signals)) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
290 |
return; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
291 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
292 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
293 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
294 |
/* Mask all signals */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
295 |
sigfillset(&mask); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
296 |
sigprocmask(SIG_BLOCK, &mask, &old_mask); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
297 |
@@ -1255,7 +1255,7 @@ void pcntl_signal_dispatch() |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
298 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
299 |
queue = PCNTL_G(head); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
300 |
PCNTL_G(head) = NULL; /* simple stores are atomic */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
301 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
302 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
303 |
/* Allocate */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
304 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
305 |
while (queue) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
306 |
@@ -1282,7 +1282,7 @@ void pcntl_signal_dispatch() |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
307 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
308 |
/* Re-enable queue */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
309 |
PCNTL_G(processing_signal_queue) = 0; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
310 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
311 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
312 |
/* return signal mask to previous state */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
313 |
sigprocmask(SIG_SETMASK, &old_mask, NULL); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
314 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
315 |
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
316 |
index a3783e0..83d140e 100644 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
317 |
--- a/ext/standard/basic_functions.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
318 |
+++ b/ext/standard/basic_functions.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
319 |
@@ -2127,7 +2127,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_stream_set_write_buffer, 0) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
320 |
ZEND_ARG_INFO(0, fp) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
321 |
ZEND_ARG_INFO(0, buffer) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
322 |
ZEND_END_ARG_INFO() |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
323 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
324 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
325 |
ZEND_BEGIN_ARG_INFO(arginfo_stream_set_chunk_size, 0) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
326 |
ZEND_ARG_INFO(0, fp) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
327 |
ZEND_ARG_INFO(0, chunk_size) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
328 |
@@ -2322,7 +2322,7 @@ ZEND_END_ARG_INFO() |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
329 |
ZEND_BEGIN_ARG_INFO(arginfo_lcfirst, 0) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
330 |
ZEND_ARG_INFO(0, str) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
331 |
ZEND_END_ARG_INFO() |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
332 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
333 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
334 |
ZEND_BEGIN_ARG_INFO_EX(arginfo_ucwords, 0, 0, 1) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
335 |
ZEND_ARG_INFO(0, str) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
336 |
ZEND_ARG_INFO(0, delimiters) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
337 |
@@ -3475,7 +3475,7 @@ static void basic_globals_ctor(php_basic_globals *basic_globals_p TSRMLS_DC) /* |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
338 |
BG(user_tick_functions) = NULL; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
339 |
BG(user_filter_map) = NULL; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
340 |
BG(serialize_lock) = 0; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
341 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
342 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
343 |
memset(&BG(serialize), 0, sizeof(BG(serialize))); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
344 |
memset(&BG(unserialize), 0, sizeof(BG(unserialize))); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
345 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
346 |
@@ -4034,8 +4034,8 @@ PHP_FUNCTION(getenv) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
347 |
int size; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
348 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
349 |
SetLastError(0); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
350 |
- /*If the given bugger is not large enough to hold the data, the return value is |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
351 |
- the buffer size, in characters, required to hold the string and its terminating |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
352 |
+ /*If the given bugger is not large enough to hold the data, the return value is |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
353 |
+ the buffer size, in characters, required to hold the string and its terminating |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
354 |
null character. We use this return value to alloc the final buffer. */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
355 |
size = GetEnvironmentVariableA(str, &dummybuf, 0); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
356 |
if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
357 |
@@ -4087,7 +4087,7 @@ PHP_FUNCTION(putenv) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
358 |
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &setting, &setting_len) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
359 |
return; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
360 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
361 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
362 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
363 |
if(setting_len == 0 || setting[0] == '=') { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
364 |
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid parameter syntax"); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
365 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
366 |
@@ -4151,6 +4151,13 @@ PHP_FUNCTION(putenv) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
367 |
&& _putenv(pe.putenv_string) == 0 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
368 |
# endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
369 |
) { /* success */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
370 |
+# if _MSC_VER < 1500 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
371 |
+ /* Yet another VC6 bug, unset may return env not found */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
372 |
+ if (error_code != 0 || |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
373 |
+ (error_code == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
374 |
+# else |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
375 |
+ if (error_code != 0) { /* success */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
376 |
+# endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
377 |
# endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
378 |
#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
379 |
zend_hash_add(&BG(putenv_ht), pe.key, pe.key_len + 1, (void **) &pe, sizeof(putenv_entry), NULL); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
380 |
@@ -4634,7 +4641,7 @@ PHP_FUNCTION(set_magic_quotes_runtime) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
381 |
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &new_setting) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
382 |
return; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
383 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
384 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
385 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
386 |
if (new_setting) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
387 |
php_error_docref(NULL TSRMLS_CC, E_CORE_ERROR, "magic_quotes_runtime is not supported anymore"); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
388 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
389 |
@@ -4922,7 +4929,7 @@ PHP_FUNCTION(forward_static_call) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
390 |
instanceof_function(EG(called_scope), fci_cache.calling_scope TSRMLS_CC)) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
391 |
fci_cache.called_scope = EG(called_scope); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
392 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
393 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
394 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
395 |
if (zend_call_function(&fci, &fci_cache TSRMLS_CC) == SUCCESS && fci.retval_ptr_ptr && *fci.retval_ptr_ptr) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
396 |
COPY_PZVAL_TO_ZVAL(*return_value, *fci.retval_ptr_ptr); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
397 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
398 |
@@ -5495,7 +5502,7 @@ PHP_FUNCTION(set_include_path) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
399 |
int new_value_len; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
400 |
char *old_value; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
401 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
402 |
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &new_value, &new_value_len) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
403 |
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &new_value, &new_value_len) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
404 |
return; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
405 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
406 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
407 |
@@ -5623,7 +5630,7 @@ PHP_FUNCTION(getservbyname) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
408 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
409 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
410 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
411 |
-/* empty string behaves like NULL on windows implementation of |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
412 |
+/* empty string behaves like NULL on windows implementation of |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
413 |
getservbyname. Let be portable instead. */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
414 |
#ifdef PHP_WIN32 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
415 |
if (proto_len == 0) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
416 |
@@ -6051,7 +6058,7 @@ PHP_FUNCTION(parse_ini_string) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
417 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
418 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
419 |
#if ZEND_DEBUG |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
420 |
-/* This function returns an array of ALL valid ini options with values and |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
421 |
+/* This function returns an array of ALL valid ini options with values and |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
422 |
* is not the same as ini_get_all() which returns only registered ini options. Only useful for devs to debug php.ini scanner/parser! */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
423 |
PHP_FUNCTION(config_get_hash) /* {{{ */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
424 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
425 |
diff --git a/ext/standard/dir.c b/ext/standard/dir.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
426 |
index 2ba4024..ddf884f 100644 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
427 |
--- a/ext/standard/dir.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
428 |
+++ b/ext/standard/dir.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
429 |
@@ -93,8 +93,8 @@ static zend_class_entry *dir_class_entry_ptr; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
430 |
dirp = (php_stream *) zend_fetch_resource(&id TSRMLS_CC, -1, "Directory", NULL, 1, php_file_le_stream()); \ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
431 |
if (!dirp) \ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
432 |
RETURN_FALSE; \ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
433 |
- } |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
434 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
435 |
+ } |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
436 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
437 |
/* {{{ arginfo */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
438 |
ZEND_BEGIN_ARG_INFO_EX(arginfo_dir, 0, 0, 0) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
439 |
ZEND_ARG_INFO(0, dir_handle) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
440 |
@@ -118,7 +118,7 @@ static void php_set_default_dir(int id TSRMLS_DC) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
441 |
if (id != -1) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
442 |
zend_list_addref(id); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
443 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
444 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
445 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
446 |
DIRG(default_dir) = id; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
447 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
448 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
449 |
@@ -168,25 +168,25 @@ PHP_MINIT_FUNCTION(dir) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
450 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
451 |
#ifdef GLOB_NOSORT |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
452 |
REGISTER_LONG_CONSTANT("GLOB_NOSORT", GLOB_NOSORT, CONST_CS | CONST_PERSISTENT); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
453 |
-#else |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
454 |
+#else |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
455 |
# define GLOB_NOSORT 0 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
456 |
#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
457 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
458 |
#ifdef GLOB_NOCHECK |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
459 |
REGISTER_LONG_CONSTANT("GLOB_NOCHECK", GLOB_NOCHECK, CONST_CS | CONST_PERSISTENT); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
460 |
-#else |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
461 |
+#else |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
462 |
# define GLOB_NOCHECK 0 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
463 |
#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
464 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
465 |
#ifdef GLOB_NOESCAPE |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
466 |
REGISTER_LONG_CONSTANT("GLOB_NOESCAPE", GLOB_NOESCAPE, CONST_CS | CONST_PERSISTENT); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
467 |
-#else |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
468 |
+#else |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
469 |
# define GLOB_NOESCAPE 0 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
470 |
#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
471 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
472 |
#ifdef GLOB_ERR |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
473 |
REGISTER_LONG_CONSTANT("GLOB_ERR", GLOB_ERR, CONST_CS | CONST_PERSISTENT); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
474 |
-#else |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
475 |
+#else |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
476 |
# define GLOB_ERR 0 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
477 |
#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
478 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
479 |
@@ -219,12 +219,12 @@ static void _php_do_opendir(INTERNAL_FUNCTION_PARAMETERS, int createobject) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
480 |
php_stream_context *context = NULL; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
481 |
php_stream *dirp; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
482 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
483 |
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &dirname, &dir_len, &zcontext) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
484 |
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|r", &dirname, &dir_len, &zcontext) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
485 |
RETURN_NULL(); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
486 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
487 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
488 |
context = php_stream_context_from_zval(zcontext, 0); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
489 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
490 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
491 |
dirp = php_stream_opendir(dirname, REPORT_ERRORS, context); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
492 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
493 |
if (dirp == NULL) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
494 |
@@ -232,7 +232,7 @@ static void _php_do_opendir(INTERNAL_FUNCTION_PARAMETERS, int createobject) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
495 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
496 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
497 |
dirp->flags |= PHP_STREAM_FLAG_NO_FCLOSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
498 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
499 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
500 |
php_set_default_dir(dirp->rsrc_id TSRMLS_CC); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
501 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
502 |
if (createobject) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
503 |
@@ -293,11 +293,11 @@ PHP_FUNCTION(chroot) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
504 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
505 |
char *str; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
506 |
int ret, str_len; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
507 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
508 |
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
509 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
510 |
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &str, &str_len) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
511 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
512 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
513 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
514 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
515 |
ret = chroot(str); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
516 |
if (ret != 0) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
517 |
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s (errno %d)", strerror(errno), errno); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
518 |
@@ -305,9 +305,9 @@ PHP_FUNCTION(chroot) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
519 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
520 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
521 |
php_clear_stat_cache(1, NULL, 0 TSRMLS_CC); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
522 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
523 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
524 |
ret = chdir("/"); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
525 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
526 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
527 |
if (ret != 0) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
528 |
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s (errno %d)", strerror(errno), errno); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
529 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
530 |
@@ -324,7 +324,7 @@ PHP_FUNCTION(chdir) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
531 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
532 |
char *str; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
533 |
int ret, str_len; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
534 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
535 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
536 |
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &str, &str_len) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
537 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
538 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
539 |
@@ -333,7 +333,7 @@ PHP_FUNCTION(chdir) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
540 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
541 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
542 |
ret = VCWD_CHDIR(str); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
543 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
544 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
545 |
if (ret != 0) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
546 |
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s (errno %d)", strerror(errno), errno); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
547 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
548 |
@@ -358,7 +358,7 @@ PHP_FUNCTION(getcwd) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
549 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
550 |
char path[MAXPATHLEN]; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
551 |
char *ret=NULL; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
552 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
553 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
554 |
if (zend_parse_parameters_none() == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
555 |
return; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
556 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
557 |
@@ -383,7 +383,7 @@ PHP_FUNCTION(rewinddir) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
558 |
{ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
559 |
zval *id = NULL, **tmp, *myself; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
560 |
php_stream *dirp; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
561 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
562 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
563 |
FETCH_DIRP(); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
564 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
565 |
if (!(dirp->flags & PHP_STREAM_FLAG_IS_DIR)) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
566 |
@@ -450,9 +450,9 @@ PHP_FUNCTION(glob) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
567 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
568 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
569 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
570 |
-#ifdef ZTS |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
571 |
+#ifdef ZTS |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
572 |
if (!IS_ABSOLUTE_PATH(pattern, pattern_len)) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
573 |
- result = VCWD_GETCWD(cwd, MAXPATHLEN); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
574 |
+ result = VCWD_GETCWD(cwd, MAXPATHLEN); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
575 |
if (!result) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
576 |
cwd[0] = '\0'; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
577 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
578 |
@@ -465,10 +465,10 @@ PHP_FUNCTION(glob) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
579 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
580 |
snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, pattern); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
581 |
pattern = work_pattern; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
582 |
- } |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
583 |
+ } |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
584 |
#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
585 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
586 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
587 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
588 |
memset(&globbuf, 0, sizeof(glob_t)); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
589 |
globbuf.gl_offs = 0; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
590 |
if (0 != (ret = glob(pattern, flags & GLOB_FLAGMASK, NULL, &globbuf))) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
591 |
@@ -477,7 +477,7 @@ PHP_FUNCTION(glob) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
592 |
/* Some glob implementation simply return no data if no matches |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
593 |
were found, others return the GLOB_NOMATCH error code. |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
594 |
We don't want to treat GLOB_NOMATCH as an error condition |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
595 |
- so that PHP glob() behaves the same on both types of |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
596 |
+ so that PHP glob() behaves the same on both types of |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
597 |
implementations and so that 'foreach (glob() as ...' |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
598 |
can be used for simple glob() calls without further error |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
599 |
checking. |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
600 |
@@ -517,11 +517,11 @@ no_results: |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
601 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
602 |
/* we need to do this everytime since GLOB_ONLYDIR does not guarantee that |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
603 |
* all directories will be filtered. GNU libc documentation states the |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
604 |
- * following: |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
605 |
- * If the information about the type of the file is easily available |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
606 |
- * non-directories will be rejected but no extra work will be done to |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
607 |
- * determine the information for each file. I.e., the caller must still be |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
608 |
- * able to filter directories out. |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
609 |
+ * following: |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
610 |
+ * If the information about the type of the file is easily available |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
611 |
+ * non-directories will be rejected but no extra work will be done to |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
612 |
+ * determine the information for each file. I.e., the caller must still be |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
613 |
+ * able to filter directories out. |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
614 |
*/ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
615 |
if (flags & GLOB_ONLYDIR) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
616 |
struct stat s; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
617 |
@@ -545,7 +545,7 @@ no_results: |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
618 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
619 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
620 |
/* }}} */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
621 |
-#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
622 |
+#endif |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
623 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
624 |
/* {{{ proto array scandir(string dir [, int sorting_order [, resource context]]) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
625 |
List files & directories inside the specified path */ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
626 |
@@ -583,7 +583,7 @@ PHP_FUNCTION(scandir) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
627 |
php_error_docref(NULL TSRMLS_CC, E_WARNING, "(errno %d): %s", errno, strerror(errno)); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
628 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
629 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
630 |
- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
631 |
+ |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
632 |
array_init(return_value); |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
633 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
634 |
for (i = 0; i < n; i++) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
635 |
diff --git a/ext/standard/file.c b/ext/standard/file.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
636 |
index c2e71d1..0abc022 100644 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
637 |
--- a/ext/standard/file.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
638 |
+++ b/ext/standard/file.c |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
639 |
@@ -814,7 +814,7 @@ PHP_FUNCTION(tempnam) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
640 |
char *p; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
641 |
int fd; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
642 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
643 |
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ps", &dir, &dir_len, &prefix, &prefix_len) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
644 |
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "pp", &dir, &dir_len, &prefix, &prefix_len) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
645 |
return; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
646 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
647 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
648 |
@@ -1343,7 +1343,7 @@ PHP_FUNCTION(rmdir) |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
649 |
zval *zcontext = NULL; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
650 |
php_stream_context *context; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
651 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
652 |
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &dir, &dir_len, &zcontext) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
653 |
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|r", &dir, &dir_len, &zcontext) == FAILURE) { |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
654 |
RETURN_FALSE; |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
655 |
} |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
656 |
|
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
657 |
-- |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
658 |
2.1.4 |
7ae5fd823a4b
PSARC 2015/255 Update PHP to version 5.6.8
Michael Nestler <Michael.Nestler@Oracle.COM>
parents:
diff
changeset
|
659 |