[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /main main.c

2009-07-07 Thread Jani Taskinen 
janiTue Jul  7 16:42:12 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/main   main.c 
  Log:
  - Fixed bug #48247 (Infinite loop and possible crash during startup with 
errors)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.668&r2=1.2027.2.547.2.965.2.669&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.668 
php-src/NEWS:1.2027.2.547.2.965.2.669
--- php-src/NEWS:1.2027.2.547.2.965.2.668   Tue Jul  7 15:17:36 2009
+++ php-src/NEWSTue Jul  7 16:42:11 2009
@@ -1,7 +1,6 @@
 PHPNEWS
 |||
 ?? ??? 2009, PHP 5.3.1
-
 - Fixed spl_autoload_unregister/spl_autoad_functions wrt. Closures and
   Functors. (Christian Seiler)
 
@@ -14,7 +13,9 @@
   components). (Ilia)
 - Fixed bug #48681 (openssl signature verification for tar archives broken).
   (Greg)
-- Fixed #48116 (Fixed build with Openssl 1.0). (Pierre, 
+- Fixed bug #48247 (Infinite loop and possible crash during startup with
+  errors when errors are logged). (Jani)
+- Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre, 
   Al dot Smith at aeschi dot ch dot eu dot org)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
 - Fixed bug #45905 (imagefilledrectangle() clipping error).
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.55&r2=1.640.2.23.2.57.2.56&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.55 
php-src/main/main.c:1.640.2.23.2.57.2.56
--- php-src/main/main.c:1.640.2.23.2.57.2.55Thu Jun  4 07:41:01 2009
+++ php-src/main/main.c Tue Jul  7 16:42:11 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.55 2009/06/04 07:41:01 pajoye Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.56 2009/07/07 16:42:11 jani Exp $ */
 
 /* {{{ includes
  */
@@ -516,6 +516,20 @@
 static int module_startup = 1;
 static int module_shutdown = 0;
 
+/* {{{ php_during_module_startup */
+static int php_during_module_startup(void)
+{
+   return module_startup;
+}
+/* }}} */
+
+/* {{{ php_during_module_shutdown */
+static int php_during_module_shutdown(void)
+{
+   return module_shutdown;
+}
+/* }}} */
+
 /* {{{ php_log_err
  */
 PHPAPI void php_log_err(char *log_message TSRMLS_DC)
@@ -538,7 +552,7 @@
char *error_time_str;
 
time(&error_time);
-   error_time_str = php_format_date("d-M-Y H:i:s", 11, 
error_time, 1 TSRMLS_CC);
+   error_time_str = php_format_date("d-M-Y H:i:s", 11, 
error_time, php_during_module_startup() TSRMLS_CC);
len = spprintf(&tmp, 0, "[%s] %s%s", error_time_str, 
log_message, PHP_EOL);
 #ifdef PHP_WIN32
php_flock(fd, 2);
@@ -587,24 +601,6 @@
 }
 /* }}} */
 
-/* {{{ php_verror helpers */
-
-/* {{{ php_during_module_startup */
-static int php_during_module_startup(void)
-{
-   return module_startup;
-}
-/* }}} */
-
-/* {{{ php_during_module_shutdown */
-static int php_during_module_shutdown(void)
-{
-   return module_shutdown;
-}
-/* }}} */
-
-/* }}} */
-
 /* {{{ php_verror */
 /* php_verror is called from php_error_docref functions.
  * Its purpose is to unify error messages and automatically generate clickable



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /main main.c

2009-04-28 Thread Jani Taskinen 


In that bug report the user said PHP 5.2.9 is also affected. So can you please 
MFH there too? :)


--Jani



Dmitry Stogov kirjoitti:

dmitry  Tue Apr 28 07:13:31 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src	NEWS 
/php-src/main	main.c 
  Log:

  Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.570&r2=1.2027.2.547.2.965.2.571&diff_format=u

Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.570 
php-src/NEWS:1.2027.2.547.2.965.2.571
--- php-src/NEWS:1.2027.2.547.2.965.2.570   Mon Apr 27 18:45:12 2009
+++ php-src/NEWSTue Apr 28 07:13:30 2009
@@ -17,6 +17,7 @@
 
 - Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)

 - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
+- Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long). (Dmitry)
 - Fixed bug #48023 (spl_autoload_register didn't store closures). (Etienne)
 - Fixed bug #48004 (Error handler prevents creation of default object).
   (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.47&r2=1.640.2.23.2.57.2.48&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.47 
php-src/main/main.c:1.640.2.23.2.57.2.48
--- php-src/main/main.c:1.640.2.23.2.57.2.47Fri Mar 27 02:34:06 2009
+++ php-src/main/main.c Tue Apr 28 07:13:30 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.47 2009/03/27 02:34:06 lbarnaud Exp $ */

