Skip to content

Commit 79b8bb1

Browse files
dstogovdstogov
committed
Merge branch 'master' into foreach
* master: (74 commits) Shut up, my lovely compiler; I do not like your warnings Márcio Almada remove dead tokens: T_CHARACTER, T_BAD_CHARACTER. fix detection of mbstate_t with clang Add missing NEWS and UPGRADING for bug #68938 moved the part of the test into an appropriate place Removed unused REGISTER_PDO_CONST_LONG Fix another invalid free of CG(interned_empty_string) add tests for #68996 Fixed #68790 (Missing return) Fixed #68790 (Missing return) Update README.TESTING Small Spacing adjustments for better reading added ODBCVER to phpinfo() added PCRE JIT availability info to phpinfo() Improve tests for bug 67436 Fixed issue php#1041 (Fix build in OSX with --enable-dtrace) fix setting default ODBCVER value in config.w32 updated NEWS updated NEWS Fixed bug #68964 Allowed memory size exhausted with odbc_exec ...
2 parents 9d17a42 + 0698901 commit 79b8bb1

File tree

121 files changed

+9268
-6280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+9268
-6280
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ before_script:
4444

4545
# Run PHPs run-tests.php
4646
script:
47-
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
47+
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
4848
- ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg

‎CODING_STANDARDS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Code Implementation
1818

1919
For instance, ``function int mail(char *to, char *from)`` should NOT free
2020
to and/or from.
21+
2122
Exceptions:
2223

2324
- The function's designated behavior is freeing that resource. E.g. efree()
@@ -112,6 +113,7 @@ User Functions/Methods Naming Conventions
112113
of ``parent_*``::
113114

114115
A family of 'foo' functions, for example:
116+
115117
Good:
116118
'foo_select_bar'
117119
'foo_insert_baz'

‎NEWS‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
. Fixed bug #65933 (Cannot specify config lines longer than 1024 bytes). (Chris Wright)
7676
. Implement request #67106 (Split main fpm config). (Elan Ruusamäe, Remi)
7777

78+
- JSON
79+
. Replace non-free JSON parser with a parser from Jsond extension, fixes #63520
80+
(JSON extension includes a problematic license statement). (Jakub Zelenka)
81+
. Fixed bug #68938 (json_decode() decodes empty string without error).
82+
(jeremy at bat-country dot us)
83+
7884
- LiteSpeed:
7985
. Updated LiteSpeed SAPI code from V5.5 to V6.6. (George Wang)
8086

@@ -98,6 +104,10 @@
98104
- PCRE:
99105
. Removed support for the /e (PREG_REPLACE_EVAL) modifier. (Nikita)
100106

107+
- PDO:
108+
. Fixed bug #59450 (./configure fails with "Cannot find php_pdo_driver.h").
109+
(maxime dot besson at smile dot fr)
110+
101111
- PDO_mysql:
102112
. Fixed bug #68424 (Add new PDO mysql connection attr to control multi
103113
statements option). (peter dot wolanin at acquia dot com)

‎README.TESTING‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ The php file will be generated always.
104104
NOTE: You can set environment variable TEST_PHP_DETAILED to enable
105105
detailed test information.
106106

107-
[Automated testing]
107+
[Automated Testing]
108+
--------------
108109
If you like to keep up to speed, with latest developments and quality
109110
assurance, setting the environment variable NO_INTERACTION to 1, will not
110111
prompt the tester for any user input.
@@ -142,7 +143,7 @@ then
142143
fi
143144
========== end of qa-test.sh =============
144145

145-
NOTE: the exit status of run-tests.php will be 1 when
146+
NOTE: The exit status of run-tests.php will be 1 when
146147
REPORT_EXIT_STATUS is set. The result of "make test" may be higher
147148
than that. At present, gmake 3.79.1 returns 2, so it is
148149
advised to test for non-zero, rather then a specific value.

‎UPGRADING‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ PHP X.Y UPGRADE NOTES
107107
instead.
108108
. Removed set_magic_quotes_runtime() and its alias magic_quotes_runtime().
109109

110+
- JSON:
111+
. Rejected RFC 7159 incompatible number formats in json_decode string -
112+
top level (07, 0xff, .1, -.1) and all levels ([1.], [1.e1])
113+
. Empty PHP string passed to json_encode emits a JSON syntax error.
114+
110115
- Stream:
111116
. Removed set_socket_blocking() in favor of its alias stream_set_blocking().
112117

