From 4cc80738394193031086c723067839347593731d Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Thu, 11 Nov 2010 01:43:53 +0000 Subject: [PATCH] Added new constant; ZEND_MULTIBYTE to check whether PHP was compiled using --enable-zend-multibyte or not instead of sniffing phpinfo() (FR #52348) --- NEWS | 1 + main/main.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/NEWS b/NEWS index dab93c15c9..c9c09fa4fe 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,7 @@ (Andrey) - Improved support for is_link and related functions on Windows. (Pierre) +- Implemented FR #52348, Ability to detect zend multibyte at runtime. (Kalle) - Implemented FR #52173, added functions pcntl_get_last_error() and pcntl_strerror(). (nick dot telford at gmail dot com, Arnaud) - Implemented symbolic links support for open_basedir checks. (Pierre) diff --git a/main/main.c b/main/main.c index ab7df7ba51..b6073319ad 100644 --- a/main/main.c +++ b/main/main.c @@ -1944,6 +1944,11 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", LONG_MAX, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", sizeof(long), CONST_PERSISTENT | CONST_CS); +#ifdef ZEND_MULTIBYTE + REGISTER_MAIN_LONG_CONSTANT("ZEND_MULTIBYTE", 1, CONST_PERSISTENT | CONST_CS); +#else + REGISTER_MAIN_LONG_CONSTANT("ZEND_MULTIBYTE", 0, CONST_PERSISTENT | CONST_CS); +#endif #ifdef PHP_WIN32 REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_VERSION_MAJOR", EG(windows_version_info).dwMajorVersion, CONST_PERSISTENT | CONST_CS); -- 2.40.0