zeev Wed Feb 25 05:58:07 2004 EDT
Modified files:
/php-src php.ini-dist php.ini-recommended
/php-src/main main.c
Log:
- Rename compatiblity mode to zend.ze2_compatibility_mode (it doesn't only
affect auto-clone).
- Perform implementation checks even with simple inheritance (off when
compatibility mode is enabled).
- Restore default arguments in interfaces and handle it correctly.
- Move registration of internal classes later in the startup sequence
in order to have INI options available.
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.206&r2=1.207&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.206 php-src/php.ini-dist:1.207
--- php-src/php.ini-dist:1.206 Mon Feb 9 19:02:37 2004
+++ php-src/php.ini-dist Wed Feb 25 05:58:05 2004
@@ -67,7 +67,10 @@
; Enable the PHP scripting language engine under Apache.
engine = On
-; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized.
+; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
+zend.ze1_compatibility_mode = Off
+
+; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized.
; NOTE: Using short tags should be avoided when developing applications or
; libraries that are meant for redistribution, or deployment on PHP
; servers which are not under your control, because short tags may not
@@ -99,18 +102,18 @@
; Setting any output handler automatically turns on output buffering.
; Note: People who wrote portable scripts should not depend on this ini
; directive. Instead, explicitly set the output handler using ob_start().
-; Using this ini directive may cause problems unless you know what script
+; Using this ini directive may cause problems unless you know what script
; is doing.
; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-; and you cannot use both "ob_gzhandler" and "zlib.output_compression".
+; and you cannot use both "ob_gzhandler" and "zlib.output_compression".
;output_handler =
; Transparent output compression using the zlib library
; Valid values for this option are 'off', 'on', or a specific buffer size
; to be used for compression (default is 4KB)
-; Note: Resulting chunk size may vary due to nature of compression. PHP
-; outputs chunks that are few hundreds bytes each as a result of
-; compression. If you prefer a larger chunk size for better
+; Note: Resulting chunk size may vary due to nature of compression. PHP
+; outputs chunks that are few hundreds bytes each as a result of
+; compression. If you prefer a larger chunk size for better
; performance, enable output_buffering in addition.
; Note: You need to use zlib.output_handler instead of the standard
; output_handler, or otherwise the output will be corrupted.
@@ -133,7 +136,7 @@
; which should be instanciated.
; A warning appears if the specified function is not defined, or if the
; function doesn't include/implement the missing class.
-; So only set this entry, if you really want to implement such a
+; So only set this entry, if you really want to implement such a
; callback-function.
unserialize_callback_func=
@@ -166,7 +169,7 @@
; including files from this directory and its subdirectories.
; (directory must also be in include_path or full path must
; be used when including)
-safe_mode_include_dir =
+safe_mode_include_dir =
; When safe_mode is on, only executables located in the safe_mode_exec_dir
; will be allowed to be executed via the exec family of functions.
@@ -297,13 +300,13 @@
; line until ignore_repeated_source is set true.
ignore_repeated_errors = Off
-; Ignore source of message when ignoring repeated messages. When this setting
+; Ignore source of message when ignoring repeated messages. When this setting
; is On you will not log errors with repeated messages from different files or
; sourcelines.
ignore_repeated_source = Off
; If this parameter is set to Off, then memory leaks will not be shown (on
-; stdout or in the log). This has only effect in a debug compile, and if
+; stdout or in the log). This has only effect in a debug compile, and if
; error reporting includes E_WARNING in the allowed list
report_memleaks = On
@@ -313,17 +316,17 @@
; Disable the inclusion of HTML tags in error messages.
; Note: Never use this feature for production boxes.
;html_errors = Off
-
-; If html_errors is set On PHP produces clickable error messages that direct
+
+; If html_errors is set On PHP produces clickable error messages that direct
; to a page describing the error or function causing the error in detail.
-; You can download a copy of the PHP manual from http://www.php.net/docs.php
+; You can download a copy of the PHP manual from http://www.php.net/docs.php
; and change docref_root to the base URL of your local copy including the
-; leading '/'. You must also specify the file extension being used including
+; leading '/'. You must also specify the file extension being used including
; the dot.
; Note: Never use this feature for production boxes.
;docref_root = "/phpmanual/"
;docref_ext = .html
-
+
; String to output before an error message.
;error_prepend_string = "<font color=ff0000>"
@@ -344,11 +347,11 @@
; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
; The separator used in PHP generated URLs to separate arguments.
-; Default is "&".
+; Default is "&".
;arg_separator.output = "&"
; List of separator(s) used by PHP to parse input URLs into variables.
-; Default is "&".
+; Default is "&".
; NOTE: Every character in this directive is considered as separator!
;arg_separator.input = ";&"
@@ -389,7 +392,7 @@
magic_quotes_gpc = On
; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-magic_quotes_runtime = Off
+magic_quotes_runtime = Off
; Use Sybase-style magic quotes (escape ' with '' instead of \').
magic_quotes_sybase = Off
@@ -414,7 +417,7 @@
; Paths and Directories ;
;;;;;;;;;;;;;;;;;;;;;;;;;
-; UNIX: "/path1:/path2"
+; UNIX: "/path1:/path2"
;include_path = ".:/php/includes"
;
; Windows: "\path1;\path2"
@@ -449,7 +452,7 @@
; every request.
; cgi.nph = 1
-; if cgi.force_redirect is turned on, and you are not running under Apache or
Netscape
+; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
; will look for to know it is OK to continue execution. Setting this variable MAY
; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
@@ -467,8 +470,8 @@
; is supported by Apache. When this option is set to 1 PHP will send
; RFC2616 compliant header.
; Default is zero.
-;cgi.rfc2616_headers = 0
-
+;cgi.rfc2616_headers = 0
+
;;;;;;;;;;;;;;;;
; File Uploads ;
@@ -526,7 +529,7 @@
;
; extension=msql.so
;
-; Note that it should be the name of the module only; no directory information
+; Note that it should be the name of the module only; no directory information
; needs to go here. Specify the location of the extension with the
; extension_dir directive above.
@@ -605,9 +608,9 @@
;sendmail_path =
; Force the addition of the specified parameters to be passed as extra parameters
-; to the sendmail binary. These parameters will always replace the value of
+; to the sendmail binary. These parameters will always replace the value of
; the 5th parameter to mail(), even in safe mode.
-;mail.force_extra_paramaters =
+;mail.force_extra_paramaters =
[SQL]
sql.safe_mode = Off
@@ -627,16 +630,16 @@
odbc.max_persistent = -1
; Maximum number of links (persistent + non-persistent). -1 means no limit.
-odbc.max_links = -1
+odbc.max_links = -1
; Handling of LONG fields. Returns number of bytes to variables. 0 means
; passthru.
-odbc.defaultlrl = 4096
+odbc.defaultlrl = 4096
; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char.
; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
; of uodbc.defaultlrl and uodbc.defaultbinmode
-odbc.defaultbinmode = 1
+odbc.defaultbinmode = 1
[MySQL]
; Allow or prevent persistent links.
@@ -693,7 +696,7 @@
pgsql.allow_persistent = On
; Detect broken persistent links always with pg_pconnect(). Need a little overhead.
-pgsql.auto_reset_persistent = Off
+pgsql.auto_reset_persistent = Off
; Maximum number of persistent links. -1 means no limit.
pgsql.max_persistent = -1
@@ -808,17 +811,17 @@
session.save_handler = files
; Argument passed to save_handler. In the case of files, this is the path
-; where data files are stored. Note: Windows users have to change this
+; where data files are stored. Note: Windows users have to change this
; variable in order to use PHP's session functions.
;
; As of PHP 4.0.1, you can define the path as:
;
; session.save_path = "N;/path"
;
-; where N is an integer. Instead of storing all the session files in
-; /path, what this will do is use subdirectories N-levels deep, and
-; store the session data in those directories. This is useful if you
-; or your OS have problems with lots of files in one directory, and is
+; where N is an integer. Instead of storing all the session files in
+; /path, what this will do is use subdirectories N-levels deep, and
+; store the session data in those directories. This is useful if you
+; or your OS have problems with lots of files in one directory, and is
; a more efficient layout for servers that handle lots of sessions.
;
; NOTE 1: PHP will not create this directory structure automatically.
@@ -828,7 +831,7 @@
;
; The file storage module creates files using mode 600 by default.
; You can change that by using
-;
+;
; session.save_path = "N;MODE;/path"
;
; where MODE is the octal representation of the mode. Note that this
@@ -875,8 +878,8 @@
; NOTE: If you are using the subdirectory option for storing session files
; (see session.save_path above), then garbage collection does *not*
-; happen automatically. You will need to do your own garbage
-; collection through a shell script, cron entry, or some other method.
+; happen automatically. You will need to do your own garbage
+; collection through a shell script, cron entry, or some other method.
; For example, the following script would is the equivalent of
; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
; cd /path/to/sessions; find -cmin +24 | xargs rm
@@ -913,7 +916,7 @@
session.cache_expire = 180
; trans sid support is disabled by default.
-; Use of trans sid may risk your users security.
+; Use of trans sid may risk your users security.
; Use this option with caution.
; - User may send URL contains active session ID
; to other person via. email/irc/etc.
@@ -1052,7 +1055,7 @@
[com]
; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-;com.typelib_file =
+;com.typelib_file =
; allow Distributed-COM calls
;com.allow_dcom = true
; autoregister constants of a components typlib on com_load()
@@ -1078,7 +1081,7 @@
; registered as output buffer to function
;mbstring.http_output = SJIS
-; enable automatic encoding translation accoding to
+; enable automatic encoding translation accoding to
; mbstring.internal_encoding setting. Input chars are
; converted to internal encoding by setting this to On.
; Note: Do _not_ use automatic encoding translation for
@@ -1086,7 +1089,7 @@
;mbstring.encoding_translation = Off
; automatic encoding detection order.
-; auto means
+; auto means
;mbstring.detect_order = auto
; substitute_character used when character cannot be converted
@@ -1106,7 +1109,7 @@
[FrontBase]
;fbsql.allow_persistent = On
;fbsql.autocommit = On
-;fbsql.default_database =
+;fbsql.default_database =
;fbsql.default_database_password =
;fbsql.default_host =
;fbsql.default_password =
@@ -1119,15 +1122,15 @@
;fbsql.batchSize = 1000
[exif]
-; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
+; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
; With mbstring support this will automatically be converted into the encoding
-; given by corresponding encode setting. When empty mbstring.internal_encoding
-; is used. For the decode settings you can distinguish between motorola and
+; given by corresponding encode setting. When empty mbstring.internal_encoding
+; is used. For the decode settings you can distinguish between motorola and
; intel byte order. A decode setting cannot be empty.
;exif.encode_unicode = ISO-8859-15
;exif.decode_unicode_motorola = UCS-2BE
;exif.decode_unicode_intel = UCS-2LE
-;exif.encode_jis =
+;exif.encode_jis =
;exif.decode_jis_motorola = JIS
;exif.decode_jis_intel = JIS
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.151&r2=1.152&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.151 php-src/php.ini-recommended:1.152
--- php-src/php.ini-recommended:1.151 Mon Feb 9 19:02:38 2004
+++ php-src/php.ini-recommended Wed Feb 25 05:58:05 2004
@@ -80,7 +80,10 @@
; Enable the PHP scripting language engine under Apache.
engine = On
-; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized.
+; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
+zend.ze1_compatibility_mode = Off
+
+; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized.
; NOTE: Using short tags should be avoided when developing applications or
; libraries that are meant for redistribution, or deployment on PHP
; servers which are not under your control, because short tags may not
@@ -112,19 +115,19 @@
; Setting any output handler automatically turns on output buffering.
; Note: People who wrote portable scripts should not depend on this ini
; directive. Instead, explicitly set the output handler using ob_start().
-; Using this ini directive may cause problems unless you know what script
+; Using this ini directive may cause problems unless you know what script
; is doing.
; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-; and you cannot use both "ob_gzhandler" and "zlib.output_compression".
+; and you cannot use both "ob_gzhandler" and "zlib.output_compression".
;output_handler =
; Transparent output compression using the zlib library
; Valid values for this option are 'off', 'on', or a specific buffer size
; to be used for compression (default is 4KB)
-; Note: Resulting chunk size may vary due to nature of compression. PHP
-; outputs chunks that are few handreds bytes each as a result of compression.
-; If you want larger chunk size for better performence, enable output_buffering
-; also.
+; Note: Resulting chunk size may vary due to nature of compression. PHP
+; outputs chunks that are few handreds bytes each as a result of compression.
+; If you want larger chunk size for better performence, enable output_buffering
+; also.
; Note: output_handler must be empty if this is set 'On' !!!!
; Instead you must use zlib.output_handler.
zlib.output_compression = Off
@@ -146,7 +149,7 @@
; which should be instanciated.
; A warning appears if the specified function is not defined, or if the
; function doesn't include/implement the missing class.
-; So only set this entry, if you really want to implement such a
+; So only set this entry, if you really want to implement such a
; callback-function.
unserialize_callback_func=
@@ -180,7 +183,7 @@
; including files from this directory and its subdirectories.
; (directory must also be in include_path or full path must
; be used when including)
-safe_mode_include_dir =
+safe_mode_include_dir =
; When safe_mode is on, only executables located in the safe_mode_exec_dir
; will be allowed to be executed via the exec family of functions.
@@ -316,13 +319,13 @@
; line until ignore_repeated_source is set true.
ignore_repeated_errors = Off
-; Ignore source of message when ignoring repeated messages. When this setting
+; Ignore source of message when ignoring repeated messages. When this setting
; is On you will not log errors with repeated messages from different files or
; sourcelines.
ignore_repeated_source = Off
; If this parameter is set to Off, then memory leaks will not be shown (on
-; stdout or in the log). This has only effect in a debug compile, and if
+; stdout or in the log). This has only effect in a debug compile, and if
; error reporting includes E_WARNING in the allowed list
report_memleaks = On
@@ -333,16 +336,16 @@
; Note: Never use this feature for production boxes.
;html_errors = Off
-; If html_errors is set On PHP produces clickable error messages that direct
+; If html_errors is set On PHP produces clickable error messages that direct
; to a page describing the error or function causing the error in detail.
-; You can download a copy of the PHP manual from http://www.php.net/docs.php
+; You can download a copy of the PHP manual from http://www.php.net/docs.php
; and change docref_root to the base URL of your local copy including the
-; leading '/'. You must also specify the file extension being used including
+; leading '/'. You must also specify the file extension being used including
; the dot.
; Note: Never use this feature for production boxes.
;docref_root = "/phpmanual/"
;docref_ext = .html
-
+
; String to output before an error message.
;error_prepend_string = "<font color=ff0000>"
@@ -363,11 +366,11 @@
; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
; The separator used in PHP generated URLs to separate arguments.
-; Default is "&".
+; Default is "&".
;arg_separator.output = "&"
; List of separator(s) used by PHP to parse input URLs into variables.
-; Default is "&".
+; Default is "&".
; NOTE: Every character in this directive is considered as separator!
;arg_separator.input = ";&"
@@ -408,7 +411,7 @@
magic_quotes_gpc = Off
; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-magic_quotes_runtime = Off
+magic_quotes_runtime = Off
; Use Sybase-style magic quotes (escape ' with '' instead of \').
magic_quotes_sybase = Off
@@ -425,7 +428,7 @@
default_mimetype = "text/html"
;default_charset = "iso-8859-1"
-; Always populate the $HTTP_RAW_POST_DATA variable.
+; Always populate the $HTTP_RAW_POST_DATA variable.
;always_populate_raw_post_data = On
@@ -433,7 +436,7 @@
; Paths and Directories ;
;;;;;;;;;;;;;;;;;;;;;;;;;
-; UNIX: "/path1:/path2"
+; UNIX: "/path1:/path2"
;include_path = ".:/php/includes"
;
; Windows: "\path1;\path2"
@@ -468,7 +471,7 @@
; every request.
; cgi.nph = 1
-; if cgi.force_redirect is turned on, and you are not running under Apache or
Netscape
+; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
; will look for to know it is OK to continue execution. Setting this variable MAY
; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
@@ -486,7 +489,7 @@
; is supported by Apache. When this option is set to 1 PHP will send
; RFC2616 compliant header.
; Default is zero.
-;cgi.rfc2616_headers = 0
+;cgi.rfc2616_headers = 0
;;;;;;;;;;;;;;;;
@@ -545,7 +548,7 @@
;
; extension=msql.so
;
-; Note that it should be the name of the module only; no directory information
+; Note that it should be the name of the module only; no directory information
; needs to go here. Specify the location of the extension with the
; extension_dir directive above.
@@ -625,9 +628,9 @@
;sendmail_path =
; Force the addition of the specified parameters to be passed as extra parameters
-; to the sendmail binary. These parameters will always replace the value of
+; to the sendmail binary. These parameters will always replace the value of
; the 5th parameter to mail(), even in safe mode.
-;mail.force_extra_paramaters =
+;mail.force_extra_paramaters =
[SQL]
sql.safe_mode = Off
@@ -647,16 +650,16 @@
odbc.max_persistent = -1
; Maximum number of links (persistent + non-persistent). -1 means no limit.
-odbc.max_links = -1
+odbc.max_links = -1
; Handling of LONG fields. Returns number of bytes to variables. 0 means
; passthru.
-odbc.defaultlrl = 4096
+odbc.defaultlrl = 4096
; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char.
; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
; of uodbc.defaultlrl and uodbc.defaultbinmode
-odbc.defaultbinmode = 1
+odbc.defaultbinmode = 1
[MySQL]
; Allow or prevent persistent links.
@@ -712,7 +715,7 @@
; Allow or prevent persistent links.
pgsql.allow_persistent = On
-; Detect broken persistent links always with pg_pconnect().
+; Detect broken persistent links always with pg_pconnect().
; Auto reset feature requires a little overheads.
pgsql.auto_reset_persistent = Off
@@ -860,7 +863,7 @@
; Whether to use cookies.
session.use_cookies = 1
-; This option enables administrators to make their users invulnerable to
+; This option enables administrators to make their users invulnerable to
; attacks which involve passing session ids in URLs; defaults to 0.
; session.use_only_cookies = 1
@@ -932,7 +935,7 @@
; - User may send URL contains active session ID
; to other person via. email/irc/etc.
; - URL that contains active session ID may be stored
-; in publically accessible computer.
+; in publically accessible computer.
; - User may access your site with the same session ID
; always using URL stored in browser's history or bookmarks.
session.use_trans_sid = 0
@@ -1066,7 +1069,7 @@
[com]
; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-;com.typelib_file =
+;com.typelib_file =
; allow Distributed-COM calls
;com.allow_dcom = true
; autoregister constants of a components typlib on com_load()
@@ -1092,7 +1095,7 @@
; registered as output buffer to function
;mbstring.http_output = SJIS
-; enable automatic encoding translation accoding to
+; enable automatic encoding translation accoding to
; mbstring.internal_encoding setting. Input chars are
; converted to internal encoding by setting this to On.
; Note: Do _not_ use automatic encoding translation for
@@ -1100,7 +1103,7 @@
;mbstring.encoding_translation = Off
; automatic encoding detection order.
-; auto means
+; auto means
;mbstring.detect_order = auto
; substitute_character used when character cannot be converted
@@ -1120,7 +1123,7 @@
[FrontBase]
;fbsql.allow_persistent = On
;fbsql.autocommit = On
-;fbsql.default_database =
+;fbsql.default_database =
;fbsql.default_database_password =
;fbsql.default_host =
;fbsql.default_password =
@@ -1133,15 +1136,15 @@
;fbsql.batchSize = 1000
[exif]
-; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
+; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
; With mbstring support this will automatically be converted into the encoding
-; given by corresponding encode setting. When empty mbstring.internal_encoding
-; is used. For the decode settings you can distinguish between motorola and
+; given by corresponding encode setting. When empty mbstring.internal_encoding
+; is used. For the decode settings you can distinguish between motorola and
; intel byte order. A decode setting cannot be empty.
;exif.encode_unicode = ISO-8859-15
;exif.decode_unicode_motorola = UCS-2BE
;exif.decode_unicode_intel = UCS-2LE
-;exif.encode_jis =
+;exif.encode_jis =
;exif.decode_jis_motorola = JIS
;exif.decode_jis_intel = JIS
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.594&r2=1.595&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.594 php-src/main/main.c:1.595
--- php-src/main/main.c:1.594 Tue Feb 24 10:13:13 2004
+++ php-src/main/main.c Wed Feb 25 05:58:06 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.594 2004/02/24 15:13:13 zeev Exp $ */
+/* $Id: main.c,v 1.595 2004/02/25 10:58:06 zeev Exp $ */
/* {{{ includes
*/
@@ -1459,11 +1459,15 @@
return FAILURE;
}
+ /* Register internal Zend classes */
+ zend_register_default_classes(TSRMLS_C);
+
/* startup extensions staticly compiled in */
if (php_startup_internal_extensions() == FAILURE) {
php_printf("Unable to start builtin modules\n");
return FAILURE;
}
+
/* start additional PHP extensions */
php_startup_extensions(&additional_modules, num_additional_modules);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
