com php-src: Change PHP_OS_FAMILY slightly: main/main .c main/php.h tests/basic/req60524-win.phpt tests/basic/req60524.phpt tests/output/sapi_
windows_vt100_support_notwindows.phpt tests/out put/sapi_windows_vt100_support_winko_err.phpt tests/output/sapi_windows_vt100_support_winko
_in-err.phpt tests/output/sapi_windows_vt100_ support_winko_in-out-err.phpt tests/output/sapi_windo ws_vt100_support_winko_in-out.phpt tests/outp
ut/sapi_windows_vt100_suppor

Commit: f9959ee7c2004919675d9cdc7c82f886f099f15f Author: Kalle Sommer Nielsen <kalle@php.net> Wed, 22 Feb 2017 12:31:06 +0100 Parents: dbdb0819b24997ca70fe5609489a6bf828f1feba Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f9959ee7c2004919675d9cdc7c82f886f099f15f Log: Change PHP_OS_FAMILY slightly * PHP_OS_FAMILY is now a macro, to allow extensions to take advantage of it, it is defined in php.h * Values are not upper-case-first, not always uppercase. Windows is no longer just "Win", if we want the short version for testing then PHP_OS is always WINNT anyway Changed paths: M main/main.c M main/php.h M tests/basic/req60524-win.phpt M tests/basic/req60524.phpt M tests/output/sapi_windows_vt100_support_notwindows.phpt M tests/output/sapi_windows_vt100_support_winko_err.phpt M tests/output/sapi_windows_vt100_support_winko_in-err.phpt M tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt M tests/output/sapi_windows_vt100_support_winko_in-out.phpt M tests/output/sapi_windows_vt100_support_winko_out-err.phpt M tests/output/sapi_windows_vt100_support_winko_out.phpt M tests/output/sapi_windows_vt100_support_winok_err.phpt M tests/output/sapi_windows_vt100_support_winok_in-err.phpt M tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt M tests/output/sapi_windows_vt100_support_winok_in-out.phpt M tests/output/sapi_windows_vt100_support_winok_out-err.phpt M tests/output/sapi_windows_vt100_support_winok_out.phpt M tests/security/open_basedir_001.phpt M tests/security/open_basedir_link.phpt M tests/security/open_basedir_linkinfo.phpt M tests/security/open_basedir_mkdir.phpt M tests/security/open_basedir_parse_ini_file.phpt M tests/security/open_basedir_readlink.phpt M tests/security/open_basedir_realpath.phpt M tests/security/open_basedir_symlink.phpt