+/* $Id: main.c,v 1.640.2.23.2.57.2.48 2009/04/28 07:13:30 dmitry Exp $ */
 
 /* {{{ includes

  */
@@ -89,6 +89,13 @@
 
 #include "SAPI.h"

 #include "rfc1867.h"
+
+#if HAVE_SYS_MMAN_H
+# include 
+# ifndef PAGE_SIZE
+#  define PAGE_SIZE 4096
+# endif
+#endif
 /* }}} */
 
 PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions;

@@ -1134,8 +1141,10 @@
handle->handle.stream.isatty  = 0;
/* can we mmap immeadiately? */
memset(&handle->handle.stream.mmap, 0, 
sizeof(handle->handle.stream.mmap));
-   len = php_zend_stream_fsizer(stream TSRMLS_CC) + 
ZEND_MMAP_AHEAD;
-   if (php_stream_mmap_possible(stream)
+   len = php_zend_stream_fsizer(stream TSRMLS_CC);
+   if (len != 0
+   && ((len - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD
+   && php_stream_mmap_possible(stream)
&& (p = php_stream_mmap_range(stream, 0, len, 
PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped_len)) != NULL) {
handle->handle.stream.closer   = 
php_zend_stream_mmap_closer;
handle->handle.stream.mmap.buf = p;






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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /main main.c

2009-04-28 Thread Dmitry Stogov 

Hi,

This patch should be removed when re2c EOF handling issue will be resolved.

Thanks. Dmitry.

Dmitry Stogov wrote:

dmitry  Tue Apr 28 07:13:31 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src	NEWS 
/php-src/main	main.c 
  Log:

  Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.570&r2=1.2027.2.547.2.965.2.571&diff_format=u

Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.570 
php-src/NEWS:1.2027.2.547.2.965.2.571
--- php-src/NEWS:1.2027.2.547.2.965.2.570   Mon Apr 27 18:45:12 2009
+++ php-src/NEWSTue Apr 28 07:13:30 2009
@@ -17,6 +17,7 @@
 
 - Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)

 - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
+- Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long). (Dmitry)
 - Fixed bug #48023 (spl_autoload_register didn't store closures). (Etienne)
 - Fixed bug #48004 (Error handler prevents creation of default object).
   (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.47&r2=1.640.2.23.2.57.2.48&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.47 
php-src/main/main.c:1.640.2.23.2.57.2.48
--- php-src/main/main.c:1.640.2.23.2.57.2.47Fri Mar 27 02:34:06 2009
+++ php-src/main/main.c Tue Apr 28 07:13:30 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.47 2009/03/27 02:34:06 lbarnaud Exp $ */

+/* $Id: main.c,v 1.640.2.23.2.57.2.48 2009/04/28 07:13:30 dmitry Exp $ */
 
 /* {{{ includes

  */
@@ -89,6 +89,13 @@
 
 #include "SAPI.h"

 #include "rfc1867.h"
+
+#if HAVE_SYS_MMAN_H
+# include 
+# ifndef PAGE_SIZE
+#  define PAGE_SIZE 4096
+# endif
+#endif
 /* }}} */
 
 PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions;

@@ -1134,8 +1141,10 @@
handle->handle.stream.isatty  = 0;
/* can we mmap immeadiately? */
memset(&handle->handle.stream.mmap, 0, 
sizeof(handle->handle.stream.mmap));
-   len = php_zend_stream_fsizer(stream TSRMLS_CC) + 
ZEND_MMAP_AHEAD;
-   if (php_stream_mmap_possible(stream)
+   len = php_zend_stream_fsizer(stream TSRMLS_CC);
+   if (len != 0
+   && ((len - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD
+   && php_stream_mmap_possible(stream)
&& (p = php_stream_mmap_range(stream, 0, len, 
PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped_len)) != NULL) {
handle->handle.stream.closer   = 
php_zend_stream_mmap_closer;
handle->handle.stream.mmap.buf = p;





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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /main main.c

2009-04-28 Thread Dmitry Stogov 
dmitry  Tue Apr 28 07:13:31 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/main   main.c 
  Log:
  Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.570&r2=1.2027.2.547.2.965.2.571&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.570 
php-src/NEWS:1.2027.2.547.2.965.2.571
--- php-src/NEWS:1.2027.2.547.2.965.2.570   Mon Apr 27 18:45:12 2009
+++ php-src/NEWSTue Apr 28 07:13:30 2009
@@ -17,6 +17,7 @@
 
 - Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)
 - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
+- Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long). (Dmitry)
 - Fixed bug #48023 (spl_autoload_register didn't store closures). (Etienne)
 - Fixed bug #48004 (Error handler prevents creation of default object).
   (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.47&r2=1.640.2.23.2.57.2.48&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.47 
php-src/main/main.c:1.640.2.23.2.57.2.48
--- php-src/main/main.c:1.640.2.23.2.57.2.47Fri Mar 27 02:34:06 2009
+++ php-src/main/main.c Tue Apr 28 07:13:30 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.47 2009/03/27 02:34:06 lbarnaud Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.48 2009/04/28 07:13:30 dmitry Exp $ */
 
 /* {{{ includes
  */
@@ -89,6 +89,13 @@
 
 #include "SAPI.h"
 #include "rfc1867.h"
+
+#if HAVE_SYS_MMAN_H
+# include 
+# ifndef PAGE_SIZE
+#  define PAGE_SIZE 4096
+# endif
+#endif
 /* }}} */
 
 PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = 
php_register_internal_extensions;
@@ -1134,8 +1141,10 @@
handle->handle.stream.isatty  = 0;
/* can we mmap immeadiately? */
memset(&handle->handle.stream.mmap, 0, 
sizeof(handle->handle.stream.mmap));
-   len = php_zend_stream_fsizer(stream TSRMLS_CC) + 
ZEND_MMAP_AHEAD;
-   if (php_stream_mmap_possible(stream)
+   len = php_zend_stream_fsizer(stream TSRMLS_CC);
+   if (len != 0
+   && ((len - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD
+   && php_stream_mmap_possible(stream)
&& (p = php_stream_mmap_range(stream, 0, len, 
PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped_len)) != NULL) {
handle->handle.stream.closer   = 
php_zend_stream_mmap_closer;
handle->handle.stream.mmap.buf = p;



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /main main.c

2008-09-16 Thread Ilia Alshanetsky 
iliaa   Wed Sep 17 00:20:30 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   main.c 
/php-srcNEWS 
  Log:
  
  Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit).
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.33&r2=1.640.2.23.2.57.2.34&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.33 
php-src/main/main.c:1.640.2.23.2.57.2.34
--- php-src/main/main.c:1.640.2.23.2.57.2.33Tue Sep  2 09:45:49 2008
+++ php-src/main/main.c Wed Sep 17 00:20:29 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.33 2008/09/02 09:45:49 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.34 2008/09/17 00:20:29 iliaa Exp $ */
 
 /* {{{ includes
  */
@@ -1478,7 +1478,12 @@
 
/* 3. Flush all output buffers */
zend_try {
-   
php_end_ob_buffers((zend_bool)(SG(request_info).headers_only?0:1) TSRMLS_CC);
+   zend_bool send_buffer = SG(request_info).headers_only ? 0 : 1;
+   if (CG(unclean_shutdown) && PG(last_error_type) == E_ERROR &&
+   !OG(active_ob_buffer).chunk_size && 
PG(memory_limit) < zend_memory_usage(1 TSRMLS_CC)) {
+   send_buffer = 0;
+   }
+   php_end_ob_buffers(send_buffer TSRMLS_CC);
} zend_end_try();
 
/* 4. Send the set HTTP headers (note: This must be done AFTER 
php_end_ob_buffers() !!) */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.320&r2=1.2027.2.547.2.965.2.321&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.320 
php-src/NEWS:1.2027.2.547.2.965.2.321
--- php-src/NEWS:1.2027.2.547.2.965.2.320   Tue Sep 16 23:02:16 2008
+++ php-src/NEWSWed Sep 17 00:20:30 2008
@@ -19,6 +19,7 @@
 - Fixed bug #45928 (large scripts from stdin are stripped at 16K border).
   (Christian Schneider, Arnaud)
 - Fixed bug #45911 (Cannot disable ext/hash). (Arnaud)
+- Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit). (Ilia)
 - Fixed bug #45382 (timeout bug in stream_socket_enable_crypto).
   (vnegrier at optilian dot com, Ilia
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /main main.c

2008-08-23 Thread Pierre-Alain Joye 
pajoye  Sat Aug 23 17:55:54 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/main   main.c 
  Log:
  - MFH: expose MAXPATHLEN (PHP_MAXPATHLEN)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.283&r2=1.2027.2.547.2.965.2.284&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.283 
php-src/NEWS:1.2027.2.547.2.965.2.284
--- php-src/NEWS:1.2027.2.547.2.965.2.283   Wed Aug 20 20:35:34 2008
+++ php-src/NEWSSat Aug 23 17:55:50 2008
@@ -18,6 +18,7 @@
 - Added stream_context_set_default() function. (Davey Shafik)
 - Added optional "is_xhtml" parameter to nl2br() which makes the function
   output  when false and  when true (FR #34381). (Kalle)
+- Added PHP_MAXPATHLEN constant (maximum length of a path). (Pierre)
 
 - Improved Windows support and portability for stat(), touch(), filemtime(),
   filesize() and related functions. (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.30&r2=1.640.2.23.2.57.2.31&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.30 
php-src/main/main.c:1.640.2.23.2.57.2.31
--- php-src/main/main.c:1.640.2.23.2.57.2.30Fri Aug 22 12:59:46 2008
+++ php-src/main/main.c Sat Aug 23 17:55:50 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.30 2008/08/22 12:59:46 helly Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.31 2008/08/23 17:55:50 pajoye Exp $ */
 
 /* {{{ includes
  */
@@ -1799,6 +1799,7 @@
REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", 
PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT 
| CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, 
sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, 
CONST_PERSISTENT | CONST_CS);
+   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);
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /main main.c

2008-02-15 Thread Pierre-Alain Joye 
pajoye  Fri Feb 15 14:51:39 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/main   main.c 
  Log:
  - [DOC] add PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION,
PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.113&r2=1.2027.2.547.2.965.2.114&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.113 
php-src/NEWS:1.2027.2.547.2.965.2.114
--- php-src/NEWS:1.2027.2.547.2.965.2.113   Fri Feb 15 12:48:13 2008
+++ php-src/NEWSFri Feb 15 14:51:39 2008
@@ -11,6 +11,8 @@
 (Etienne Kneuss)
   . Improved checks for callbacks. (Marcus)
   . Added __DIR__ constant. (Lars Strojny)
+  . Added PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION,
+PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants (Pierre)
 
 - Added new date/time functionality: (Derick)
   . date_parse_from_format(): Parse date/time strings according to a format.
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.8&r2=1.640.2.23.2.57.2.9&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.8 
php-src/main/main.c:1.640.2.23.2.57.2.9
--- php-src/main/main.c:1.640.2.23.2.57.2.8 Mon Feb  4 20:39:21 2008
+++ php-src/main/main.c Fri Feb 15 14:51:39 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.8 2008/02/04 20:39:21 jani Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.9 2008/02/15 14:51:39 pajoye Exp $ */
 
 /* {{{ includes
  */
@@ -1743,6 +1743,17 @@
 
/* Register constants */
REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION, 
sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS);
+   REGISTER_MAIN_LONG_CONSTANT("PHP_MAJOR_VERSION", PHP_MAJOR_VERSION, 
CONST_PERSISTENT | CONST_CS);
+   REGISTER_MAIN_LONG_CONSTANT("PHP_MINOR_VERSION", PHP_MINOR_VERSION, 
CONST_PERSISTENT | CONST_CS);
+   REGISTER_MAIN_LONG_CONSTANT("PHP_RELEASE_VERSION", PHP_RELEASE_VERSION, 
CONST_PERSISTENT | CONST_CS);
+   REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTRA_VERSION", PHP_EXTRA_VERSION, 
sizeof(PHP_EXTRA_VERSION) - 1, CONST_PERSISTENT | CONST_CS);
+   REGISTER_MAIN_LONG_CONSTANT("PHP_VERSION_ID", PHP_VERSION_ID, 
CONST_PERSISTENT | CONST_CS);
+#ifdef ZTS
+   REGISTER_MAIN_LONG_CONSTANT("PHP_ZTS", 1, CONST_PERSISTENT | CONST_CS);
+#else
+   REGISTER_MAIN_LONG_CONSTANT("PHP_ZTS", 0, CONST_PERSISTENT | CONST_CS);
+#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_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);

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