svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/main.c trunk/main/main.c
| From: | Kalle Sommer Nielsen | Date: | Thu, 11 Nov 2010 01:43:53 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/main.c trunk/main/main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63799@lists.php.net to get a copy of this message | ||
kalle Thu, 11 Nov 2010 01:43:53 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305266
Log:
Added new constant; ZEND_MULTIBYTE to check whether PHP was compiled using --enable-zend-multibyte
or not instead of sniffing phpinfo() (FR #52348)
Bug: http://bugs.php.net/52348 (Re-Opened) Ability to detect
zend multibyte mode at runtime
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/main/main.c
U php/php-src/trunk/main/main.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-11-11 01:01:56 UTC (rev 305265)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-11-11 01:43:53 UTC (rev 305266)
@@ -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)
Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c 2010-11-11 01:01:56 UTC (rev 305265)
+++ php/php-src/branches/PHP_5_3/main/main.c 2010-11-11 01:43:53 UTC (rev 305266)
@@ -1944,6 +1944,11 @@
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);
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2010-11-11 01:01:56 UTC (rev 305265)
+++ php/php-src/trunk/main/main.c 2010-11-11 01:43:53 UTC (rev 305266)
@@ -1979,6 +1979,11 @@
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);