diff --git a/main/main.c b/main/main.c index 07144af..4e331ac 100644 --- a/main/main.c +++ b/main/main.c @@ -2053,14 +2053,13 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod zend_utility_functions zuf; zend_utility_values zuv; int retval = SUCCESS, module_number=0; /* for REGISTER_INI_ENTRIES() */ - char *php_os, *php_os_family; + char *php_os; zend_module_entry *module; #ifdef PHP_WIN32 WORD wVersionRequested = MAKEWORD(2, 0); WSADATA wsaData; -#endif -#ifdef PHP_WIN32 + php_os = "WINNT"; old_invalid_parameter_handler = @@ -2075,21 +2074,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod php_os = PHP_OS; #endif -#if defined(PHP_WIN32) - php_os_family = "WIN"; -#elif defined(BSD) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - php_os_family = "BSD"; -#elif defined(__APPLE__) || defined(__MACH__) - php_os_family = "OSX"; -#elif defined(__sun__) - php_os_family = "SOLARIS"; -#elif defined(__linux__) - php_os_family = "LINUX"; -#else - php_os_family = "unknown"; -#endif - - #ifdef ZTS (void)ts_resource(0); #endif @@ -2173,7 +2157,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod #endif REGISTER_MAIN_LONG_CONSTANT("PHP_DEBUG", PHP_DEBUG, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS", php_os, strlen(php_os), CONST_PERSISTENT | CONST_CS); - REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS_FAMILY", php_os_family, strlen(php_os_family), CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS_FAMILY", PHP_OS_FAMILY, sizeof(PHP_OS_FAMILY)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_SAPI", sapi_module.name, strlen(sapi_module.name), CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("DEFAULT_INCLUDE_PATH", PHP_INCLUDE_PATH, sizeof(PHP_INCLUDE_PATH)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PEAR_INSTALL_DIR", PEAR_INSTALLDIR, sizeof(PEAR_INSTALLDIR)-1, CONST_PERSISTENT | CONST_CS); diff --git a/main/php.h b/main/php.h index 23d365d..fcf7b8c 100644 --- a/main/php.h +++ b/main/php.h @@ -41,6 +41,19 @@ #undef sprintf #define sprintf php_sprintf +/* Operating system family defintion */ +#ifdef PHP_WIN32 +# define PHP_OS_FAMILY "Windows" +#elif defined(BSD) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# define PHP_OS_FAMILY "BSD" +#elif defined(__APPLE__) || defined(__MACH__) +# define PHP_OS_FAMILY "OSX" +#elif defined(__sun__) +# define PHP_OS_FAMILY "Solaris" +#elif defined(__linux__) +# define PHP_OS_FAMILY "Unknown" +#endif + /* PHP's DEBUG value must match Zend's ZEND_DEBUG value */ #undef PHP_DEBUG #define PHP_DEBUG ZEND_DEBUG diff --git a/tests/basic/req60524-win.phpt b/tests/basic/req60524-win.phpt index 8eb38a5..26fa9d9 100644 --- a/tests/basic/req60524-win.phpt +++ b/tests/basic/req60524-win.phpt @@ -4,7 +4,7 @@ Req #60524 (Specify temporary directory) sys_temp_dir=C:\Windows --SKIPIF-- <?php -if(PHP_OS_FAMILY !== "WIN") +if(PHP_OS_FAMILY !== "Windows") die('skip Run only on Windows'); ?> --FILE-- diff --git a/tests/basic/req60524.phpt b/tests/basic/req60524.phpt index e4999e1..6709405 100644 --- a/tests/basic/req60524.phpt +++ b/tests/basic/req60524.phpt @@ -4,7 +4,7 @@ Req #60524 (Specify temporary directory) sys_temp_dir=/path/to/temp/dir --SKIPIF-- <?php -if(PHP_OS_FAMILY === "WIN") { +if(PHP_OS_FAMILY === "Windows") { die('skip non-windows only test'); } ?> diff --git a/tests/output/sapi_windows_vt100_support_notwindows.phpt b/tests/output/sapi_windows_vt100_support_notwindows.phpt index d1afa4d..cf4bf6f 100644 --- a/tests/output/sapi_windows_vt100_support_notwindows.phpt +++ b/tests/output/sapi_windows_vt100_support_notwindows.phpt @@ -2,7 +2,7 @@ Test that sapi_windows_vt100_support exists only on Windows --SKIPIF-- <?php -if(PHP_OS_FAMILY === "WIN") { +if(PHP_OS_FAMILY === "Windows") { echo "skip Only for not Windows systems"; } ?> diff --git a/tests/output/sapi_windows_vt100_support_winko_err.phpt b/tests/output/sapi_windows_vt100_support_winko_err.phpt index 9c85a20..04dbef5 100644 --- a/tests/output/sapi_windows_vt100_support_winko_err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_err.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDERR if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt index 595b5c4..e83b51d 100644 --- a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/ if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt index 44fae22..fef672d 100644 --- a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/ if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt index 322e7ad..f8deab1 100644 --- a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/ if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt index e61652c..7d72d92 100644 --- a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDOUT if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winko_out.phpt b/tests/output/sapi_windows_vt100_support_winko_out.phpt index 21966c8..d06a244 100644 --- a/tests/output/sapi_windows_vt100_support_winko_out.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_out.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDOUT if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winok_err.phpt b/tests/output/sapi_windows_vt100_support_winok_err.phpt index 26da556..b05f7de 100644 --- a/tests/output/sapi_windows_vt100_support_winok_err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_err.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDERR if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt index 646e169..9699d5f 100644 --- a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/ if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt index d277128..09bf3d1 100644 --- a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/ if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt index 1dd889a..81b6696 100644 --- a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/ if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt index e31b688..2062007 100644 --- a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDOUT if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/output/sapi_windows_vt100_support_winok_out.phpt b/tests/output/sapi_windows_vt100_support_winok_out.phpt index 5379ac2..cc1f83f 100644 --- a/tests/output/sapi_windows_vt100_support_winok_out.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_out.phpt @@ -5,7 +5,7 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDOUT if (getenv("SKIP_IO_CAPTURE_TESTS")) { die("skip I/O capture test"); } -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, diff --git a/tests/security/open_basedir_001.phpt b/tests/security/open_basedir_001.phpt index 7b198df..c445968 100644 --- a/tests/security/open_basedir_001.phpt +++ b/tests/security/open_basedir_001.phpt @@ -2,7 +2,7 @@ openbase_dir runtime tightning --SKIPIF-- <?php -if(PHP_OS_FAMILY === "WIN") { +if(PHP_OS_FAMILY === "Windows") { die('skip.. only for unix'); } if (!is_dir("/usr/local/bin")) { diff --git a/tests/security/open_basedir_link.phpt b/tests/security/open_basedir_link.phpt index e03b23e..57506d5 100644 --- a/tests/security/open_basedir_link.phpt +++ b/tests/security/open_basedir_link.phpt @@ -2,7 +2,7 @@ Test open_basedir configuration --SKIPIF-- <?php -if(PHP_OS_FAMILY === "WIN") { +if(PHP_OS_FAMILY === "Windows") { die('skip no links on Windows'); } ?> diff --git a/tests/security/open_basedir_linkinfo.phpt b/tests/security/open_basedir_linkinfo.phpt index 0f2b941..5a532f8 100644 --- a/tests/security/open_basedir_linkinfo.phpt +++ b/tests/security/open_basedir_linkinfo.phpt @@ -2,7 +2,7 @@ Test open_basedir configuration --SKIPIF-- <?php -if(PHP_OS_FAMILY === "WIN") { +if(PHP_OS_FAMILY === "Windows") { die('skip no symlinks on Windows'); } ?> diff --git a/tests/security/open_basedir_mkdir.phpt b/tests/security/open_basedir_mkdir.phpt index fba0dfb..91cb392 100644 --- a/tests/security/open_basedir_mkdir.phpt +++ b/tests/security/open_basedir_mkdir.phpt @@ -2,7 +2,7 @@ Test open_basedir configuration --SKIPIF-- <?php -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { die('skip Windows only variation'); } ?> diff --git a/tests/security/open_basedir_parse_ini_file.phpt b/tests/security/open_basedir_parse_ini_file.phpt index 5dec5f8..31ad1e5 100644 --- a/tests/security/open_basedir_parse_ini_file.phpt +++ b/tests/security/open_basedir_parse_ini_file.phpt @@ -4,7 +4,7 @@ Test open_basedir configuration open_basedir=. --SKIPIF-- <?php -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { die('skip Windows only variation'); } ?> diff --git a/tests/security/open_basedir_readlink.phpt b/tests/security/open_basedir_readlink.phpt index 16c638a..a2d8929 100644 --- a/tests/security/open_basedir_readlink.phpt +++ b/tests/security/open_basedir_readlink.phpt @@ -2,8 +2,8 @@ Test open_basedir configuration --SKIPIF-- <?php -if(PHP_OS_FAMILY === "WIN") { - die('skip no symlinks on Windows'); +if(PHP_OS_FAMILY === "Windows") { + die('skip not for Windows'); } ?> --FILE-- diff --git a/tests/security/open_basedir_realpath.phpt b/tests/security/open_basedir_realpath.phpt index c44215a..9f56cd8 100644 --- a/tests/security/open_basedir_realpath.phpt +++ b/tests/security/open_basedir_realpath.phpt @@ -2,7 +2,7 @@ Test open_basedir configuration --SKIPIF-- <?php -if(PHP_OS_FAMILY !== "WIN") { +if(PHP_OS_FAMILY !== "Windows") { die('skip only run on Windows'); } ?> diff --git a/tests/security/open_basedir_symlink.phpt b/tests/security/open_basedir_symlink.phpt index fe138cf..ae431df 100644 --- a/tests/security/open_basedir_symlink.phpt +++ b/tests/security/open_basedir_symlink.phpt @@ -2,8 +2,8 @@ Test open_basedir configuration --SKIPIF-- <?php -if(PHP_OS_FAMILY === "WIN") { - die('skip no symlinks on Windows'); +if(PHP_OS_FAMILY === "Windows") { + die('skip not for Windows'); } ?> --INI--