‎UPGRADING.INTERNALS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ PHP 7.0 INTERNALS UPGRADE NOTES
2727
1. Internal API changes
2828
========================
2929

30-
a. zend_set_memory_limit() now takes the TSRMLS_CC macro as its last argument
3130
e. New data types
3231

3332
String

‎Zend/tests/bug67436/bug67436.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error_reporting=
99

1010
spl_autoload_register(function($classname) {
1111
if (in_array($classname, array('a','b','c'))) {
12-
require_once ($classname . '.php');
12+
require_once __DIR__ . "/{$classname}.php";
1313
}
1414
});
1515

‎Zend/tests/bug67436/bug67436_nohandler.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error_reporting=-1
99

1010
spl_autoload_register(function($classname) {
1111
if (in_array($classname, array('a','b','c'))) {
12-
require_once ($classname . '.php');
12+
require_once __DIR__ . "/{$classname}.php";
1313
}
1414
});
1515

‎Zend/zend.c‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -957,15 +957,15 @@ ZEND_API zval *zend_get_configuration_directive(zend_string *name) /* {{{ */
957957
} \
958958
} while (0)
959959

960-
#if !defined(ZEND_WIN32) && !defined(DARWIN)
960+
#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
961961
ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
962962
#else
963963
static void zend_error_va_list(int type, const char *format, va_list args)
964964
#endif
965965
{
966966
char *str;
967967
int len;
968-
#if !defined(ZEND_WIN32) && !defined(DARWIN)
968+
#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
969969
va_list args;
970970
#endif
971971
va_list usr_copy;
@@ -1059,17 +1059,21 @@ static void zend_error_va_list(int type, const char *format, va_list args)
10591059
}
10601060

10611061
#ifdef HAVE_DTRACE
1062-
if(DTRACE_ERROR_ENABLED()) {
1062+
if (DTRACE_ERROR_ENABLED()) {
10631063
char *dtrace_error_buffer;
1064+
#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
10641065
va_start(args, format);
1066+
#endif
10651067
zend_vspprintf(&dtrace_error_buffer, 0, format, args);
10661068
DTRACE_ERROR(dtrace_error_buffer, (char *)error_filename, error_lineno);
10671069
efree(dtrace_error_buffer);
1070+
#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
10681071
va_end(args);
1072+
#endif
10691073
}
10701074
#endif /* HAVE_DTRACE */
10711075

1072-
#if !defined(ZEND_WIN32) && !defined(DARWIN)
1076+
#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
10731077
va_start(args, format);
10741078
#endif
10751079

@@ -1182,7 +1186,7 @@ static void zend_error_va_list(int type, const char *format, va_list args)
11821186
break;
11831187
}
11841188

1185-
#if !defined(ZEND_WIN32) && !defined(DARWIN)
1189+
#if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
11861190
va_end(args);
11871191
#endif
11881192

@@ -1199,9 +1203,10 @@ static void zend_error_va_list(int type, const char *format, va_list args)
11991203
}
12001204
/* }}} */
12011205

1202-
#if (defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__))
1206+
#ifdef HAVE_NORETURN
1207+
# ifdef HAVE_NORETURN_ALIAS
12031208
void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn));
1204-
#elif defined(ZEND_WIN32) || defined(DARWIN)
1209+
# else
12051210
ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
12061211
{
12071212
va_list va;
@@ -1220,6 +1225,7 @@ ZEND_API ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ..
12201225
va_end(va);
12211226
}
12221227
/* }}} */
1228+
# endif
12231229
#endif
12241230

12251231
ZEND_API void zend_output_debug_string(zend_bool trigger_break, const char *format, ...) /* {{{ */

‎Zend/zend.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@
7777
ZEND_TSRMLS_CACHE_EXTERN;
7878

7979
#ifdef HAVE_NORETURN
80-
# if defined(ZEND_WIN32)
81-
ZEND_API ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ...);
82-
# else
80+
# ifdef ZEND_NORETRUN_ALIAS
8381
void zend_error_noreturn(int type, const char *format, ...) ZEND_NORETURN;
82+
# else
83+
ZEND_API ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ...);
8484
# endif
8585
#else
8686
# define zend_error_noreturn zend_error

0 commit comments

Comments
 (0)