[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/main.c trunk/main/main.c

2011-03-24 Thread Ilia Alshanetsky 
iliaaThu, 24 Mar 2011 12:57:38 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=309647

Log:
Fixed a crash inside dtor for error handling.

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   2011-03-24 12:35:17 UTC (rev 309646)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-03-24 12:57:38 UTC (rev 309647)
@@ -8,6 +8,7 @@
 - Core:
   . Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment).
 (tomas dot brastavicius at quantum dot lt, Pierrick)
+  . Fixed a crash inside dtor for error handling. (Ilia)

 - DateTime extension:
   . Fixed bug #54340 (DateTime::add() method bug). (Adam)

Modified: php/php-src/branches/PHP_5_3/main/main.c
===
--- php/php-src/branches/PHP_5_3/main/main.c2011-03-24 12:35:17 UTC (rev 
309646)
+++ php/php-src/branches/PHP_5_3/main/main.c2011-03-24 12:57:38 UTC (rev 
309647)
@@ -908,9 +908,11 @@
if (display) {
if (PG(last_error_message)) {
free(PG(last_error_message));
+   PG(last_error_message) = NULL;
}
if (PG(last_error_file)) {
free(PG(last_error_file));
+   PG(last_error_file) = NULL;
}
if (!error_filename) {
error_filename = Unknown;

Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c   2011-03-24 12:35:17 UTC (rev 309646)
+++ php/php-src/trunk/main/main.c   2011-03-24 12:57:38 UTC (rev 309647)
@@ -880,9 +880,11 @@
if (display) {
if (PG(last_error_message)) {
free(PG(last_error_message));
+   PG(last_error_message) = NULL;
}
if (PG(last_error_file)) {
free(PG(last_error_file));
+   PG(last_error_file) = NULL;
}
if (!error_filename) {
error_filename = Unknown;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/main.c trunk/main/main.c

2010-11-10 Thread Kalle Sommer Nielsen 
kalleThu, 11 Nov 2010 01:43:53 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=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.c2010-11-11 01:01:56 UTC (rev 
305265)
+++ php/php-src/branches/PHP_5_3/main/main.c2010-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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php