diff options
Diffstat (limited to 'win32')
36 files changed, 42 insertions, 131 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 9435df5c46..a6b54c07ff 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -1,6 +1,4 @@ # +----------------------------------------------------------------------+ -# | PHP Version 7 | -# +----------------------------------------------------------------------+ # | Copyright (c) The PHP Group | # +----------------------------------------------------------------------+ # | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js index 5a45e481fc..a758c65d40 100644 --- a/win32/build/buildconf.js +++ b/win32/build/buildconf.js @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 864bc882ff..7cd6392078 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -44,7 +44,6 @@ /* its in win32/time.c */ #define HAVE_USLEEP 1 #define HAVE_NANOSLEEP 1 -#define PHP_SLEEP_NON_VOID 1 #define HAVE_GETCWD 1 #define NEED_ISBLANK 1 @@ -67,7 +66,6 @@ #define HAVE_GETLOGIN 1 #define HAVE_MEMMOVE 1 #define HAVE_REGCOMP 1 -#define HAVE_LOCALE_H 1 #define HAVE_SHUTDOWN 1 #define HAVE_STRCASECMP 1 #define HAVE_UTIME 1 @@ -120,10 +118,6 @@ #define HAVE_MBLEN -#undef HAVE_ATOF_ACCEPTS_NAN -#undef HAVE_ATOF_ACCEPTS_INF -#define HAVE_HUGE_VAL_NAN 0 - /* vs.net 2005 has a 64-bit time_t. This will likely break * 3rdParty libs that were built with older compilers; switch * back to 32-bit */ @@ -135,8 +129,6 @@ #define HAVE_MBRLEN 1 #define HAVE_MBSTATE_T 1 -#define HAVE_HUGE_VAL_INF 1 - #define HAVE_GETRUSAGE #define HAVE_FTOK 1 diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 190fa8e287..9ca6d24177 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1,8 +1,6 @@ // Utils for configure script /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | @@ -95,11 +93,11 @@ if (typeof(CWD) == "undefined") { } /* defaults; we pick up the precise versions from configure.ac */ -var PHP_VERSION = 7; -var PHP_MINOR_VERSION = 4; +var PHP_VERSION = 8; +var PHP_MINOR_VERSION = 0; var PHP_RELEASE_VERSION = 0; var PHP_EXTRA_VERSION = ""; -var PHP_VERSION_STRING = "7.4.0"; +var PHP_VERSION_STRING = "8.0.0"; /* Get version numbers and DEFINE as a string */ function get_version_numbers() @@ -444,7 +442,8 @@ can be built that way. \ 'pcre-regex', 'fastcgi', 'force-cgi-redirect', 'path-info-check', 'zts', 'ipv6', 'memory-limit', 'zend-multibyte', 'fd-setsize', 'memory-manager', - 'pgi', 'pgo', 'all-shared', 'config-profile' + 'pgi', 'pgo', 'all-shared', 'config-profile', + 'sanitizer' ); var force; @@ -2302,19 +2301,6 @@ function generate_config_h() outfile.WriteLine("#define " + keys[i] + " " + pieces); } - if (VS_TOOLSET) { - if (VCVERS >= 1800) { - outfile.WriteLine(""); - outfile.WriteLine("#define HAVE_ACOSH 1"); - outfile.WriteLine("#define HAVE_ASINH 1"); - outfile.WriteLine("#define HAVE_ATANH 1"); - } - if (VCVERS >= 1900) { - outfile.WriteLine("#define HAVE_LOG1P 1"); - } - } - - outfile.Close(); } @@ -2341,7 +2327,7 @@ function generate_phpize() MF.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION); MF.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION); MF.WriteBlankLines(1); - MF.WriteLine("/* Genereted extensions list with mode (static/shared) */"); + MF.WriteLine("/* Generated extensions list with mode (static/shared) */"); var count = extensions_enabled.length; for (i in extensions_enabled) { @@ -2352,7 +2338,7 @@ function generate_phpize() } MF.WriteBlankLines(2); - MF.WriteLine("/* Genereted win32/build/phpize.js.in */"); + MF.WriteLine("/* Generated win32/build/phpize.js.in */"); MF.WriteBlankLines(1); MF.Write(file_get_contents("win32/build/phpize.js.in")); MF.Close(); @@ -2436,7 +2422,7 @@ function handle_analyzer_makefile_flags(fd, key, val) { var relevant = false; - /* VS integrates /analyze with the bulid process, + /* VS integrates /analyze with the build process, no further action is required. */ if ("no" == PHP_ANALYZER || "vs" == PHP_ANALYZER) { return; @@ -3102,8 +3088,8 @@ function toolset_get_compiler_name(short) return name; } if (version >= 1920) { /* NOTE - VS is intentional. Due to changes in recent Visual Studio - versioning scheme refering to the exact VC++ version is - hardly predictable. From this version on, it refers to + versioning scheme referring to the exact VC++ version is + hardly predictable. From this version on, it refers to Visual Studio version and implies the default toolset. When new versions are introduced, adapt also checks in php_win32_image_compatible(), if needed. */ @@ -3669,7 +3655,7 @@ function get_clang_lib_dir() if (COMPILER_NAME_LONG.match(/clang version ([\d\.]+) \((.*)\)/)) { ver = RegExp.$1; } else { - ERROR("Faled to determine clang lib path"); + ERROR("Failed to determine clang lib path"); } if (X64) { @@ -3702,7 +3688,7 @@ function add_asan_opts(cflags_name, libs_name, ldflags_name) if (COMPILER_NAME_LONG.match(/clang version ([\d\.]+) \((.*)\)/)) { ver = RegExp.$1; } else { - ERROR("Faled to determine clang lib path"); + ERROR("Failed to determine clang lib path"); } if (!!cflags_name) { diff --git a/win32/build/deplister.c b/win32/build/deplister.c index b5dd059c98..f211f8add9 100644 --- a/win32/build/deplister.c +++ b/win32/build/deplister.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index f4155308af..c119530c03 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -284,7 +284,7 @@ Build: $build_dir EOT ); -/* list build-in extensions */ +/* list built-in extensions */ $exts = get_loaded_extensions(); fprintf($fp, "\r\nBuilt-in Extensions\r\n"); fwrite($fp, "===========================\r\n"); @@ -496,7 +496,7 @@ $dirs = array( foreach ($dirs as $dir) { copy_test_dir($dir, $test_dir); } -copy('run-tests.php', $test_dir . '/run-test.php'); +copy('run-tests.php', $test_dir . '/run-tests.php'); /* change this next line to true to use good-old * hand-assembled go-pear-bundle from the snapshot template */ diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index 5a4a973e19..d12820403e 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/codepage.c b/win32/codepage.c index 48f60595b4..0f90c534b8 100644 --- a/win32/codepage.c +++ b/win32/codepage.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | @@ -110,7 +108,7 @@ PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size #if PHP_DEBUG size_t save_in_len = in_len; #endif - + assert(in && in_len ? in[in_len] == '\0' : 1); if (!in) { @@ -179,16 +177,12 @@ PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size while (end - idx > 15) { const __m128i block = _mm_load_si128((__m128i *)idx); - { - const __m128i lo = _mm_unpacklo_epi8(block, mask); - _mm_storeu_si128((__m128i *)ret_idx, lo); - } + const __m128i lo = _mm_unpacklo_epi8(block, mask); + _mm_storeu_si128((__m128i *)ret_idx, lo); ret_idx += 8; - { - const __m128i hi = _mm_unpackhi_epi8(block, mask); - _mm_storeu_si128((__m128i *)ret_idx, hi); - } + const __m128i hi = _mm_unpackhi_epi8(block, mask); + _mm_storeu_si128((__m128i *)ret_idx, hi); idx += 16; ret_idx += 8; @@ -569,7 +563,7 @@ PHP_FUNCTION(sapi_windows_cp_set) const struct php_win32_cp *cp; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &id) == FAILURE) { - return; + RETURN_THROWS(); } if (ZEND_LONG_UINT_OVFL(id)) { @@ -599,7 +593,7 @@ PHP_FUNCTION(sapi_windows_cp_get) size_t kind_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &kind, &kind_len) == FAILURE) { - return; + RETURN_THROWS(); } if (kind_len == sizeof("ansi")-1 && !strncasecmp(kind, "ansi", kind_len)) { @@ -619,7 +613,7 @@ PHP_FUNCTION(sapi_windows_cp_get) PHP_FUNCTION(sapi_windows_cp_is_utf8) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(php_win32_cp_use_unicode()); @@ -637,7 +631,7 @@ PHP_FUNCTION(sapi_windows_cp_conv) zval *z_in_cp, *z_out_cp; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zzs", &z_in_cp, &z_out_cp, &subj, &subj_len) == FAILURE) { - return; + RETURN_THROWS(); } if (ZEND_SIZE_T_INT_OVFL(subj_len)) { diff --git a/win32/codepage.h b/win32/codepage.h index 0dd72562b6..8f8fbcbaa1 100644 --- a/win32/codepage.h +++ b/win32/codepage.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/console.c b/win32/console.c index 0b1bb0eff9..7833dd97d3 100644 --- a/win32/console.c +++ b/win32/console.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/console.h b/win32/console.h index 2d36d85508..47336a0a7b 100644 --- a/win32/console.h +++ b/win32/console.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/dllmain.c b/win32/dllmain.c index 4743f732e9..7850a79699 100644 --- a/win32/dllmain.c +++ b/win32/dllmain.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/ftok.c b/win32/ftok.c index db789f8b70..3e379e82ef 100644 --- a/win32/ftok.c +++ b/win32/ftok.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/getrusage.c b/win32/getrusage.c index de67f7f8d2..c956613c69 100644 --- a/win32/getrusage.c +++ b/win32/getrusage.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/getrusage.h b/win32/getrusage.h index c41c026aa2..c5a95c436b 100644 --- a/win32/getrusage.h +++ b/win32/getrusage.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/globals.c b/win32/globals.c index 9bb392f42a..e9ba61761a 100644 --- a/win32/globals.c +++ b/win32/globals.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/grp.h b/win32/grp.h index 301babed4e..f8cc8fe206 100644 --- a/win32/grp.h +++ b/win32/grp.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/inet.c b/win32/inet.c index 7361b89bc2..4a835ca7a3 100644 --- a/win32/inet.c +++ b/win32/inet.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/inet.h b/win32/inet.h index b57d78903d..06b646bd57 100644 --- a/win32/inet.h +++ b/win32/inet.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/ioutil.c b/win32/ioutil.c index 63645314dd..bb3ff39605 100644 --- a/win32/ioutil.c +++ b/win32/ioutil.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/ioutil.h b/win32/ioutil.h index 93dea15967..1c2f1a213e 100644 --- a/win32/ioutil.h +++ b/win32/ioutil.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/ipc.h b/win32/ipc.h index c7cb476353..bbefb48703 100644 --- a/win32/ipc.h +++ b/win32/ipc.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/nice.c b/win32/nice.c index 05aae465ed..4b2d388362 100644 --- a/win32/nice.c +++ b/win32/nice.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | @@ -56,7 +54,7 @@ * . PROCESS_MODE_BACKGROUND_BEGIN * . PROCESS_MODE_BACKGROUND_END * Process mode is not covered because it can easily forgotten to be changed - * back and can cause unforseen side effects that is hard to debug. Besides + * back and can cause unforeseen side effects that is hard to debug. Besides * that, these do generally not really fit into making a Windows somewhat * compatible nice() function. */ diff --git a/win32/nice.h b/win32/nice.h index 385855c2ea..dc082035d9 100644 --- a/win32/nice.h +++ b/win32/nice.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/php_registry.h b/win32/php_registry.h index f46c482085..9effd01d4e 100644 --- a/win32/php_registry.h +++ b/win32/php_registry.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index bb91f08c50..05da08104b 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/registry.c b/win32/registry.c index 99c3ce365f..09d9c98868 100644 --- a/win32/registry.c +++ b/win32/registry.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/select.c b/win32/select.c index b02766e4f3..865c3e44b9 100644 --- a/win32/select.c +++ b/win32/select.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/select.h b/win32/select.h index c23eb87ddb..f6f9af99c1 100644 --- a/win32/select.h +++ b/win32/select.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/sendmail.c b/win32/sendmail.c index 9e31028d58..281c343533 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -1,7 +1,7 @@ /* * PHP Sendmail for Windows. * - * This file is rewritten specificly for PHPFI. Some functionality + * This file is rewritten specifically for PHPFI. Some functionality * has been removed (MIME and file attachments). This code was * modified from code based on code written by Jarle Aase. * @@ -91,7 +91,7 @@ static char *ErrorMessages[] = }; /* This pattern converts all single occurrences of \n (Unix) - * withour a leading \r to \r\n and all occurrences of \r (Mac) + * without a leading \r to \r\n and all occurrences of \r (Mac) * without a trailing \n to \r\n * Thx to Nibbler from ircnet/#linuxger */ @@ -114,7 +114,7 @@ static char *ErrorMessages[] = /* This function is meant to unify the headers passed to to mail() * This means, use PCRE to transform single occurrences of \n or \r in \r\n - * As a second step we also eleminate all \r\n occurrences which are: + * As a second step we also eliminate all \r\n occurrences which are: * 1) At the start of the header * 2) At the end of the header * 3) Two or more occurrences in the header are removed so only one is left @@ -270,7 +270,7 @@ PHPAPI int TSendMail(char *host, int *error, char **error_message, /* 128 is safe here, the specifier in snprintf isn't longer than that */ *error_message = ecalloc(1, HOST_NAME_LEN + 128); snprintf(*error_message, HOST_NAME_LEN + 128, - "Failed to connect to mailserver at \"%s\" port %d, verify your \"SMTP\" " + "Failed to connect to mailserver at \"%s\" port " ZEND_ULONG_FMT ", verify your \"SMTP\" " "and \"smtp_port\" setting in php.ini or use ini_set()", PW32G(mail_host), !INI_INT("smtp_port") ? 25 : INI_INT("smtp_port")); return FAILURE; @@ -887,7 +887,7 @@ again: /* Check for newline */ Index += rlen; - /* SMPT RFC says \r\n is the only valid line ending, who are we to argue ;) + /* SMTP RFC says \r\n is the only valid line ending, who are we to argue ;) * The response code must contain at least 5 characters ex. 220\r\n */ if (Received < 5 || buf[Received - 1] != '\n' || buf[Received - 2] != '\r') { goto again; @@ -958,7 +958,7 @@ static unsigned long GetAddr(LPSTR szHost) // Name: int FormatEmailAddress // Input: // Output: -// Description: Formats the email address to remove any content ouside +// Description: Formats the email address to remove any content outside // of the angle brackets < > as per RFC 2821. // // Returns the invalidly formatted mail address if the < > are diff --git a/win32/signal.c b/win32/signal.c index bdfd7033f3..27ebf835c9 100644 --- a/win32/signal.c +++ b/win32/signal.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | @@ -93,21 +91,22 @@ PHP_FUNCTION(sapi_windows_set_ctrl_handler) zval *handler = NULL; zend_bool add = 1; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &handler, &add) == FAILURE) { + RETURN_THROWS(); + } + #if ZTS if (!tsrm_is_main_thread()) { - php_error_docref(NULL, E_WARNING, "CTRL events can only be received on the main thread"); + zend_throw_error(NULL, "CTRL events can only be received on the main thread"); return; } #endif if (!php_win32_console_is_cli_sapi()) { - php_error_docref(NULL, E_WARNING, "CTRL events trapping is only supported on console"); + zend_throw_error(NULL, "CTRL events trapping is only supported on console"); return; } - if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &handler, &add) == FAILURE) { - return; - } if (IS_NULL == Z_TYPE_P(handler)) { zval_dtor(&ctrl_handler); @@ -120,9 +119,9 @@ PHP_FUNCTION(sapi_windows_set_ctrl_handler) if (!zend_is_callable(handler, 0, NULL)) { zend_string *func_name = zend_get_callable_name(handler); - php_error_docref(NULL, E_WARNING, "%s is not a callable function name error", ZSTR_VAL(func_name)); + zend_type_error("%s is not a callable function name error", ZSTR_VAL(func_name)); zend_string_release_ex(func_name, 0); - RETURN_FALSE; + return; } if (!SetConsoleCtrlHandler(NULL, FALSE) || !SetConsoleCtrlHandler(php_win32_signal_system_ctrl_handler, add)) { @@ -143,12 +142,12 @@ PHP_FUNCTION(sapi_windows_generate_ctrl_event) zend_long evt, pid = 0; zend_bool ret = 0; - if (!php_win32_console_is_cli_sapi()) { - php_error_docref(NULL, E_WARNING, "CTRL events trapping is only supported on console"); - return; + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &evt, &pid) == FAILURE) { + RETURN_THROWS(); } - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &evt, &pid) == FAILURE) { + if (!php_win32_console_is_cli_sapi()) { + zend_throw_error(NULL, "CTRL events trapping is only supported on console"); return; } diff --git a/win32/sockets.c b/win32/sockets.c index 461ce69888..c38d2bccbc 100644 --- a/win32/sockets.c +++ b/win32/sockets.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/sockets.h b/win32/sockets.h index 2e693f8840..f254133cc8 100644 --- a/win32/sockets.h +++ b/win32/sockets.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/syslog.h b/win32/syslog.h index 5ea75d8486..560e8864fd 100644 --- a/win32/syslog.h +++ b/win32/syslog.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/winutil.c b/win32/winutil.c index 578e66c074..a431025db8 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | diff --git a/win32/winutil.h b/win32/winutil.h index f2faa95fa8..8acf87e671 100644 --- a/win32/winutil.h +++ b/win32/winutil.h @@ -1,7 +1,5 @@ /* +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | |