[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Kalle Sommer Nielsen]

kalle   Sun Mar  8 06:11:05 2009 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Fixed bug #47543 (irrelevant warning message)
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.290r2=1.291diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.290 php-src/php.ini-dist:1.291
--- php-src/php.ini-dist:1.290  Fri Feb 13 16:54:16 2009
+++ php-src/php.ini-distSun Mar  8 06:11:04 2009
@@ -673,7 +673,7 @@
 mail.add_x_header = Off
 
 ; Log all mail() calls including the full path of the script, line #, to 
address and headers
-mail.log =
+;mail.log =
 
 [SQL]
 sql.safe_mode = Off
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.241r2=1.242diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.241 php-src/php.ini-recommended:1.242
--- php-src/php.ini-recommended:1.241   Mon Mar  2 04:43:51 2009
+++ php-src/php.ini-recommended Sun Mar  8 06:11:04 2009
@@ -710,7 +710,7 @@
 mail.add_x_header = On
 
 ; Log all mail() calls including the full path of the script, line #, to 
address and headers
-mail.log =
+;mail.log =
 
 [SQL]
 sql.safe_mode = Off



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Kalle Sommer Nielsen]

kalle   Fri Feb 13 16:54:16 2009 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Revert previous change
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.289r2=1.290diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.289 php-src/php.ini-dist:1.290
--- php-src/php.ini-dist:1.289  Thu Feb 12 14:36:32 2009
+++ php-src/php.ini-distFri Feb 13 16:54:16 2009
@@ -251,11 +251,11 @@
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL | ~E_NOTICE | ~E_STRICT
+;error_reporting = E_ALL  ~E_NOTICE  ~E_STRICT
 ;
 ;   - Show all errors, except for notices
 ;
-;error_reporting = E_ALL | ~E_NOTICE
+;error_reporting = E_ALL  ~E_NOTICE
 ;
 ;   - Show only errors
 ;
@@ -263,7 +263,7 @@
 ;
 ;   - Show all errors, except coding standards warnings
 ;
-error_reporting  =  E_ALL | ~E_STRICT
+error_reporting  =  E_ALL  ~E_STRICT
 
 ; Print out errors (as a part of the output).  For production web sites,
 ; you're strongly encouraged to turn this feature off, and use error logging
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.239r2=1.240diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.239 php-src/php.ini-recommended:1.240
--- php-src/php.ini-recommended:1.239   Thu Feb 12 14:36:32 2009
+++ php-src/php.ini-recommended Fri Feb 13 16:54:16 2009
@@ -288,11 +288,11 @@
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL | ~E_NOTICE | ~E_STRICT
+;error_reporting = E_ALL  ~E_NOTICE  ~E_STRICT
 ;
 ;   - Show all errors, except for notices
 ;
-;error_reporting = E_ALL | ~E_NOTICE
+;error_reporting = E_ALL  ~E_NOTICE
 ;
 ;   - Show only errors
 ;
@@ -300,7 +300,7 @@
 ;
 ;   - Show all errors, except coding standards warnings
 ;
-error_reporting  =  E_ALL | ~E_STRICT
+error_reporting  =  E_ALL  ~E_STRICT
 
 ; Print out errors (as a part of the output).  For production web sites,
 ; you're strongly encouraged to turn this feature off, and use error logging



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Kalle Sommer Nielsen]

kalle   Thu Feb 12 14:36:32 2009 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Fixed wrong usage of error_reporting directive
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.288r2=1.289diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.288 php-src/php.ini-dist:1.289
--- php-src/php.ini-dist:1.288  Sat Jan 31 19:23:16 2009
+++ php-src/php.ini-distThu Feb 12 14:36:32 2009
@@ -222,7 +222,7 @@
 
 ; error_reporting is a bit-field.  Or each number up to get desired error
 ; reporting level
-; E_ALL - All errors and warnings (doesn't include E_STRICT)
+; E_ALL - All errors and warnings (includes E_STRICT)
 ; E_ERROR   - fatal run-time errors
 ; E_RECOVERABLE_ERROR - almost fatal run-time errors
 ; E_WARNING - run-time warnings (non-fatal errors)
@@ -232,7 +232,7 @@
 ; intentional (e.g., using an uninitialized variable and
 ; relying on the fact it's automatically initialized to an
 ; empty string)
-; E_STRICT - run-time notices, enable to have PHP suggest 
changes
+; E_STRICT - run-time notices, enable to have PHP suggest changes
 ; to your code which will ensure the best interoperability
 ; and forward compatibility of your code
 ; E_CORE_ERROR  - fatal errors that occur during PHP's initial startup
@@ -251,11 +251,11 @@
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL  ~E_NOTICE  ~E_STRICT
+;error_reporting = E_ALL | ~E_NOTICE | ~E_STRICT
 ;
 ;   - Show all errors, except for notices
 ;
-;error_reporting = E_ALL  ~E_NOTICE
+;error_reporting = E_ALL | ~E_NOTICE
 ;
 ;   - Show only errors
 ;
@@ -263,7 +263,7 @@
 ;
 ;   - Show all errors, except coding standards warnings
 ;
-error_reporting  =  E_ALL  ~E_STRICT
+error_reporting  =  E_ALL | ~E_STRICT
 
 ; Print out errors (as a part of the output).  For production web sites,
 ; you're strongly encouraged to turn this feature off, and use error logging
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.238r2=1.239diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.238 php-src/php.ini-recommended:1.239
--- php-src/php.ini-recommended:1.238   Sat Jan 31 19:23:16 2009
+++ php-src/php.ini-recommended Thu Feb 12 14:36:32 2009
@@ -259,7 +259,7 @@
 
 ; error_reporting is a bit-field.  Or each number up to get desired error
 ; reporting level
-; E_ALL - All errors and warnings (doesn't include E_STRICT)
+; E_ALL - All errors and warnings (includes E_STRICT)
 ; E_ERROR   - fatal run-time errors
 ; E_RECOVERABLE_ERROR - almost fatal run-time errors
 ; E_WARNING - run-time warnings (non-fatal errors)
@@ -288,11 +288,11 @@
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL  ~E_NOTICE  ~E_STRICT
+;error_reporting = E_ALL | ~E_NOTICE | ~E_STRICT
 ;
 ;   - Show all errors, except for notices
 ;
-;error_reporting = E_ALL  ~E_NOTICE
+;error_reporting = E_ALL | ~E_NOTICE
 ;
 ;   - Show only errors
 ;
@@ -300,7 +300,7 @@
 ;
 ;   - Show all errors, except coding standards warnings
 ;
-error_reporting  =  E_ALL  ~E_STRICT
+error_reporting  =  E_ALL | ~E_STRICT
 
 ; Print out errors (as a part of the output).  For production web sites,
 ; you're strongly encouraged to turn this feature off, and use error logging



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Felipe Pena]

felipe  Sat Jan 31 19:23:16 2009 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - Fixed bug #47255 (Typo in php.ini files)
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.287r2=1.288diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.287 php-src/php.ini-dist:1.288
--- php-src/php.ini-dist:1.287  Mon Jan 12 10:46:31 2009
+++ php-src/php.ini-distSat Jan 31 19:23:16 2009
@@ -841,7 +841,7 @@
 ; Notice message logging require a little overheads.
 pgsql.ignore_notice = 0
 
-; Log PostgreSQL backends Noitce message or not.
+; Log PostgreSQL backends Notice message or not.
 ; Unless pgsql.ignore_notice=0, module cannot log notice message.
 pgsql.log_notice = 0
 
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.237r2=1.238diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.237 php-src/php.ini-recommended:1.238
--- php-src/php.ini-recommended:1.237   Mon Jan 12 10:46:31 2009
+++ php-src/php.ini-recommended Sat Jan 31 19:23:16 2009
@@ -878,7 +878,7 @@
 ; Notice message logging require a little overheads.
 pgsql.ignore_notice = 0
 
-; Log PostgreSQL backends Noitce message or not.
+; Log PostgreSQL backends Notice message or not.
 ; Unless pgsql.ignore_notice=0, module cannot log notice message.
 pgsql.log_notice = 0
 



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Antony Dovgal]

tony2001Mon Jan 12 10:46:31 2009 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  fix typo (reported by Richard Quadling)
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.286r2=1.287diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.286 php-src/php.ini-dist:1.287
--- php-src/php.ini-dist:1.286  Fri Jan  9 15:00:36 2009
+++ php-src/php.ini-distMon Jan 12 10:46:31 2009
@@ -669,7 +669,7 @@
 ; the 5th parameter to mail(), even in safe mode.
 ;mail.force_extra_parameters =
 
-; Add X-PHP-Originaiting-Script: that will include uid of the script followed 
by the filename
+; Add X-PHP-Originating-Script: that will include uid of the script followed 
by the filename
 mail.add_x_header = Off
 
 ; Log all mail() calls including the full path of the script, line #, to 
address and headers
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.236r2=1.237diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.236 php-src/php.ini-recommended:1.237
--- php-src/php.ini-recommended:1.236   Fri Jan  9 15:00:36 2009
+++ php-src/php.ini-recommended Mon Jan 12 10:46:31 2009
@@ -706,7 +706,7 @@
 ; the 5th parameter to mail(), even in safe mode.
 ;mail.force_extra_parameters =
 
-; Add X-PHP-Originaiting-Script: that will include uid of the script followed 
by the filename
+; Add X-PHP-Originating-Script: that will include uid of the script followed 
by the filename
 mail.add_x_header = On
 
 ; Log all mail() calls including the full path of the script, line #, to 
address and headers



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /ext/standard mail.c /main main.c php_globals.h

[Ilia Alshanetsky]

iliaa   Fri Jan  9 15:00:36 2009 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/main   main.c php_globals.h 
/php-src/ext/standard   mail.c 
  Log:
  
  MFB: Added mail logging functionality that allows logging of mail sent via 
  mail() function
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.285r2=1.286diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.285 php-src/php.ini-dist:1.286
--- php-src/php.ini-dist:1.285  Sat Dec 27 21:03:39 2008
+++ php-src/php.ini-distFri Jan  9 15:00:36 2009
@@ -669,6 +669,12 @@
 ; the 5th parameter to mail(), even in safe mode.
 ;mail.force_extra_parameters =
 
+; Add X-PHP-Originaiting-Script: that will include uid of the script followed 
by the filename
+mail.add_x_header = Off
+
+; Log all mail() calls including the full path of the script, line #, to 
address and headers
+mail.log =
+
 [SQL]
 sql.safe_mode = Off
 
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.235r2=1.236diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.235 php-src/php.ini-recommended:1.236
--- php-src/php.ini-recommended:1.235   Sat Dec 27 21:03:39 2008
+++ php-src/php.ini-recommended Fri Jan  9 15:00:36 2009
@@ -706,6 +706,12 @@
 ; the 5th parameter to mail(), even in safe mode.
 ;mail.force_extra_parameters =
 
+; Add X-PHP-Originaiting-Script: that will include uid of the script followed 
by the filename
+mail.add_x_header = On
+
+; Log all mail() calls including the full path of the script, line #, to 
address and headers
+mail.log =
+
 [SQL]
 sql.safe_mode = Off
 
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.787r2=1.788diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.787 php-src/main/main.c:1.788
--- php-src/main/main.c:1.787   Wed Dec 31 13:25:05 2008
+++ php-src/main/main.c Fri Jan  9 15:00:36 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.787 2008/12/31 13:25:05 helly Exp $ */
+/* $Id: main.c,v 1.788 2009/01/09 15:00:36 iliaa Exp $ */
 
 /* {{{ includes
  */
@@ -539,6 +539,8 @@
 
PHP_INI_ENTRY(SMTP,   
localhost,PHP_INI_ALL,NULL)
PHP_INI_ENTRY(smtp_port,  25,   
PHP_INI_ALL,NULL)
+   STD_PHP_INI_BOOLEAN(mail.add_x_header,0,
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnUpdateBool,   
mail_x_header,  php_core_globals,   core_globals)
+   STD_PHP_INI_ENTRY(mail.log,   NULL,   
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnUpdateString, 
mail_log,   php_core_globals,   core_globals)
PHP_INI_ENTRY(browscap,   NULL,   
PHP_INI_SYSTEM, NULL)
PHP_INI_ENTRY(memory_limit,   128M, 
PHP_INI_ALL,OnChangeMemoryLimit)
PHP_INI_ENTRY(precision,  14,   
PHP_INI_ALL,OnSetPrecision)
http://cvs.php.net/viewvc.cgi/php-src/main/php_globals.h?r1=1.119r2=1.120diff_format=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.119 php-src/main/php_globals.h:1.120
--- php-src/main/php_globals.h:1.119Wed Dec 31 11:12:38 2008
+++ php-src/main/php_globals.h  Fri Jan  9 15:00:36 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_globals.h,v 1.119 2008/12/31 11:12:38 sebastian Exp $ */
+/* $Id: php_globals.h,v 1.120 2009/01/09 15:00:36 iliaa Exp $ */
 
 #ifndef PHP_GLOBALS_H
 #define PHP_GLOBALS_H
@@ -151,6 +151,9 @@
long user_ini_cache_ttl;
 
char *request_order;
+
+   zend_bool mail_x_header;
+   char *mail_log;
 };
 
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.100r2=1.101diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.100 php-src/ext/standard/mail.c:1.101
--- php-src/ext/standard/mail.c:1.100   Wed Dec 31 11:12:37 2008
+++ php-src/ext/standard/mail.c Fri Jan  9 15:00:36 2009
@@ -16,13 +16,15 @@
+--+
  */
 
-/* $Id: mail.c,v 1.100 2008/12/31 11:12:37 sebastian Exp $ */
+/* $Id: mail.c,v 1.101 2009/01/09 15:00:36 iliaa Exp $ */
 
 #include stdlib.h
 #include ctype.h
 #include stdio.h
 #include php.h
 #include ext/standard/info.h
+#include ext/standard/php_string.h
+#include ext/standard/basic_functions.h
 
 #if HAVE_SYSEXITS_H
 #include sysexits.h
@@ -66,6 +68,8 @@
*p = ' ';   
\
}   
\
 
+extern 

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Hannes Magnusson]

bjori   Sat Dec 27 20:27:56 2008 UTC

  Modified files:  
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  Add missing INI setting.
  [DOC] used as the default size for shm_attach(). PHP_INI_SYSTEM
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.232r2=1.233diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.232 php-src/php.ini-recommended:1.233
--- php-src/php.ini-recommended:1.232   Fri Nov 28 19:05:42 2008
+++ php-src/php.ini-recommended Sat Dec 27 20:27:56 2008
@@ -1278,6 +1278,11 @@
 ; instead of original one.
 soap.wsdl_cache_ttl=86400
 
+[sysvshm]
+; A default size of the shared memory segment
+;sysvshm.init_mem = 1
+
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.282r2=1.283diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.282 php-src/php.ini-dist:1.283
--- php-src/php.ini-dist:1.282  Fri Nov 28 19:05:42 2008
+++ php-src/php.ini-distSat Dec 27 20:27:56 2008
@@ -1238,6 +1238,11 @@
 ; instead of original one.
 soap.wsdl_cache_ttl=86400
 
+[sysvshm]
+; A default size of the shared memory segment
+;sysvshm.init_mem = 1
+
+
 ; Local Variables:
 ; tab-width: 4
 ; End:



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Hannes Magnusson]

bjori   Sat Dec 27 20:54:49 2008 UTC

  Modified files:  
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  - Add missing INI entries (pdo_odbc, odbc/birdstep, sybase_ct)
  - Remove entries from removed extension (ifx)
  [DOC] The sybase stuff is really confusing in the docs..
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.233r2=1.234diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.233 php-src/php.ini-recommended:1.234
--- php-src/php.ini-recommended:1.233   Sat Dec 27 20:27:56 2008
+++ php-src/php.ini-recommended Sat Dec 27 20:54:48 2008
@@ -681,6 +681,10 @@
 ;stack size limit imposed by the Operating System).
 ;pcre.recursion_limit=10
 
+[Pdo]
+; Whether to pool ODBC connections. Can be one of strict, relaxed or off
+;pdo_odbc.connection_pooling=strict
+
 [Phar]
 ;phar.readonly = On
 ;phar.require_hash = On
@@ -731,6 +735,8 @@
 ; of uodbc.defaultlrl and uodbc.defaultbinmode
 odbc.defaultbinmode = 1
 
+;birdstep.max_links = -1
+
 [MySQL]
 ; Allow or prevent persistent links.
 mysql.allow_persistent = On
@@ -880,31 +886,6 @@
 ; Unless pgsql.ignore_notice=0, module cannot log notice message.
 pgsql.log_notice = 0
 
-[Sybase]
-; Allow or prevent persistent links.
-sybase.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-sybase.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-sybase.max_links = -1
-
-;sybase.interface_file = /usr/sybase/interfaces
-
-; Minimum error severity to display.
-sybase.min_error_severity = 10
-
-; Minimum message severity to display.
-sybase.min_message_severity = 10
-
-; Compatibility mode with old versions of PHP 3.0.
-; If on, this will cause PHP to automatically assign types to results according
-; to their Sybase type, instead of treating them all as strings.  This
-; compatibility mode will probably not stay around forever, so try applying
-; whatever necessary changes to your code, and turn it off.
-sybase.compatability_mode = Off
-
 [Sybase-CT]
 ; Allow or prevent persistent links.
 sybct.allow_persistent = On
@@ -921,6 +902,11 @@
 ; Minimum client message severity to display.
 sybct.min_client_severity = 10
 
+; Set per-context timeout
+;sybct.timeout=
+
+;sybct.packet_size
+
 [bcmath]
 ; Number of decimal digits for all bcmath functions.
 bcmath.scale = 0
@@ -928,43 +914,6 @@
 [browscap]
 ;browscap = extra/browscap.ini
 
-[Informix]
-; Default host for ifx_connect() (doesn't apply in safe mode).
-ifx.default_host =
-
-; Default user for ifx_connect() (doesn't apply in safe mode).
-ifx.default_user =
-
-; Default password for ifx_connect() (doesn't apply in safe mode).
-ifx.default_password =
-
-; Allow or prevent persistent links.
-ifx.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-ifx.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-ifx.max_links = -1
-
-; If on, select statements return the contents of a text blob instead of its 
id.
-ifx.textasvarchar = 0
-
-; If on, select statements return the contents of a byte blob instead of its 
id.
-ifx.byteasvarchar = 0
-
-; Trailing blanks are stripped from fixed-length char columns.  May help the
-; life of Informix SE users.
-ifx.charasvarchar = 0
-
-; If on, the contents of text and byte blobs are dumped to a file instead of
-; keeping them in memory.
-ifx.blobinfile = 0
-
-; NULL's are returned as empty strings, unless this is set to 1.  In that case,
-; NULL's are returned as string 'NULL'.
-ifx.nullformat = 0
-
 [Session]
 ; Handler used to store/retrieve data.
 session.save_handler = files
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.283r2=1.284diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.283 php-src/php.ini-dist:1.284
--- php-src/php.ini-dist:1.283  Sat Dec 27 20:27:56 2008
+++ php-src/php.ini-distSat Dec 27 20:54:48 2008
@@ -644,6 +644,10 @@
 ;stack size limit imposed by the Operating System).
 ;pcre.recursion_limit=10
 
+[Pdo]
+; Whether to pool ODBC connections. Can be one of strict, relaxed or off
+;pdo_odbc.connection_pooling=strict
+
 [Phar]
 ;phar.readonly = On
 ;phar.require_hash = On
@@ -694,6 +698,8 @@
 ; of uodbc.defaultlrl and uodbc.defaultbinmode
 odbc.defaultbinmode = 1
 
+;birdstep.max_links = -1
+
 [MySQL]
 ; Allow or prevent persistent links.
 mysql.allow_persistent = On
@@ -843,31 +849,6 @@
 ; Unless pgsql.ignore_notice=0, module cannot log notice message.
 pgsql.log_notice = 0
 
-[Sybase]
-; Allow or prevent persistent links.
-sybase.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-sybase.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-sybase.max_links = -1
-
-;sybase.interface_file = /usr/sybase/interfaces
-
-; Minimum error severity to display.
-sybase.min_error_severity = 10
-
-; Minimum message 

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Hannes Magnusson]

bjori   Sat Dec 27 21:03:39 2008 UTC

  Modified files:  
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  Nuke more removed extensions
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.234r2=1.235diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.234 php-src/php.ini-recommended:1.235
--- php-src/php.ini-recommended:1.234   Sat Dec 27 20:54:48 2008
+++ php-src/php.ini-recommended Sat Dec 27 21:03:39 2008
@@ -808,16 +808,6 @@
 ; Allow or prevent reconnect
 mysqli.reconnect = Off
 
-[mSQL]
-; Allow or prevent persistent links.
-msql.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-msql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent).  -1 means no limit.
-msql.max_links = -1
-
 [OCI8]
 
 ; Connection: Enables privileged connections using external
@@ -1175,21 +1165,6 @@
 ; enable strict encoding detection.
 ;mbstring.strict_encoding = Off
 
-[FrontBase]
-;fbsql.allow_persistent = On
-;fbsql.autocommit = On
-;fbsql.show_timestamp_decimals = Off
-;fbsql.default_database =
-;fbsql.default_database_password =
-;fbsql.default_host =
-;fbsql.default_password =
-;fbsql.default_user = _SYSTEM
-;fbsql.generate_warnings = Off
-;fbsql.max_connections = 128
-;fbsql.max_links = 128
-;fbsql.max_persistent = -1
-;fbsql.max_results = 128
-
 [gd]
 ; Tell the jpeg decode to libjpeg warnings and try to create
 ; a gd image. The warning will then be displayed as notices
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.284r2=1.285diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.284 php-src/php.ini-dist:1.285
--- php-src/php.ini-dist:1.284  Sat Dec 27 20:54:48 2008
+++ php-src/php.ini-distSat Dec 27 21:03:39 2008
@@ -771,16 +771,6 @@
 ; Allow or prevent reconnect
 mysqli.reconnect = Off
 
-[mSQL]
-; Allow or prevent persistent links.
-msql.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-msql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent).  -1 means no limit.
-msql.max_links = -1
-
 [OCI8]
 
 ; Connection: Enables privileged connections using external
@@ -1135,21 +1125,6 @@
 ; 4: Overload ereg*() functions
 ;mbstring.func_overload = 0
 
-[FrontBase]
-;fbsql.allow_persistent = On
-;fbsql.autocommit = On
-;fbsql.show_timestamp_decimals = Off
-;fbsql.default_database =
-;fbsql.default_database_password =
-;fbsql.default_host =
-;fbsql.default_password =
-;fbsql.default_user = _SYSTEM
-;fbsql.generate_warnings = Off
-;fbsql.max_connections = 128
-;fbsql.max_links = 128
-;fbsql.max_persistent = -1
-;fbsql.max_results = 128
-
 [gd]
 ; Tell the jpeg decode to libjpeg warnings and try to create
 ; a gd image. The warning will then be displayed as notices



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Matt Wilmas]

mattwil Fri Nov 28 19:05:43 2008 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Updated description to match docs
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.281r2=1.282diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.281 php-src/php.ini-dist:1.282
--- php-src/php.ini-dist:1.281  Thu Nov 13 19:05:36 2008
+++ php-src/php.ini-distFri Nov 28 19:05:42 2008
@@ -297,7 +297,7 @@
 log_errors_max_len = 1024
 
 ; Do not log repeated messages. Repeated errors must occur in same file on same
-; line until ignore_repeated_source is set true.
+; line unless ignore_repeated_source is set true.
 ignore_repeated_errors = Off
 
 ; Ignore source of message when ignoring repeated messages. When this setting
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.231r2=1.232diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.231 php-src/php.ini-recommended:1.232
--- php-src/php.ini-recommended:1.231   Thu Nov 13 19:05:36 2008
+++ php-src/php.ini-recommended Fri Nov 28 19:05:42 2008
@@ -336,7 +336,7 @@
 log_errors_max_len = 1024
 
 ; Do not log repeated messages. Repeated errors must occur in same file on same
-; line until ignore_repeated_source is set true.
+; line unless ignore_repeated_source is set true.
 ignore_repeated_errors = Off
 
 ; Ignore source of message when ignoring repeated messages. When this setting



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Hannes Magnusson]

bjori   Thu Nov 13 19:05:36 2008 UTC

  Modified files:  
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  Document the xmlrpc_errors option, it is totally unrelated to the extension
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.230r2=1.231diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.230 php-src/php.ini-recommended:1.231
--- php-src/php.ini-recommended:1.230   Wed Oct 15 18:41:17 2008
+++ php-src/php.ini-recommended Thu Nov 13 19:05:36 2008
@@ -354,6 +354,11 @@
 ; Store the last error/warning message in $php_errormsg (boolean).
 track_errors = Off
 
+; Turn off normal error reporting and emit XML-RPC error XML
+;xmlrpc_errors = 0
+; An XML-RPC faultCode
+;xmlrpc_error_number = 0
+
 ; Disable the inclusion of HTML tags in error messages.
 ; Note: Never use this feature for production boxes.
 ;html_errors = Off
@@ -666,10 +671,6 @@
 [sqlite3]
 ;sqlite3.extension_dir =
 
-[xmlrpc]
-;xmlrpc_error_number = 0
-;xmlrpc_errors = 0
-
 [Pcre]
 ;PCRE library backtracking limit.
 ;pcre.backtrack_limit=10
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.280r2=1.281diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.280 php-src/php.ini-dist:1.281
--- php-src/php.ini-dist:1.280  Wed Oct 15 18:41:17 2008
+++ php-src/php.ini-distThu Nov 13 19:05:36 2008
@@ -315,6 +315,11 @@
 ; Store the last error/warning message in $php_errormsg (boolean).
 track_errors = Off
 
+; Turn off normal error reporting and emit XML-RPC error XML
+;xmlrpc_errors = 0
+; An XML-RPC faultCode
+;xmlrpc_error_number = 0
+
 ; Disable the inclusion of HTML tags in error messages.
 ; Note: Never use this feature for production boxes.
 ;html_errors = Off
@@ -629,10 +634,6 @@
 [sqlite3]
 ;sqlite3.extension_dir =
 
-[xmlrpc]
-;xmlrpc_error_number = 0
-;xmlrpc_errors = 0
-
 [Pcre]
 ;PCRE library backtracking limit.
 ;pcre.backtrack_limit=10



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Hannes Magnusson]

bjori   Fri Aug  1 11:01:11 2008 UTC

  Modified files:  
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  MFB5.3: INI options for new extions
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.226r2=1.227diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.226 php-src/php.ini-recommended:1.227
--- php-src/php.ini-recommended:1.226   Sun Jul 27 16:35:56 2008
+++ php-src/php.ini-recommended Fri Aug  1 11:01:11 2008
@@ -589,11 +589,13 @@
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_exif.dll
+;extension=php_fileinfo.dll
 ;extension=php_fdf.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_gmp.dll
 ;extension=php_ifx.dll
+;extension=php_intl.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
@@ -618,12 +620,14 @@
 ;extension=php_pdo_pgsql.dll
 ;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
+;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
 ;extension=php_soap.dll
 ;extension=php_sockets.dll
 ;extension=php_sqlite.dll
+;extension=php_sqlite3.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
@@ -653,9 +657,15 @@
 ;iconv.internal_encoding = ISO-8859-1
 ;iconv.output_encoding = ISO-8859-1
 
+[intl]
+;intl.default_locale = 
+
 [sqlite]
 ;sqlite.assoc_case = 0
 
+[sqlite3]
+;sqlite3.extension_dir =
+
 [xmlrpc]
 ;xmlrpc_error_number = 0
 ;xmlrpc_errors = 0
@@ -670,6 +680,11 @@
 ;stack size limit imposed by the Operating System).
 ;pcre.recursion_limit=10
 
+[Phar]
+;phar.readonly = On
+;phar.require_hash = On
+;phar.cache_list =
+
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.276r2=1.277diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.276 php-src/php.ini-dist:1.277
--- php-src/php.ini-dist:1.276  Sun Jul 27 16:35:56 2008
+++ php-src/php.ini-distFri Aug  1 11:01:11 2008
@@ -552,11 +552,13 @@
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_exif.dll
+;extension=php_fileinfo.dll
 ;extension=php_fdf.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_gmp.dll
 ;extension=php_ifx.dll
+;extension=php_intl.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
@@ -581,12 +583,14 @@
 ;extension=php_pdo_pgsql.dll
 ;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
+;extension=php_phar.dll
 ;extension=php_pspell.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
 ;extension=php_soap.dll
 ;extension=php_sockets.dll
 ;extension=php_sqlite.dll
+;extension=php_sqlite3.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
@@ -616,9 +620,15 @@
 ;iconv.internal_encoding = ISO-8859-1
 ;iconv.output_encoding = ISO-8859-1
 
+[intl]
+;intl.default_locale = 
+
 [sqlite]
 ;sqlite.assoc_case = 0
 
+[sqlite3]
+;sqlite3.extension_dir =
+
 [xmlrpc]
 ;xmlrpc_error_number = 0
 ;xmlrpc_errors = 0
@@ -633,6 +643,11 @@
 ;stack size limit imposed by the Operating System).
 ;pcre.recursion_limit=10
 
+[Phar]
+;phar.readonly = On
+;phar.require_hash = On
+;phar.cache_list =
+
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Christopher Jones]

sixdSun Jul 27 16:35:56 2008 UTC

  Modified files:  
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  Sync oci8.default_prefetch example value with recent change
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.225r2=1.226diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.225 php-src/php.ini-recommended:1.226
--- php-src/php.ini-recommended:1.225   Mon Jul 21 09:36:21 2008
+++ php-src/php.ini-recommended Sun Jul 27 16:35:56 2008
@@ -825,10 +825,11 @@
 
 ; Connection: Set this to a user chosen connection class to be used
 ; for all pooled server requests with Oracle 11g Database Resident
-; Connection Pooling (DRCP).  The default name is system generated.
-; To use DRCP, the database pool must be configured, and the
-; connection string must also specify to use a pooled server.
-;oci8.connection_class = MYPHPAPP
+; Connection Pooling (DRCP).  To use DRCP, this value should be set to
+; the same string for all web servers running the same application,
+; the database pool must be configured, and the connection string must
+; specify to use a pooled server.
+;oci8.connection_class =
 
 ; High Availability: Using 1 lets PHP receive Fast Application
 ; Notification (FAN) events generated when a database node fails. The
@@ -841,7 +842,7 @@
 
 ; Tuning: Enables statement prefetching and sets the default number of
 ; rows that will be fetched automatically after statement execution.
-;oci8.default_prefetch = 10
+;oci8.default_prefetch = 100
 
 ; Compatibility. Using 1 means oci_close() will not close
 ; oci_connect() and oci_new_connect() connections.
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.275r2=1.276diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.275 php-src/php.ini-dist:1.276
--- php-src/php.ini-dist:1.275  Mon Jul 21 09:36:21 2008
+++ php-src/php.ini-distSun Jul 27 16:35:56 2008
@@ -788,10 +788,11 @@
 
 ; Connection: Set this to a user chosen connection class to be used
 ; for all pooled server requests with Oracle 11g Database Resident
-; Connection Pooling (DRCP).  The default name is system generated.
-; To use DRCP, the database pool must be configured, and the
-; connection string must also specify to use a pooled server.
-;oci8.connection_class = MYPHPAPP
+; Connection Pooling (DRCP).  To use DRCP, this value should be set to
+; the same string for all web servers running the same application,
+; the database pool must be configured, and the connection string must
+; specify to use a pooled server.
+;oci8.connection_class =
 
 ; High Availability: Using 1 lets PHP receive Fast Application
 ; Notification (FAN) events generated when a database node fails. The
@@ -804,7 +805,7 @@
 
 ; Tuning: Enables statement prefetching and sets the default number of
 ; rows that will be fetched automatically after statement execution.
-;oci8.default_prefetch = 10
+;oci8.default_prefetch = 100
 
 ; Compatibility. Using 1 means oci_close() will not close
 ; oci_connect() and oci_new_connect() connections.



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Christopher Jones]

sixdMon Apr  7 21:23:28 2008 UTC

  Modified files:  
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  Add E_DEPRECATED comment
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.223r2=1.224diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.223 php-src/php.ini-recommended:1.224
--- php-src/php.ini-recommended:1.223   Wed Mar 12 20:53:04 2008
+++ php-src/php.ini-recommended Mon Apr  7 21:23:28 2008
@@ -280,6 +280,8 @@
 ; E_USER_ERROR  - user-generated error message
 ; E_USER_WARNING- user-generated warning message
 ; E_USER_NOTICE - user-generated notice message
+; E_DEPRECATED  - warn about code that will not work in future versions
+; of PHP
 ;
 ; Examples:
 ;
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.273r2=1.274diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.273 php-src/php.ini-dist:1.274
--- php-src/php.ini-dist:1.273  Wed Mar 12 20:53:04 2008
+++ php-src/php.ini-distMon Apr  7 21:23:28 2008
@@ -243,6 +243,8 @@
 ; E_USER_ERROR  - user-generated error message
 ; E_USER_WARNING- user-generated warning message
 ; E_USER_NOTICE - user-generated notice message
+; E_DEPRECATED  - warn about code that will not work in future versions
+; of PHP
 ;
 ; Examples:
 ;



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c php_globals.h php_variables.c

[Stanislav Malyshev]

stasWed Mar 12 20:53:04 2008 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/main   main.c php_globals.h php_variables.c 
  Log:
  MFB: add request_order INI variable to control $_REQUEST content
  # if not set (default), variables_order still is used
  # request_order accepts G,P and C
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.272r2=1.273diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.272 php-src/php.ini-dist:1.273
--- php-src/php.ini-dist:1.272  Thu Feb 21 13:36:24 2008
+++ php-src/php.ini-distWed Mar 12 20:53:04 2008
@@ -360,6 +360,12 @@
 ; values override older values.
 variables_order = EGPCS
 
+; This directive describes the order in which PHP registers GET, POST and 
Cookie
+; variables into the _REQUEST array. Registration is done from left to right, 
+; newer values override older values.
+; If this directive is not set, variables_order is used for _REQUEST contents.
+; request_order = GP
+ 
 ; This directive tells PHP whether to declare the argvargc variables (that
 ; would contain the GET information).  If you don't use these variables, you
 ; should turn it off for increased performance.
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.222r2=1.223diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.222 php-src/php.ini-recommended:1.223
--- php-src/php.ini-recommended:1.222   Thu Feb 21 13:36:25 2008
+++ php-src/php.ini-recommended Wed Mar 12 20:53:04 2008
@@ -399,6 +399,12 @@
 ; values override older values.
 variables_order = GPCS
 
+; This directive describes the order in which PHP registers GET, POST and 
Cookie
+; variables into the _REQUEST array. Registration is done from left to right, 
+; newer values override older values.
+; If this directive is not set, variables_order is used for _REQUEST contents.
+request_order = GP
+
 ; This directive tells PHP whether to declare the argvargc variables (that
 ; would contain the GET information).  If you don't use these variables, you
 ; should turn it off for increased performance.
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.763r2=1.764diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.763 php-src/main/main.c:1.764
--- php-src/main/main.c:1.763   Sat Mar  8 22:17:32 2008
+++ php-src/main/main.c Wed Mar 12 20:53:04 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.763 2008/03/08 22:17:32 colder Exp $ */
+/* $Id: main.c,v 1.764 2008/03/12 20:53:04 stas Exp $ */
 
 /* {{{ includes
  */
@@ -529,6 +529,7 @@
 
STD_PHP_INI_ENTRY(user_dir,   NULL,   
PHP_INI_SYSTEM, OnUpdateString, user_dir,   
php_core_globals,   core_globals)
STD_PHP_INI_ENTRY(variables_order,EGPCS,
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnUpdateStringUnempty,  
variables_order,php_core_globals,   core_globals)
+   STD_PHP_INI_ENTRY(request_order,  NULL,   
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnUpdateString, request_order,  
php_core_globals,   core_globals)
 
STD_PHP_INI_ENTRY(error_append_string,NULL,   
PHP_INI_ALL,OnUpdateString, error_append_string,
php_core_globals,   core_globals)
STD_PHP_INI_ENTRY(error_prepend_string,   NULL,   
PHP_INI_ALL,OnUpdateString, error_prepend_string,   
php_core_globals,   core_globals)
http://cvs.php.net/viewvc.cgi/php-src/main/php_globals.h?r1=1.116r2=1.117diff_format=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.116 php-src/main/php_globals.h:1.117
--- php-src/main/php_globals.h:1.116Sat Mar  8 22:17:32 2008
+++ php-src/main/php_globals.h  Wed Mar 12 20:53:04 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_globals.h,v 1.116 2008/03/08 22:17:32 colder Exp $ */
+/* $Id: php_globals.h,v 1.117 2008/03/12 20:53:04 stas Exp $ */
 
 #ifndef PHP_GLOBALS_H
 #define PHP_GLOBALS_H
@@ -148,6 +148,8 @@
 
char *user_ini_filename;
long user_ini_cache_ttl;
+
+   char *request_order;
 };
 
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.145r2=1.146diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.145 php-src/main/php_variables.c:1.146
--- php-src/main/php_variables.c:1.145  Mon Dec 31 07:12:18 2007
+++ php-src/main/php_variables.cWed Mar 12 20:53:04 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_variables.c,v 1.145 2007/12/31 07:12:18 sebastian Exp $ */
+/* $Id: php_variables.c,v 1.146 2008/03/12 20:53:04 stas Exp $ */
 
 #include 

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Antony Dovgal]

tony2001Thu Feb 21 13:36:25 2008 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  new Oracle stuff
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.271r2=1.272diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.271 php-src/php.ini-dist:1.272
--- php-src/php.ini-dist:1.271  Mon Feb 11 00:00:48 2008
+++ php-src/php.ini-distThu Feb 21 13:36:24 2008
@@ -757,7 +757,9 @@
 msql.max_links = -1
 
 [OCI8]
-; enables privileged connections using external credentials (OCI_SYSOPER, 
OCI_SYSDBA)
+
+; Connection: Enables privileged connections using external
+; credentials (OCI_SYSOPER, OCI_SYSDBA)
 ;oci8.privileged_connect = Off
 
 ; Connection: The maximum number of persistent OCI8 connections per
@@ -775,6 +777,18 @@
 ; pings completely.
 ;oci8.ping_interval = 60
 
+; Connection: Set this to a user chosen connection class to be used
+; for all pooled server requests with Oracle 11g Database Resident
+; Connection Pooling (DRCP).  The default name is system generated.
+; To use DRCP, the database pool must be configured, and the
+; connection string must also specify to use a pooled server.
+;oci8.connection_class = MYPHPAPP
+
+; High Availability: Using 1 lets PHP receive Fast Application
+; Notification (FAN) events generated when a database node fails. The
+; database must also be configured to post FAN events.
+;oci8.events = 0
+
 ; Tuning: This option enables statement caching, and specifies how
 ; many statements to cache. Using 0 disables statement caching.
 ;oci8.statement_cache_size = 20
@@ -783,9 +797,9 @@
 ; rows that will be fetched automatically after statement execution.
 ;oci8.default_prefetch = 10
 
-; Compatibility. Using On means oci_close() will not close
+; Compatibility. Using 1 means oci_close() will not close
 ; oci_connect() and oci_new_connect() connections.
-;oci8.old_oci_close_semantics = Off
+;oci8.old_oci_close_semantics = 0
 
 [PostgresSQL]
 ; Allow or prevent persistent links.
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.221r2=1.222diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.221 php-src/php.ini-recommended:1.222
--- php-src/php.ini-recommended:1.221   Mon Feb 11 00:00:48 2008
+++ php-src/php.ini-recommended Thu Feb 21 13:36:25 2008
@@ -794,7 +794,9 @@
 msql.max_links = -1
 
 [OCI8]
-; enables privileged connections using external credentials (OCI_SYSOPER, 
OCI_SYSDBA)
+
+; Connection: Enables privileged connections using external
+; credentials (OCI_SYSOPER, OCI_SYSDBA)
 ;oci8.privileged_connect = Off
 
 ; Connection: The maximum number of persistent OCI8 connections per
@@ -812,6 +814,18 @@
 ; pings completely.
 ;oci8.ping_interval = 60
 
+; Connection: Set this to a user chosen connection class to be used
+; for all pooled server requests with Oracle 11g Database Resident
+; Connection Pooling (DRCP).  The default name is system generated.
+; To use DRCP, the database pool must be configured, and the
+; connection string must also specify to use a pooled server.
+;oci8.connection_class = MYPHPAPP
+
+; High Availability: Using 1 lets PHP receive Fast Application
+; Notification (FAN) events generated when a database node fails. The
+; database must also be configured to post FAN events.
+;oci8.events = 0
+
 ; Tuning: This option enables statement caching, and specifies how
 ; many statements to cache. Using 0 disables statement caching.
 ;oci8.statement_cache_size = 20
@@ -820,9 +834,9 @@
 ; rows that will be fetched automatically after statement execution.
 ;oci8.default_prefetch = 10
 
-; Compatibility. Using On means oci_close() will not close
+; Compatibility. Using 1 means oci_close() will not close
 ; oci_connect() and oci_new_connect() connections.
-;oci8.old_oci_close_semantics = Off
+;oci8.old_oci_close_semantics = 0
 
 [PostgresSQL]
 ; Allow or prevent persistent links.

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Johannes Schlüter]

johannesMon Feb 11 00:00:49 2008 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - Fix typo (see #44095)
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.270r2=1.271diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.270 php-src/php.ini-dist:1.271
--- php-src/php.ini-dist:1.270  Fri Sep 28 02:04:28 2007
+++ php-src/php.ini-distMon Feb 11 00:00:48 2008
@@ -327,7 +327,7 @@
 ;docref_ext = .html
 
 ; String to output before an error message.
-;error_prepend_string = font color=ff
+;error_prepend_string = font color=#ff
 
 ; String to output after an error message.
 ;error_append_string = /font
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.220r2=1.221diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.220 php-src/php.ini-recommended:1.221
--- php-src/php.ini-recommended:1.220   Fri Sep 28 02:04:28 2007
+++ php-src/php.ini-recommended Mon Feb 11 00:00:48 2008
@@ -366,7 +366,7 @@
 ;docref_ext = .html
 
 ; String to output before an error message.
-;error_prepend_string = font color=ff
+;error_prepend_string = font color=#ff
 
 ; String to output after an error message.
 ;error_append_string = /font

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Derick Rethans]

derick  Sun Sep  2 19:57:21 2007 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - Avoid confusion.
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.268r2=1.269diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.268 php-src/php.ini-dist:1.269
--- php-src/php.ini-dist:1.268  Tue Aug 21 23:24:01 2007
+++ php-src/php.ini-distSun Sep  2 19:57:21 2007
@@ -202,7 +202,7 @@
 max_execution_time = 30 ; Maximum execution time of each script, in seconds
 max_input_time = 60; Maximum amount of time each script may spend parsing 
request data
 ;max_input_nesting_level = 64 ; Maximum input variable nesting level
-memory_limit = 128M  ; Maximum amount of memory a script may consume 
(128MB)
+memory_limit = 128M  ; Maximum amount of memory a script may consume (128M)
 
 
 ;;
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.218r2=1.219diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.218 php-src/php.ini-recommended:1.219
--- php-src/php.ini-recommended:1.218   Tue Aug 21 23:24:01 2007
+++ php-src/php.ini-recommended Sun Sep  2 19:57:21 2007
@@ -238,7 +238,7 @@
 max_execution_time = 30 ; Maximum execution time of each script, in seconds
 max_input_time = 60; Maximum amount of time each script may spend parsing 
request data
 ;max_input_nesting_level = 64 ; Maximum input variable nesting level
-memory_limit = 128M  ; Maximum amount of memory a script may consume 
(128MB)
+memory_limit = 128M  ; Maximum amount of memory a script may consume (128M)
 
 
 ;;

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

janiTue Aug 21 23:24:01 2007 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Fix typo in fastcgi.logging option example
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.267r2=1.268diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.267 php-src/php.ini-dist:1.268
--- php-src/php.ini-dist:1.267  Tue Jul 24 14:18:47 2007
+++ php-src/php.ini-distTue Aug 21 23:24:01 2007
@@ -447,7 +447,7 @@
 ; fastcgi.impersonate = 1;
 
 ; Disable logging through FastCGI connection
-; fastcgi.log = 0
+; fastcgi.logging = 0
 
 ; cgi.rfc2616_headers configuration option tells PHP what type of headers to
 ; use when sending HTTP response code. If it's set 0 PHP sends Status: header 
that
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.217r2=1.218diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.217 php-src/php.ini-recommended:1.218
--- php-src/php.ini-recommended:1.217   Tue Jul 24 14:18:47 2007
+++ php-src/php.ini-recommended Tue Aug 21 23:24:01 2007
@@ -484,7 +484,7 @@
 ; fastcgi.impersonate = 1;
 
 ; Disable logging through FastCGI connection
-; fastcgi.log = 0
+; fastcgi.logging = 0
 
 ; cgi.rfc2616_headers configuration option tells PHP what type of headers to
 ; use when sending HTTP response code. If it's set 0 PHP sends Status: header 
that

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c php_globals.h

[Jani Taskinen]

janiTue Jul 24 14:18:47 2007 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/main   main.c php_globals.h 
  Log:
  - Changed display_errors php.ini option to accept stderr as value which
makes the error messages to be outputted to STDERR instead of STDOUT with
CGI and CLI SAPIs.
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.266r2=1.267diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.266 php-src/php.ini-dist:1.267
--- php-src/php.ini-dist:1.266  Thu Jun 21 09:01:57 2007
+++ php-src/php.ini-distTue Jul 24 14:18:47 2007
@@ -256,6 +256,16 @@
 ; instead (see below).  Keeping display_errors enabled on a production web site
 ; may reveal security information to end users, such as file paths on your Web
 ; server, your database schema or other information.
+;
+; possible values for display_errors:
+;
+; Off- Do not display any errors
+; stderr - Display errors to STDERR (affects only CGI/CLI binaries!)
+;
+;display_errors = stderr
+;
+; stdout (On) - Display errors to STDOUT
+;
 display_errors = On
 
 ; Even when display_errors is on, errors that occur during PHP's startup
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.216r2=1.217diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.216 php-src/php.ini-recommended:1.217
--- php-src/php.ini-recommended:1.216   Thu Jun 21 09:01:57 2007
+++ php-src/php.ini-recommended Tue Jul 24 14:18:47 2007
@@ -292,6 +292,18 @@
 ; instead (see below).  Keeping display_errors enabled on a production web site
 ; may reveal security information to end users, such as file paths on your Web
 ; server, your database schema or other information.
+;
+; possible values for display_errors:
+;
+; Off  - Do not display any errors 
+; stderr   - Display errors to STDERR (affects only CGI/CLI binaries!)   
+; On or stdout - Display errors to STDOUT (default)
+;  
+; To output errors to STDERR with CGI/CLI:  
+;display_errors = stderr
+;
+; Default
+;
 display_errors = Off
 
 ; Even when display_errors is on, errors that occur during PHP's startup
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.739r2=1.740diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.739 php-src/main/main.c:1.740
--- php-src/main/main.c:1.739   Tue Jul 24 13:29:39 2007
+++ php-src/main/main.c Tue Jul 24 14:18:47 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.739 2007/07/24 13:29:39 jani Exp $ */
+/* $Id: main.c,v 1.740 2007/07/24 14:18:47 jani Exp $ */
 
 /* {{{ includes
  */
@@ -332,6 +332,89 @@
 }
 /* }}} */
 
+/* {{{ php_get_display_errors_mode() helper function
+ */
+static int php_get_display_errors_mode(char *value, int value_length)
+{
+   int mode;
+
+   if (value_length == 2  !strcasecmp(on, value)) {
+   mode = PHP_DISPLAY_ERRORS_STDOUT;
+   } else if (value_length == 3  !strcasecmp(yes, value)) {
+   mode = PHP_DISPLAY_ERRORS_STDOUT;
+   } else if (value_length == 4  !strcasecmp(true, value)) {
+   mode = PHP_DISPLAY_ERRORS_STDOUT;
+   } else if (value_length == 6  !strcasecmp(value, stderr)) {
+   mode = PHP_DISPLAY_ERRORS_STDERR;
+   } else if (value_length == 6  !strcasecmp(value, stdout)) {
+   mode = PHP_DISPLAY_ERRORS_STDOUT;
+   } else {
+   mode = atoi(value);
+   if (mode  mode != PHP_DISPLAY_ERRORS_STDOUT  mode != 
PHP_DISPLAY_ERRORS_STDERR) {
+   mode = PHP_DISPLAY_ERRORS_STDOUT;
+   }
+   }
+   return mode;
+}
+/* }}} */
+
+/* {{{ PHP_INI_MH
+ */
+static PHP_INI_MH(OnUpdateDisplayErrors)
+{
+   PG(display_errors) = (zend_bool) php_get_display_errors_mode(new_value, 
new_value_length);
+
+   return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_INI_DISP
+ */
+static PHP_INI_DISP(display_errors_mode)
+{
+   int mode, tmp_value_length, cgi_or_cli;
+   char *tmp_value;
+
+   if (type == ZEND_INI_DISPLAY_ORIG  ini_entry-modified) {
+   tmp_value = (ini_entry-orig_value ? ini_entry-orig_value : 
NULL );
+   tmp_value_length = ini_entry-orig_value_length;
+   } else if (ini_entry-value) {
+   tmp_value = ini_entry-value;
+   tmp_value_length = ini_entry-value_length;
+   } else {
+   tmp_value = NULL;
+   tmp_value_length = 0;
+   }
+
+   mode = php_get_display_errors_mode(tmp_value, tmp_value_length);
+
+   /* Display 'On' for other SAPIs instead of STDOUT or STDERR */
+   cgi_or_cli = (!strcmp(sapi_module.name, cli) || 
!strcmp(sapi_module.name, cgi));
+
+   switch (mode) {
+   case PHP_DISPLAY_ERRORS_STDERR:
+   if (cgi_or_cli ) {
+   PUTS(STDERR);
+   } else {

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Dmitry Stogov]

dmitry  Thu Jun 21 09:01:57 2007 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Fixed default values
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.265r2=1.266diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.265 php-src/php.ini-dist:1.266
--- php-src/php.ini-dist:1.265  Sun May 27 18:04:32 2007
+++ php-src/php.ini-distThu Jun 21 09:01:57 2007
@@ -425,7 +425,7 @@
 ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not 
grok
 ; what PATH_INFO is.  For more information on PATH_INFO, see the cgi specs.  
Setting
 ; this to 1 will cause PHP CGI to fix it's paths to conform to the spec.  A 
setting
-; of zero causes PHP to behave as before.  Default is zero.  You should fix 
your scripts
+; of zero causes PHP to behave as before.  Default is 1.  You should fix your 
scripts
 ; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
 ; cgi.fix_pathinfo=0
 
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.215r2=1.216diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.215 php-src/php.ini-recommended:1.216
--- php-src/php.ini-recommended:1.215   Sun May 27 18:04:32 2007
+++ php-src/php.ini-recommended Thu Jun 21 09:01:57 2007
@@ -460,7 +460,7 @@
 ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not 
grok
 ; what PATH_INFO is.  For more information on PATH_INFO, see the cgi specs.  
Setting
 ; this to 1 will cause PHP CGI to fix it's paths to conform to the spec.  A 
setting
-; of zero causes PHP to behave as before.  Default is zero.  You should fix 
your scripts
+; of zero causes PHP to behave as before.  Default is 1.  You should fix your 
scripts
 ; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
 ; cgi.fix_pathinfo=1
 

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

sniper  Sun May 27 18:04:32 2007 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - Add missing entry
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.264r2=1.265diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.264 php-src/php.ini-dist:1.265
--- php-src/php.ini-dist:1.264  Tue May 22 13:28:49 2007
+++ php-src/php.ini-distSun May 27 18:04:32 2007
@@ -421,6 +421,14 @@
 ; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
 ; cgi.redirect_status_env = ;
 
+; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  
PHP's
+; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not 
grok
+; what PATH_INFO is.  For more information on PATH_INFO, see the cgi specs.  
Setting
+; this to 1 will cause PHP CGI to fix it's paths to conform to the spec.  A 
setting
+; of zero causes PHP to behave as before.  Default is zero.  You should fix 
your scripts
+; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
+; cgi.fix_pathinfo=0
+
 ; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
 ; security tokens of the calling client.  This allows IIS to define the
 ; security context that the request runs under.  mod_fastcgi under Apache
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.214r2=1.215diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.214 php-src/php.ini-recommended:1.215
--- php-src/php.ini-recommended:1.214   Fri May 25 19:24:29 2007
+++ php-src/php.ini-recommended Sun May 27 18:04:32 2007
@@ -456,6 +456,14 @@
 ; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
 ; cgi.redirect_status_env = ;
 
+; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  
PHP's
+; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not 
grok
+; what PATH_INFO is.  For more information on PATH_INFO, see the cgi specs.  
Setting
+; this to 1 will cause PHP CGI to fix it's paths to conform to the spec.  A 
setting
+; of zero causes PHP to behave as before.  Default is zero.  You should fix 
your scripts
+; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
+; cgi.fix_pathinfo=1
+
 ; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
 ; security tokens of the calling client.  This allows IIS to define the
 ; security context that the request runs under.  mod_fastcgi under Apache

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Hannes Magnusson]

bjori   Tue May 22 13:28:49 2007 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  MFB: max_input_nesting_level
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.263r2=1.264diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.263 php-src/php.ini-dist:1.264
--- php-src/php.ini-dist:1.263  Thu Apr 26 09:39:03 2007
+++ php-src/php.ini-distTue May 22 13:28:49 2007
@@ -201,6 +201,7 @@
 
 max_execution_time = 30 ; Maximum execution time of each script, in seconds
 max_input_time = 60; Maximum amount of time each script may spend parsing 
request data
+;max_input_nesting_level = 64 ; Maximum input variable nesting level
 memory_limit = 128M  ; Maximum amount of memory a script may consume 
(128MB)
 
 
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.212r2=1.213diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.212 php-src/php.ini-recommended:1.213
--- php-src/php.ini-recommended:1.212   Thu Apr 26 09:39:03 2007
+++ php-src/php.ini-recommended Tue May 22 13:28:49 2007
@@ -234,6 +234,7 @@
 
 max_execution_time = 30 ; Maximum execution time of each script, in seconds
 max_input_time = 60; Maximum amount of time each script may spend parsing 
request data
+;max_input_nesting_level = 64 ; Maximum input variable nesting level
 memory_limit = 128M  ; Maximum amount of memory a script may consume 
(128MB)
 
 

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /ext/standard/tests/strings highlight_file.phpt /main main.c /tests/strings 004.phpt bug26703.phpt

[Antony Dovgal]

tony2001Thu Apr 26 09:39:04 2007 UTC

  Modified files:  
/php-src/tests/strings  bug26703.phpt 004.phpt 
/php-srcphp.ini-recommended php.ini-dist 
/php-src/main   main.c 
/php-src/ext/standard/tests/strings highlight_file.phpt 
  Log:
  removed unused highlight.bg ini option
  
  
http://cvs.php.net/viewvc.cgi/php-src/tests/strings/bug26703.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/tests/strings/bug26703.phpt
diff -u php-src/tests/strings/bug26703.phpt:1.3 
php-src/tests/strings/bug26703.phpt:1.4
--- php-src/tests/strings/bug26703.phpt:1.3 Mon May 23 11:38:24 2005
+++ php-src/tests/strings/bug26703.phpt Thu Apr 26 09:39:03 2007
@@ -4,7 +4,6 @@
 highlight.string=#DD
 highlight.comment=#FF9900
 highlight.keyword=#007700
-highlight.bg=#FF
 highlight.default=#BB
 highlight.html=#00
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/tests/strings/004.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/tests/strings/004.phpt
diff -u php-src/tests/strings/004.phpt:1.6 php-src/tests/strings/004.phpt:1.7
--- php-src/tests/strings/004.phpt:1.6  Sun May 22 16:40:26 2005
+++ php-src/tests/strings/004.phpt  Thu Apr 26 09:39:03 2007
@@ -4,7 +4,6 @@
 highlight.string=#DD
 highlight.comment=#FF9900
 highlight.keyword=#007700
-highlight.bg=#FF
 highlight.default=#BB
 highlight.html=#00
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.211r2=1.212diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.211 php-src/php.ini-recommended:1.212
--- php-src/php.ini-recommended:1.211   Thu Apr 12 12:31:02 2007
+++ php-src/php.ini-recommended Thu Apr 26 09:39:03 2007
@@ -200,7 +200,6 @@
 ;highlight.string  = #DD
 ;highlight.comment = #FF9900
 ;highlight.keyword = #007700
-;highlight.bg  = #FF
 ;highlight.default = #BB
 ;highlight.html= #00
 
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.262r2=1.263diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.262 php-src/php.ini-dist:1.263
--- php-src/php.ini-dist:1.262  Thu Apr 12 12:31:02 2007
+++ php-src/php.ini-distThu Apr 26 09:39:03 2007
@@ -167,7 +167,6 @@
 ;highlight.string  = #DD
 ;highlight.comment = #FF9900
 ;highlight.keyword = #007700
-;highlight.bg  = #FF
 ;highlight.default = #BB
 ;highlight.html= #00
 
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.727r2=1.728diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.727 php-src/main/main.c:1.728
--- php-src/main/main.c:1.727   Wed Apr 18 09:48:07 2007
+++ php-src/main/main.c Thu Apr 26 09:39:03 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.727 2007/04/18 09:48:07 rrichards Exp $ */
+/* $Id: main.c,v 1.728 2007/04/26 09:39:03 tony2001 Exp $ */
 
 /* {{{ includes
  */
@@ -348,7 +348,6 @@
  */
 PHP_INI_BEGIN()
PHP_INI_ENTRY_EX(define_syslog_variables, 0,
PHP_INI_ALL,NULL,   php_ini_boolean_displayer_cb)
-   PHP_INI_ENTRY_EX(highlight.bg,HL_BG_COLOR,
PHP_INI_ALL,NULL,   php_ini_color_displayer_cb)
PHP_INI_ENTRY_EX(highlight.comment,   HL_COMMENT_COLOR,   
PHP_INI_ALL,NULL,   php_ini_color_displayer_cb)
PHP_INI_ENTRY_EX(highlight.default,   HL_DEFAULT_COLOR,   
PHP_INI_ALL,NULL,   php_ini_color_displayer_cb)
PHP_INI_ENTRY_EX(highlight.html,  HL_HTML_COLOR,  
PHP_INI_ALL,NULL,   php_ini_color_displayer_cb)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/highlight_file.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/highlight_file.phpt
diff -u php-src/ext/standard/tests/strings/highlight_file.phpt:1.1 
php-src/ext/standard/tests/strings/highlight_file.phpt:1.2
--- php-src/ext/standard/tests/strings/highlight_file.phpt:1.1  Thu Nov 16 
13:00:03 2006
+++ php-src/ext/standard/tests/strings/highlight_file.phpt  Thu Apr 26 
09:39:03 2007
@@ -4,7 +4,6 @@
 highlight.string=#DD
 highlight.comment=#FF9900
 highlight.keyword=#007700
-highlight.bg=#FF
 highlight.default=#BB
 highlight.html=#00
 --FILE--

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Antony Dovgal]

tony2001Thu Apr 12 10:24:58 2007 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  add short descriptions for PCRE ini options
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.260r2=1.261diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.260 php-src/php.ini-dist:1.261
--- php-src/php.ini-dist:1.260  Thu Dec 21 13:06:03 2006
+++ php-src/php.ini-distThu Apr 12 10:24:56 2007
@@ -586,7 +586,13 @@
 ;xmlrpc_errors = 0
 
 [Pcre]
+;PCRE library backtracking limit.
 ;pcre.recursion_limit=10
+
+;PCRE library recursion limit. 
+;Please note that if you set this value to a high number you may consume all 
+;the available process stack and eventually crash PHP (due to reaching the 
+;stack size limit imposed by the Operating System).
 ;pcre.backtrack_limit=10
 
 [Syslog]
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.209r2=1.210diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.209 php-src/php.ini-recommended:1.210
--- php-src/php.ini-recommended:1.209   Thu Dec 21 13:06:03 2006
+++ php-src/php.ini-recommended Thu Apr 12 10:24:57 2007
@@ -617,7 +617,13 @@
 ;xmlrpc_errors = 0
 
 [Pcre]
+;PCRE library backtracking limit.
 ;pcre.recursion_limit=10
+
+;PCRE library recursion limit. 
+;Please note that if you set this value to a high number you may consume all 
+;the available process stack and eventually crash PHP (due to reaching the 
+;stack size limit imposed by the Operating System).
 ;pcre.backtrack_limit=10
 
 [Syslog]

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Antony Dovgal]

tony2001Thu Apr 12 12:31:02 2007 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  swap the options
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.261r2=1.262diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.261 php-src/php.ini-dist:1.262
--- php-src/php.ini-dist:1.261  Thu Apr 12 10:24:56 2007
+++ php-src/php.ini-distThu Apr 12 12:31:02 2007
@@ -587,13 +587,13 @@
 
 [Pcre]
 ;PCRE library backtracking limit.
-;pcre.recursion_limit=10
+;pcre.backtrack_limit=10
 
 ;PCRE library recursion limit. 
 ;Please note that if you set this value to a high number you may consume all 
 ;the available process stack and eventually crash PHP (due to reaching the 
 ;stack size limit imposed by the Operating System).
-;pcre.backtrack_limit=10
+;pcre.recursion_limit=10
 
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.210r2=1.211diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.210 php-src/php.ini-recommended:1.211
--- php-src/php.ini-recommended:1.210   Thu Apr 12 10:24:57 2007
+++ php-src/php.ini-recommended Thu Apr 12 12:31:02 2007
@@ -618,13 +618,13 @@
 
 [Pcre]
 ;PCRE library backtracking limit.
-;pcre.recursion_limit=10
+;pcre.backtrack_limit=10
 
 ;PCRE library recursion limit. 
 ;Please note that if you set this value to a high number you may consume all 
 ;the available process stack and eventually crash PHP (due to reaching the 
 ;stack size limit imposed by the Operating System).
-;pcre.backtrack_limit=10
+;pcre.recursion_limit=10
 
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Dmitry Stogov]

dmitry  Thu Dec 21 13:06:03 2006 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Fixed comments
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.259r2=1.260diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.259 php-src/php.ini-dist:1.260
--- php-src/php.ini-dist:1.259  Thu Dec 21 09:12:59 2006
+++ php-src/php.ini-distThu Dec 21 13:06:03 2006
@@ -202,7 +202,7 @@
 
 max_execution_time = 30 ; Maximum execution time of each script, in seconds
 max_input_time = 60; Maximum amount of time each script may spend parsing 
request data
-memory_limit = 128M  ; Maximum amount of memory a script may consume (16MB)
+memory_limit = 128M  ; Maximum amount of memory a script may consume 
(128MB)
 
 
 ;;
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.208r2=1.209diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.208 php-src/php.ini-recommended:1.209
--- php-src/php.ini-recommended:1.208   Thu Dec 21 09:12:59 2006
+++ php-src/php.ini-recommended Thu Dec 21 13:06:03 2006
@@ -235,7 +235,7 @@
 
 max_execution_time = 30 ; Maximum execution time of each script, in seconds
 max_input_time = 60; Maximum amount of time each script may spend parsing 
request data
-memory_limit = 128M  ; Maximum amount of memory a script may consume (16MB)
+memory_limit = 128M  ; Maximum amount of memory a script may consume 
(128MB)
 
 
 ;;

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

RE: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c

[Dmitry Stogov]

Thanks Matt.
I don't like to read a lot of comments an documentation. :)

Dmitry.

 -Original Message-
 From: Matt Wilmas [mailto:[EMAIL PROTECTED] 
 Sent: Thursday, December 21, 2006 12:38 PM
 To: Dmitry Stogov; php-cvs@lists.php.net
 Subject: Re: [PHP-CVS] cvs: php-src / php.ini-dist 
 php.ini-recommended /main main.c 
 
 
 Hi Dmitry,
 
  -memory_limit = 16M  ; Maximum amount of memory a 
 script may consume (16MB)
  +memory_limit = 128M  ; Maximum amount of memory a 
 script may consume (16MB)
 
 It still says 16MB in parentheses. :-)
 
 
 Matt
 
 -- 
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php
 

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Edin Kadribasic]

edink   Tue Dec 19 10:34:58 2006 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.257r2=1.258diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.257 php-src/php.ini-dist:1.258
--- php-src/php.ini-dist:1.257  Sat Oct 14 15:07:36 2006
+++ php-src/php.ini-distTue Dec 19 10:34:58 2006
@@ -509,40 +509,51 @@
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extension_dir directive.
 
-;extension=php_mbstring.dll
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_exif.dll
 ;extension=php_fdf.dll
-;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
+;extension=php_gmp.dll
 ;extension=php_ifx.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
+;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
 ;extension=php_ming.dll
-;extension=php_mssql.dll
 ;extension=php_msql.dll
+;extension=php_mssql.dll
 ;extension=php_mysql.dll
+;extension=php_mysqli.dll
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
-;extension=php_oracle.dll
+;extension=php_pdo.dll
+;extension=php_pdo_firebird.dll
+;extension=php_pdo_mssql.dll
+;extension=php_pdo_mysql.dll
+;extension=php_pdo_oci.dll
+;extension=php_pdo_oci8.dll
+;extension=php_pdo_odbc.dll
+;extension=php_pdo_pgsql.dll
+;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
+;extension=php_pspell.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
+;extension=php_soap.dll
 ;extension=php_sockets.dll
 ;extension=php_sqlite.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-
+;extension=php_zip.dll
 
 ;;;
 ; Module Settings ;
@@ -710,6 +721,37 @@
 ; Maximum number of links (persistent+non persistent).  -1 means no limit.
 msql.max_links = -1
 
+[OCI8]
+; enables privileged connections using external credentials (OCI_SYSOPER, 
OCI_SYSDBA)
+;oci8.privileged_connect = Off
+
+; Connection: The maximum number of persistent OCI8 connections per
+; process. Using -1 means no limit.
+;oci8.max_persistent = -1
+
+; Connection: The maximum number of seconds a process is allowed to
+; maintain an idle persistent connection. Using -1 means idle
+; persistent connections will be maintained forever.
+;oci8.persistent_timeout = -1
+
+; Connection: The number of seconds that must pass before issuing a
+; ping during oci_pconnect() to check the connection validity. When
+; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
+; pings completely.
+;oci8.ping_interval = 60
+
+; Tuning: This option enables statement caching, and specifies how
+; many statements to cache. Using 0 disables statement caching.
+;oci8.statement_cache_size = 20
+
+; Tuning: Enables statement prefetching and sets the default number of
+; rows that will be fetched automatically after statement execution.
+;oci8.default_prefetch = 10
+
+; Compatibility. Using On means oci_close() will not close
+; oci_connect() and oci_new_connect() connections.
+;oci8.old_oci_close_semantics = Off
+
 [PostgresSQL]
 ; Allow or prevent persistent links.
 pgsql.allow_persistent = On
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.206r2=1.207diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.206 php-src/php.ini-recommended:1.207
--- php-src/php.ini-recommended:1.206   Sat Oct 14 15:07:36 2006
+++ php-src/php.ini-recommended Tue Dec 19 10:34:58 2006
@@ -540,40 +540,51 @@
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extension_dir directive.
 
-;extension=php_mbstring.dll
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_exif.dll
 ;extension=php_fdf.dll
-;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
+;extension=php_gmp.dll
 ;extension=php_ifx.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
+;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
 ;extension=php_ming.dll
-;extension=php_mssql.dll
 ;extension=php_msql.dll
+;extension=php_mssql.dll
 ;extension=php_mysql.dll
+;extension=php_mysqli.dll
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
-;extension=php_oracle.dll
+;extension=php_pdo.dll
+;extension=php_pdo_firebird.dll
+;extension=php_pdo_mssql.dll
+;extension=php_pdo_mysql.dll
+;extension=php_pdo_oci.dll
+;extension=php_pdo_oci8.dll
+;extension=php_pdo_odbc.dll
+;extension=php_pdo_pgsql.dll
+;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
+;extension=php_pspell.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
+;extension=php_soap.dll
 

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /ext/pdo pdo.c

[Hannes Magnusson]

bjori   Sat Oct 14 15:07:36 2006 UTC

  Modified files:  
/php-src/ext/pdopdo.c 
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  MFB: Remove bogus INI entry
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo.c?r1=1.75r2=1.76diff_format=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.75 php-src/ext/pdo/pdo.c:1.76
--- php-src/ext/pdo/pdo.c:1.75  Tue Jun 13 13:12:19 2006
+++ php-src/ext/pdo/pdo.c   Sat Oct 14 15:07:36 2006
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo.c,v 1.75 2006/06/13 13:12:19 dmitry Exp $ */
+/* $Id: pdo.c,v 1.76 2006/10/14 15:07:36 bjori Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -157,12 +157,6 @@
 ZEND_GET_MODULE(pdo)
 #endif
 
-/* {{{ PHP_INI */
-PHP_INI_BEGIN()
-STD_PHP_INI_ENTRY(pdo.global_value,  42, PHP_INI_ALL, 
OnUpdateLong, global_value, zend_pdo_globals, pdo_globals)
-PHP_INI_END()
-/* }}} */
-
 /* {{{ PHP_GINIT_FUNCTION */
 static PHP_GINIT_FUNCTION(pdo)
 {
@@ -321,8 +315,6 @@
 
spl_ce_RuntimeException = NULL;
 
-   REGISTER_INI_ENTRIES();
-
if (FAILURE == pdo_sqlstate_init_error_table()) {
return FAILURE;
}
@@ -348,7 +340,6 @@
 /* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(pdo)
 {
-   UNREGISTER_INI_ENTRIES();
zend_hash_destroy(pdo_driver_hash);
pdo_sqlstate_fini_error_table();
return SUCCESS;
@@ -381,9 +372,6 @@
 
php_info_print_table_end();
 
-#if 0
-   DISPLAY_INI_ENTRIES();
-#endif
 }
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.205r2=1.206diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.205 php-src/php.ini-recommended:1.206
--- php-src/php.ini-recommended:1.205   Thu Sep 28 19:39:25 2006
+++ php-src/php.ini-recommended Sat Oct 14 15:07:36 2006
@@ -598,9 +598,6 @@
 ;iconv.internal_encoding = ISO-8859-1
 ;iconv.output_encoding = ISO-8859-1
 
-[pdo]
-;pdo.global_value = 41
-
 [sqlite]
 ;sqlite.assoc_case = 0
 
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.256r2=1.257diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.256 php-src/php.ini-dist:1.257
--- php-src/php.ini-dist:1.256  Thu Sep 28 19:39:25 2006
+++ php-src/php.ini-distSat Oct 14 15:07:36 2006
@@ -567,9 +567,6 @@
 ;iconv.internal_encoding = ISO-8859-1
 ;iconv.output_encoding = ISO-8859-1
 
-[pdo]
-;pdo.global_value = 41
-
 [sqlite]
 ;sqlite.assoc_case = 0
 

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Hannes Magnusson]

bjori   Thu Sep 28 19:39:25 2006 UTC

  Modified files:  
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  MFB: remove unused ini options
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.204r2=1.205diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.204 php-src/php.ini-recommended:1.205
--- php-src/php.ini-recommended:1.204   Thu Sep 28 19:11:26 2006
+++ php-src/php.ini-recommended Thu Sep 28 19:39:25 2006
@@ -1056,28 +1056,6 @@
 ; error_reporting(0) around the eval().
 ;assert.quiet_eval = 0
 
-[Verisign Payflow Pro]
-; Default Payflow Pro server.
-pfpro.defaulthost = test-payflow.verisign.com
-
-; Default port to connect to.
-pfpro.defaultport = 443
-
-; Default timeout in seconds.
-pfpro.defaulttimeout = 30
-
-; Default proxy IP address (if required).
-;pfpro.proxyaddress =
-
-; Default proxy port.
-;pfpro.proxyport =
-
-; Default proxy logon.
-;pfpro.proxylogon =
-
-; Default proxy password.
-;pfpro.proxypassword =
-
 [COM]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
 ;com.typelib_file =
@@ -1148,7 +1126,6 @@
 ;fbsql.max_links = 128
 ;fbsql.max_persistent = -1
 ;fbsql.max_results = 128
-;fbsql.batchSize = 1000
 
 [gd]
 ; Tell the jpeg decode to libjpeg warnings and try to create
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.255r2=1.256diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.255 php-src/php.ini-dist:1.256
--- php-src/php.ini-dist:1.255  Thu Sep 28 19:11:26 2006
+++ php-src/php.ini-distThu Sep 28 19:39:25 2006
@@ -1025,28 +1025,6 @@
 ; error_reporting(0) around the eval().
 ;assert.quiet_eval = 0
 
-[Verisign Payflow Pro]
-; Default Payflow Pro server.
-pfpro.defaulthost = test-payflow.verisign.com
-
-; Default port to connect to.
-pfpro.defaultport = 443
-
-; Default timeout in seconds.
-pfpro.defaulttimeout = 30
-
-; Default proxy IP address (if required).
-;pfpro.proxyaddress =
-
-; Default proxy port.
-;pfpro.proxyport =
-
-; Default proxy logon.
-;pfpro.proxylogon =
-
-; Default proxy password.
-;pfpro.proxypassword =
-
 [COM]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
 ;com.typelib_file =
@@ -1100,9 +1078,6 @@
 ; 4: Overload ereg*() functions
 ;mbstring.func_overload = 0
 
-; enable strict encoding detection.
-;mbstring.strict_encoding = Off
-
 [FrontBase]
 ;fbsql.allow_persistent = On
 ;fbsql.autocommit = On
@@ -1117,7 +1092,6 @@
 ;fbsql.max_links = 128
 ;fbsql.max_persistent = -1
 ;fbsql.max_results = 128
-;fbsql.batchSize = 1000
 
 [gd]
 ; Tell the jpeg decode to libjpeg warnings and try to create

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Hannes Magnusson]

bjori   Sat Sep  9 22:07:00 2006 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  MFB: typos
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.253r2=1.254diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.253 php-src/php.ini-dist:1.254
--- php-src/php.ini-dist:1.253  Thu Aug 17 13:43:51 2006
+++ php-src/php.ini-distSat Sep  9 22:07:00 2006
@@ -277,7 +277,7 @@
 
 ; 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.
+; source lines.
 ignore_repeated_source = Off
 
 ; If this parameter is set to Off, then memory leaks will not be shown (on
@@ -633,7 +633,7 @@
 ; file will be able to reveal the password as well.
 mysql.default_password =
 
-; Maximum time (in secondes) for connect timeout. -1 means no limit
+; Maximum time (in seconds) for connect timeout. -1 means no limit
 mysql.connect_timeout = 60
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans 
and
@@ -721,7 +721,7 @@
 ; Minimum message severity to display.
 sybase.min_message_severity = 10
 
-; Compatability mode with old versions of PHP 3.0.
+; Compatibility mode with old versions of PHP 3.0.
 ; If on, this will cause PHP to automatically assign types to results according
 ; to their Sybase type, instead of treating them all as strings.  This
 ; compatibility mode will probably not stay around forever, so try applying
@@ -938,7 +938,7 @@
 ; Minimum message severity to display.
 mssql.min_message_severity = 10
 
-; Compatability mode with old versions of PHP 3.0.
+; Compatibility mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
 ; Connect timeout
@@ -1022,7 +1022,7 @@
 ;com.autoregister_typelib = true
 ; register constants casesensitive
 ;com.autoregister_casesensitive = false
-; show warnings on duplicate constat registrations
+; show warnings on duplicate constant registrations
 ;com.autoregister_verbose = true
 
 [mbstring]
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.202r2=1.203diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.202 php-src/php.ini-recommended:1.203
--- php-src/php.ini-recommended:1.202   Thu Aug 17 13:43:51 2006
+++ php-src/php.ini-recommended Sat Sep  9 22:07:00 2006
@@ -92,7 +92,7 @@
 ; The environment variables are not hashed into the $_ENV.  To access
 ; environment variables, you can use getenv() instead.
 ; - error_reporting = E_ALL[Code Cleanliness, Security(?)]
-; By default, PHP surpresses errors of type E_NOTICE.  These error messages
+; By default, PHP suppresses errors of type E_NOTICE.  These error messages
 ; are emitted for non-critical errors, but that could be a symptom of a 
bigger
 ; problem.  Most notably, this will cause error messages about the use
 ; of uninitialized variables to be displayed.
@@ -310,7 +310,7 @@
 
 ; 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.
+; source lines.
 ignore_repeated_source = Off
 
 ; If this parameter is set to Off, then memory leaks will not be shown (on
@@ -664,7 +664,7 @@
 ; file will be able to reveal the password as well.
 mysql.default_password =
 
-; Maximum time (in secondes) for connect timeout. -1 means no limit
+; Maximum time (in seconds) for connect timeout. -1 means no limit
 mysql.connect_timeout = 60
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans 
and
@@ -752,10 +752,10 @@
 ; Minimum message severity to display.
 sybase.min_message_severity = 10
 
-; Compatability mode with old versions of PHP 3.0.
+; Compatibility mode with old versions of PHP 3.0.
 ; If on, this will cause PHP to automatically assign types to results according
 ; to their Sybase type, instead of treating them all as strings.  This
-; compatability mode will probably not stay around forever, so try applying
+; compatibility mode will probably not stay around forever, so try applying
 ; whatever necessary changes to your code, and turn it off.
 sybase.compatability_mode = Off
 
@@ -969,7 +969,7 @@
 ; Minimum message severity to display.
 mssql.min_message_severity = 10
 
-; Compatability mode with old versions of PHP 3.0.
+; Compatibility mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
 ; Connect timeout
@@ -1053,7 +1053,7 @@
 ;com.autoregister_typelib = true
 ; register constants casesensitive
 ;com.autoregister_casesensitive = false
-; show warnings on duplicate constat registrations
+; show warnings on duplicate constant registrations
 ;com.autoregister_verbose = true
 
 [mbstring]



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c

[Ilia Alshanetsky]

iliaa   Thu Aug 17 13:43:51 2006 UTC

  Modified files:  
/php-src/main   main.c 
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  MFB: Increased default memory limit to 16 megabytes to accommodate for a
  more accurate memory utilization measurement.
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.699r2=1.700diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.699 php-src/main/main.c:1.700
--- php-src/main/main.c:1.699   Wed Jul 19 12:25:02 2006
+++ php-src/main/main.c Thu Aug 17 13:43:51 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.699 2006/07/19 12:25:02 mike Exp $ */
+/* $Id: main.c,v 1.700 2006/08/17 13:43:51 iliaa Exp $ */
 
 /* {{{ includes
  */
@@ -409,7 +409,7 @@
PHP_INI_ENTRY(smtp_port,  25,   
PHP_INI_ALL,NULL)
PHP_INI_ENTRY(browscap,   NULL,   
PHP_INI_SYSTEM, NULL)
 #if MEMORY_LIMIT
-   PHP_INI_ENTRY(memory_limit,   8M,   
PHP_INI_ALL,OnChangeMemoryLimit)
+   PHP_INI_ENTRY(memory_limit,   16M,  
PHP_INI_ALL,OnChangeMemoryLimit)
 #endif
PHP_INI_ENTRY(precision,  14,   
PHP_INI_ALL,OnSetPrecision)
PHP_INI_ENTRY(sendmail_from,  NULL,   
PHP_INI_ALL,NULL)
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.252r2=1.253diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.252 php-src/php.ini-dist:1.253
--- php-src/php.ini-dist:1.252  Mon Aug 14 18:39:30 2006
+++ php-src/php.ini-distThu Aug 17 13:43:51 2006
@@ -201,7 +201,7 @@
 
 max_execution_time = 30 ; Maximum execution time of each script, in seconds
 max_input_time = 60; Maximum amount of time each script may spend parsing 
request data
-memory_limit = 8M  ; Maximum amount of memory a script may consume (8MB)
+memory_limit = 16M  ; Maximum amount of memory a script may consume (16MB)
 
 
 ;;
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.201r2=1.202diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.201 php-src/php.ini-recommended:1.202
--- php-src/php.ini-recommended:1.201   Mon Aug 14 18:39:30 2006
+++ php-src/php.ini-recommended Thu Aug 17 13:43:51 2006
@@ -234,7 +234,7 @@
 
 max_execution_time = 30 ; Maximum execution time of each script, in seconds
 max_input_time = 60; Maximum amount of time each script may spend parsing 
request data
-memory_limit = 8M  ; Maximum amount of memory a script may consume (8MB)
+memory_limit = 16M  ; Maximum amount of memory a script may consume (16MB)
 
 
 ;;

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /ext/fbsql php_fbsql.c php_fbsql.h

[Frank M. Kromann]

fmk Mon Aug 14 18:39:30 2006 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/ext/fbsql  php_fbsql.c php_fbsql.h 
  Log:
  Cleanup before reusing failed persistant connection. Better formating of 
timestamp and decimal values
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.251r2=1.252diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.251 php-src/php.ini-dist:1.252
--- php-src/php.ini-dist:1.251  Thu Aug 10 13:56:54 2006
+++ php-src/php.ini-distMon Aug 14 18:39:30 2006
@@ -1072,6 +1072,7 @@
 [FrontBase]
 ;fbsql.allow_persistent = On
 ;fbsql.autocommit = On
+;fbsql.show_timestamp_decimals = Off
 ;fbsql.default_database =
 ;fbsql.default_database_password =
 ;fbsql.default_host =
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.200r2=1.201diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.200 php-src/php.ini-recommended:1.201
--- php-src/php.ini-recommended:1.200   Thu Aug 10 13:56:54 2006
+++ php-src/php.ini-recommended Mon Aug 14 18:39:30 2006
@@ -1103,6 +1103,7 @@
 [FrontBase]
 ;fbsql.allow_persistent = On
 ;fbsql.autocommit = On
+;fbsql.show_timestamp_decimals = Off
 ;fbsql.default_database =
 ;fbsql.default_database_password =
 ;fbsql.default_host =
http://cvs.php.net/viewvc.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.119r2=1.120diff_format=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.119 php-src/ext/fbsql/php_fbsql.c:1.120
--- php-src/ext/fbsql/php_fbsql.c:1.119 Wed Jun 14 21:29:22 2006
+++ php-src/ext/fbsql/php_fbsql.c   Mon Aug 14 18:39:30 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_fbsql.c,v 1.119 2006/06/14 21:29:22 bjori Exp $ */
+/* $Id: php_fbsql.c,v 1.120 2006/08/14 18:39:30 fmk Exp $ */
 
 /* TODO:
  *
@@ -58,6 +58,10 @@
 
 #define HAVE_FBSQL 1
 
+#ifndef min
+# define min(a,b) ((a)(b)?(a):(b))
+#endif
+
 #if HAVE_FBSQL
 #include php_fbsql.h
 #include signal.h
@@ -737,6 +741,7 @@
STD_PHP_INI_BOOLEAN  (fbsql.allow_persistent, 
1,PHP_INI_SYSTEM, OnUpdateBool,   allowPersistent,  
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_BOOLEAN  (fbsql.generate_warnings,
0,PHP_INI_SYSTEM, OnUpdateBool,   generateWarnings, 
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_BOOLEAN  (fbsql.autocommit,   
1,PHP_INI_SYSTEM, OnUpdateBool,   autoCommit,   
zend_fbsql_globals, fbsql_globals)
+   STD_PHP_INI_BOOLEAN  (fbsql.show_timestamp_decimals,  0,
PHP_INI_SYSTEM, OnUpdateBool,   showTimestampDecimals,  
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_ENTRY_EX (fbsql.max_persistent,   
-1,   PHP_INI_SYSTEM, OnUpdateLong,   maxPersistent,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY_EX (fbsql.max_links,
128,  PHP_INI_SYSTEM, OnUpdateLong,   maxLinks, 
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY_EX (fbsql.max_connections,  
128,  PHP_INI_SYSTEM, OnUpdateLong,   maxConnections,   
zend_fbsql_globals, fbsql_globals, display_link_numbers)
@@ -896,7 +901,26 @@
if (persistent) {
if (zend_hash_find(EG(persistent_list), name, strlen(name) + 
1, (void **)lep) == SUCCESS)
{
+   FBCMetaData *md;
phpLink = (PHPFBLink*)lep-ptr;
+   // Check if connection still there.
+   md = fbcdcRollback(phpLink-connection);
+   if ( !mdOk(phpLink, md, Rollback;) ) {
+   if (FB_SQL_G(generateWarnings)) {
+   php_error_docref(NULL TSRMLS_CC, 
E_WARNING, FrontBase link is not connected, ty to reconnect.);
+   }
+   // Make sure select_db will reconnect.
+   fbcmdRelease(md);
+   fbcdcClose(phpLink-connection);
+   fbcdcRelease(phpLink-connection);
+   free(phpLink-connection);
+   phpLink-connection = NULL;
+   if (phpLink-databaseName) 
free(phpLink-databaseName);
+   phpLink-databaseName = NULL;
+   }
+   else {
+   fbcmdRelease(md);
+   }
}
else {
zend_rsrc_list_entry le;
@@ -2866,8 +2890,6 @@
case FB_Float:
case FB_Real:
case FB_Double:
-   case 

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /ext/session php_session.h session.c /ext/standard head.c head.h

[Ilia Alshanetsky]

iliaa   Thu Aug 10 13:56:54 2006 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/ext/standard   head.c head.h 
/php-src/ext/sessionphp_session.h session.c 
  Log:
  MFB: Added support for httpOnly flag for session extension and cookie
  setting functions.
  
  http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.250r2=1.251diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.250 php-src/php.ini-dist:1.251
--- php-src/php.ini-dist:1.250  Wed Jun 28 15:07:14 2006
+++ php-src/php.ini-distThu Aug 10 13:56:54 2006
@@ -842,6 +842,9 @@
 ; The domain for which the cookie is valid.
 session.cookie_domain =
 
+; Whether or not to add the httpOnly flag to the cookie, which makes it 
inaccessible to browser scripting languages such as JavaScript.
+session.cookie_httponly = 
+
 ; Handler used to serialize data.  php is the standard serializer of PHP.
 session.serialize_handler = php
 
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.199r2=1.200diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.199 php-src/php.ini-recommended:1.200
--- php-src/php.ini-recommended:1.199   Wed Jun 28 15:07:14 2006
+++ php-src/php.ini-recommended Thu Aug 10 13:56:54 2006
@@ -873,6 +873,9 @@
 ; The domain for which the cookie is valid.
 session.cookie_domain =
 
+; Whether or not to add the httpOnly flag to the cookie, which makes it 
inaccessible to browser scripting languages such as JavaScript.
+session.cookie_httponly = 
+
 ; Handler used to serialize data.  php is the standard serializer of PHP.
 session.serialize_handler = php
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/head.c?r1=1.88r2=1.89diff_format=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.88 php-src/ext/standard/head.c:1.89
--- php-src/ext/standard/head.c:1.88Sat Jun  3 11:19:43 2006
+++ php-src/ext/standard/head.c Thu Aug 10 13:56:54 2006
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf [EMAIL PROTECTED]|
+--+
  */
-/* $Id: head.c,v 1.88 2006/06/03 11:19:43 mike Exp $ */
+/* $Id: head.c,v 1.89 2006/08/10 13:56:54 iliaa Exp $ */
 
 #include stdio.h
 #include php.h
@@ -59,7 +59,7 @@
 }
 
 
-PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, 
time_t expires, char *path, int path_len, char *domain, int domain_len, int 
secure, int url_encode TSRMLS_DC)
+PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, 
time_t expires, char *path, int path_len, char *domain, int domain_len, int 
secure, int url_encode, int httponly TSRMLS_DC)
 {
char *cookie, *encoded_value = NULL;
int len=sizeof(Set-Cookie: );
@@ -130,6 +130,9 @@
if (secure) {
strcat(cookie, ; secure);
}
+   if (httponly) {
+   strcat(cookie, ; httponly);
+   }
 
ctr.line = cookie;
ctr.line_len = strlen(cookie);
@@ -141,22 +144,22 @@
 
 
 /* php_set_cookie(name, value, expires, path, domain, secure) */
-/* {{{ proto bool setcookie(string name [, string value [, int expires [, 
string path [, string domain [, bool secure])
+/* {{{ proto bool setcookie(string name [, string value [, int expires [, 
string path [, string domain [, bool secure[, bool httponly]])
Send a cookie */
 PHP_FUNCTION(setcookie)
 {
char *name, *value = NULL, *path = NULL, *domain = NULL;
long expires = 0;
-   zend_bool secure = 0;
+   zend_bool secure = 0, httponly = 0;
int name_len, value_len, path_len, domain_len;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|slssb, name,
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|slssbb, name,
  name_len, value, 
value_len, expires, path,
- path_len, domain, 
domain_len, secure) == FAILURE) {
+ path_len, domain, 
domain_len, secure, httponly) == FAILURE) {
return;
}
 
-   if (php_setcookie(name, name_len, value, value_len, expires, path, 
path_len, domain, domain_len, secure, 1 TSRMLS_CC) == SUCCESS) {
+   if (php_setcookie(name, name_len, value, value_len, expires, path, 
path_len, domain, domain_len, secure, 1, httponly TSRMLS_CC) == SUCCESS) {
RETVAL_TRUE;
} else {
RETVAL_FALSE;
@@ -164,22 +167,22 @@
 }
 /* }}} */
 
-/* {{{ proto bool setrawcookie(string name [, string value [, int expires [, 
string path [, string domain [, bool secure])
+/* {{{ proto bool setrawcookie(string name [, string value [, int expires [, 
string path [, string domain [, bool secure[, bool httponly]])
Send a cookie with no url encoding of the value */
 PHP_FUNCTION(setrawcookie)
 {
 

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Ilia Alshanetsky]

iliaa   Wed Feb  8 23:47:02 2006 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  MFB51: Fixed bug #36334 (Added missing documentation about realpath cache INI 
  settings).
  
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.244r2=1.245diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.244 php-src/php.ini-dist:1.245
--- php-src/php.ini-dist:1.244  Sun Feb  5 16:05:46 2006
+++ php-src/php.ini-distWed Feb  8 23:47:01 2006
@@ -227,6 +227,16 @@
 ; being interrupted by the user or a browser timing out.
 ; ignore_user_abort = On
 
+; Determines the size of the realpath cache to be used by PHP. This value 
should
+; be increased on systems where PHP opens many files to reflect the quantity of
+; the file operations performed.
+; realpath_cache_size=16k
+
+; Duration of time, in seconds for which to cache realpath information for a 
given
+; file or directory. For systems with rarely changing files, consider 
increasing this
+; value.
+; realpath_cache_ttl=120
+
 ;
 ; Misc
 ;
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.193r2=1.194diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.193 php-src/php.ini-recommended:1.194
--- php-src/php.ini-recommended:1.193   Sun Feb  5 16:05:46 2006
+++ php-src/php.ini-recommended Wed Feb  8 23:47:01 2006
@@ -285,6 +285,16 @@
 ; being interrupted by the user or a browser timing out.
 ; ignore_user_abort = On
 
+; Determines the size of the realpath cache to be used by PHP. This value 
should
+; be increased on systems where PHP opens many files to reflect the quantity of
+; the file operations performed.
+; realpath_cache_size=16k
+
+; Duration of time, in seconds for which to cache realpath information for a 
given
+; file or directory. For systems with rarely changing files, consider 
increasing this
+; value.
+; realpath_cache_ttl=120
+
 ;
 ; Misc
 ;

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Pierre-Alain Joye]

pajoye  Sun Feb  5 16:05:46 2006 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - MFB: ini entry for gd.jpeg_ignore_warning
  
  
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.243r2=1.244diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.243 php-src/php.ini-dist:1.244
--- php-src/php.ini-dist:1.243  Sat Jan 21 02:49:32 2006
+++ php-src/php.ini-distSun Feb  5 16:05:46 2006
@@ -1161,6 +1161,12 @@
 ;fbsql.max_results = 128
 ;fbsql.batchSize = 1000
 
+[gd]
+; Tell the jpeg decode to libjpeg warnings and try to create
+; a gd image. The warning will then be displayed as notices
+; disabled by default
+;gd.jpeg_ignore_warning = 0
+
 [exif]
 ; 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
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.192r2=1.193diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.192 php-src/php.ini-recommended:1.193
--- php-src/php.ini-recommended:1.192   Sat Jan 21 02:49:32 2006
+++ php-src/php.ini-recommended Sun Feb  5 16:05:46 2006
@@ -1218,6 +1218,12 @@
 ;fbsql.max_results = 128
 ;fbsql.batchSize = 1000
 
+[gd]
+; Tell the jpeg decode to libjpeg warnings and try to create
+; a gd image. The warning will then be displayed as notices
+; disabled by default
+;gd.jpeg_ignore_warning = 0
+
 [exif]
 ; 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

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Rui Hirokawa]

hirokawaSat Jan 21 02:49:32 2006 UTC

  Modified files:  
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  added new option of mbstring to php.ini
  
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.191r2=1.192diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.191 php-src/php.ini-recommended:1.192
--- php-src/php.ini-recommended:1.191   Fri Dec 30 17:13:30 2005
+++ php-src/php.ini-recommended Sat Jan 21 02:49:32 2006
@@ -1200,6 +1200,9 @@
 ; 4: Overload ereg*() functions
 ;mbstring.func_overload = 0
 
+; enable strict encoding detection.
+;mbstring.strict_encoding = Off
+
 [FrontBase]
 ;fbsql.allow_persistent = On
 ;fbsql.autocommit = On
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.242r2=1.243diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.242 php-src/php.ini-dist:1.243
--- php-src/php.ini-dist:1.242  Fri Dec 30 17:13:30 2005
+++ php-src/php.ini-distSat Jan 21 02:49:32 2006
@@ -1143,6 +1143,9 @@
 ; 4: Overload ereg*() functions
 ;mbstring.func_overload = 0
 
+; enable strict encoding detection.
+;mbstring.strict_encoding = Off
+
 [FrontBase]
 ;fbsql.allow_persistent = On
 ;fbsql.autocommit = On

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

sniper  Fri Dec 30 12:20:39 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  typofixes
  
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.240r2=1.241diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.240 php-src/php.ini-dist:1.241
--- php-src/php.ini-dist:1.240  Wed Dec 21 22:44:04 2005
+++ php-src/php.ini-distFri Dec 30 12:20:39 2005
@@ -139,7 +139,7 @@
 
 ; The unserialize callback function will be called (with the undefined class'
 ; name as parameter), if the unserializer finds an undefined class
-; which should be instantiated.
+; 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
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.189r2=1.190diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.189 php-src/php.ini-recommended:1.190
--- php-src/php.ini-recommended:1.189   Wed Dec 21 22:44:04 2005
+++ php-src/php.ini-recommended Fri Dec 30 12:20:39 2005
@@ -1175,7 +1175,7 @@
 ; registered as output buffer to function
 ;mbstring.http_output = SJIS
 
-; enable automatic encoding translation accoding to
+; enable automatic encoding translation according 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

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

RE: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Ford, Mike]

 -Original Message-
 From: Jani Taskinen [mailto:[EMAIL PROTECTED]
 Sent: Fri 30/12/2005 12:20
  
 sniperFri Dec 30 12:20:39 2005 EDT
 
   Modified files:  
 /php-src  php.ini-dist php.ini-recommended 
   Log:
   typofixes
   
 http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.240r2=1.241diff_format=u
 Index: php-src/php.ini-dist
 diff -u php-src/php.ini-dist:1.240 php-src/php.ini-dist:1.241
 --- php-src/php.ini-dist:1.240Wed Dec 21 22:44:04 2005
 +++ php-src/php.ini-dist  Fri Dec 30 12:20:39 2005
 @@ -139,7 +139,7 @@
  
  ; The unserialize callback function will be called (with the undefined class'
  ; name as parameter), if the unserializer finds an undefined class
 -; which should be instantiated.
 +; which should be instanciated.

Sorry, but this is an incorrect fix -- instantiated was right (yes, yet another 
oddity of English -- you really do instantiate instances!).

Cheers!

Mike


To view the terms under which this email is distributed, please go to 
http://disclaimer.leedsmet.ac.uk/email.htm

Re: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Andi Gutmans]

At 04:20 AM 12/30/2005, Jani Taskinen wrote:

-; which should be instantiated.
+; which should be instanciated.


Hey,

You introduced a typo. The previous version was fine.
Andi 


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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Rasmus Lerdorf]

rasmus  Fri Dec 30 17:13:30 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  instantiated was correct
  
  
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.241r2=1.242diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.241 php-src/php.ini-dist:1.242
--- php-src/php.ini-dist:1.241  Fri Dec 30 12:20:39 2005
+++ php-src/php.ini-distFri Dec 30 17:13:30 2005
@@ -139,7 +139,7 @@
 
 ; The unserialize callback function will be called (with the undefined class'
 ; name as parameter), if the unserializer finds an undefined class
-; which should be instanciated.
+; which should be instantiated.
 ; 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
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.190r2=1.191diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.190 php-src/php.ini-recommended:1.191
--- php-src/php.ini-recommended:1.190   Fri Dec 30 12:20:39 2005
+++ php-src/php.ini-recommended Fri Dec 30 17:13:30 2005
@@ -197,7 +197,7 @@
 
 ; The unserialize callback function will be called (with the undefined class'
 ; name as parameter), if the unserializer finds an undefined class
-; which should be instanciated.
+; which should be instantiated.
 ; 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

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

RE: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

Never trust bug reports. :)

--Jani

On Fri, 30 Dec 2005, Ford, Mike wrote:


-Original Message-
From: Jani Taskinen [mailto:[EMAIL PROTECTED]
Sent: Fri 30/12/2005 12:20

sniper  Fri Dec 30 12:20:39 2005 EDT

  Modified files:
/php-srcphp.ini-dist php.ini-recommended
  Log:
  typofixes

http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.240r2=1.241diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.240 php-src/php.ini-dist:1.241
--- php-src/php.ini-dist:1.240  Wed Dec 21 22:44:04 2005
+++ php-src/php.ini-distFri Dec 30 12:20:39 2005
@@ -139,7 +139,7 @@

 ; The unserialize callback function will be called (with the undefined class'
 ; name as parameter), if the unserializer finds an undefined class
-; which should be instantiated.
+; which should be instanciated.


Sorry, but this is an incorrect fix -- instantiated was right (yes, yet another 
oddity of English -- you really do instantiate instances!).

Cheers!

Mike


To view the terms under which this email is distributed, please go to 
http://disclaimer.leedsmet.ac.uk/email.htm



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /ext/session session.c

[Jani Taskinen]

sniper  Fri Dec  2 13:42:41 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/ext/sessionsession.c 
  Log:
  - Changed session.use_only_cookies to be on by default.
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.238r2=1.239ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.238 php-src/php.ini-dist:1.239
--- php-src/php.ini-dist:1.238  Fri Nov 18 11:20:41 2005
+++ php-src/php.ini-distFri Dec  2 13:42:40 2005
@@ -895,8 +895,8 @@
 session.use_cookies = 1
 
 ; 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
+; attacks which involve passing session ids in URLs; defaults to 1.
+session.use_only_cookies = 1
 
 ; Name of the session (used as cookie name).
 session.name = PHPSESSID
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.187r2=1.188ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.187 php-src/php.ini-recommended:1.188
--- php-src/php.ini-recommended:1.187   Fri Nov 18 11:20:41 2005
+++ php-src/php.ini-recommended Fri Dec  2 13:42:40 2005
@@ -952,8 +952,8 @@
 session.use_cookies = 1
 
 ; 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
+; attacks which involve passing session ids in URLs; defaults to 1.
+session.use_only_cookies = 1
 
 ; Name of the session (used as cookie name).
 session.name = PHPSESSID
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.422r2=1.423ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.422 php-src/ext/session/session.c:1.423
--- php-src/ext/session/session.c:1.422 Fri Sep 23 04:13:57 2005
+++ php-src/ext/session/session.c   Fri Dec  2 13:42:41 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: session.c,v 1.422 2005/09/23 08:13:57 sniper Exp $ */
+/* $Id: session.c,v 1.423 2005/12/02 18:42:41 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -167,7 +167,7 @@
STD_PHP_INI_ENTRY(session.cookie_domain,  ,  
PHP_INI_ALL, OnUpdateString, cookie_domain,  php_ps_globals,ps_globals)
STD_PHP_INI_BOOLEAN(session.cookie_secure,,  
PHP_INI_ALL, OnUpdateBool,   cookie_secure,  php_ps_globals,ps_globals)
STD_PHP_INI_BOOLEAN(session.use_cookies,  1, 
PHP_INI_ALL, OnUpdateBool,   use_cookies,php_ps_globals,ps_globals)
-   STD_PHP_INI_BOOLEAN(session.use_only_cookies, 0, 
PHP_INI_ALL, OnUpdateBool,   use_only_cookies,   php_ps_globals,ps_globals)
+   STD_PHP_INI_BOOLEAN(session.use_only_cookies, 1, 
PHP_INI_ALL, OnUpdateBool,   use_only_cookies,   php_ps_globals,ps_globals)
STD_PHP_INI_ENTRY(session.referer_check,  ,  
PHP_INI_ALL, OnUpdateString, extern_referer_chk, php_ps_globals,ps_globals)
STD_PHP_INI_ENTRY(session.entropy_file,   ,  
PHP_INI_ALL, OnUpdateString, entropy_file,   php_ps_globals,ps_globals)
STD_PHP_INI_ENTRY(session.entropy_length, 0, 
PHP_INI_ALL, OnUpdateLong,entropy_length, php_ps_globals,ps_globals)

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c php_globals.h /main/streams streams.c

[Rasmus Lerdorf]

rasmus  Fri Nov 18 11:20:43 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/main   main.c php_globals.h 
/php-src/main/streams   streams.c 
  Log:
  Add allow_url_include to let people turn on allow_url_fopen without also
  enabling remote code execution through url wrappers
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.237r2=1.238ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.237 php-src/php.ini-dist:1.238
--- php-src/php.ini-dist:1.237  Mon Nov 14 18:14:54 2005
+++ php-src/php.ini-distFri Nov 18 11:20:41 2005
@@ -529,6 +529,8 @@
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
 allow_url_fopen = On
+; Whether to allow code execution through URL wrappers
+allow_url_include = Off
 
 ; Define the anonymous ftp password (your email address)
 ;from=[EMAIL PROTECTED]
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.186r2=1.187ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.186 php-src/php.ini-recommended:1.187
--- php-src/php.ini-recommended:1.186   Mon Nov 14 18:14:54 2005
+++ php-src/php.ini-recommended Fri Nov 18 11:20:41 2005
@@ -586,6 +586,8 @@
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
 allow_url_fopen = On
+; Whether to allow code execution through URL wrappers
+allow_url_include = Off
 
 ; Define the anonymous ftp password (your email address)
 ;from=[EMAIL PROTECTED]
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.651r2=1.652ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.651 php-src/main/main.c:1.652
--- php-src/main/main.c:1.651   Tue Nov 15 06:14:34 2005
+++ php-src/main/main.c Fri Nov 18 11:20:43 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.651 2005/11/15 11:14:34 dmitry Exp $ */
+/* $Id: main.c,v 1.652 2005/11/18 16:20:43 rasmus Exp $ */
 
 /* {{{ includes
  */
@@ -439,6 +439,7 @@
PHP_INI_ENTRY(disable_classes,, 
PHP_INI_SYSTEM, NULL)
 
STD_PHP_INI_BOOLEAN(allow_url_fopen,  1,
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_fopen,
php_core_globals,   core_globals)
+   STD_PHP_INI_BOOLEAN(allow_url_include,0,
PHP_INI_SYSTEM, OnUpdateBool,   allow_url_include,  
php_core_globals,   core_globals)
STD_PHP_INI_BOOLEAN(always_populate_raw_post_data,0,
PHP_INI_SYSTEM|PHP_INI_PERDIR,  OnUpdateBool,   
always_populate_raw_post_data,  php_core_globals,   
core_globals)
 #ifdef REALPATH_CACHE
STD_PHP_INI_ENTRY(realpath_cache_size, 16K, PHP_INI_SYSTEM, 
OnUpdateLong, realpath_cache_size_limit, virtual_cwd_globals, cwd_globals)
http://cvs.php.net/diff.php/php-src/main/php_globals.h?r1=1.98r2=1.99ty=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.98 php-src/main/php_globals.h:1.99
--- php-src/main/php_globals.h:1.98 Wed Aug  3 10:08:33 2005
+++ php-src/main/php_globals.h  Fri Nov 18 11:20:43 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_globals.h,v 1.98 2005/08/03 14:08:33 sniper Exp $ */
+/* $Id: php_globals.h,v 1.99 2005/11/18 16:20:43 rasmus Exp $ */
 
 #ifndef PHP_GLOBALS_H
 #define PHP_GLOBALS_H
@@ -150,6 +150,7 @@
 
char *disable_functions;
char *disable_classes;
+   zend_bool allow_url_include;
 };
 
 
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.89r2=1.90ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.89 php-src/main/streams/streams.c:1.90
--- php-src/main/streams/streams.c:1.89 Wed Oct  5 17:46:28 2005
+++ php-src/main/streams/streams.c  Fri Nov 18 11:20:43 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.89 2005/10/05 21:46:28 tony2001 Exp $ */
+/* $Id: streams.c,v 1.90 2005/11/18 16:20:43 rasmus Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -2205,7 +2205,7 @@
return php_plain_files_wrapper;
}
 
-   if (wrapper  wrapper-is_url  !PG(allow_url_fopen)) {
+   if ((wrapper  wrapper-is_url)  (!PG(allow_url_fopen) || (options  
STREAM_OPEN_FOR_INCLUDE)  !PG(allow_url_include)) ) {
if (options  REPORT_ERRORS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, URL 
file-access is disabled in the server configuration);
}

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Derick Rethans]

derick  Sun Nov  6 06:08:54 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - E_STRICT is not part of E_ALL, so the lines were wrong here.
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.235r2=1.236ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.235 php-src/php.ini-dist:1.236
--- php-src/php.ini-dist:1.235  Sat Sep 24 11:15:13 2005
+++ php-src/php.ini-distSun Nov  6 06:08:50 2005
@@ -278,11 +278,11 @@
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL  ~E_NOTICE  ~E_STRICT
+;error_reporting = E_ALL  ~E_NOTICE
 ;
 ;   - Show all errors, except for notices
 ;
-;error_reporting = E_ALL  ~E_NOTICE
+;error_reporting = E_ALL  ~E_NOTICE | E_STRICT
 ;
 ;   - Show only errors
 ;
@@ -290,7 +290,7 @@
 ;
 ;   - Show all errors except for notices and coding standards warnings
 ;
-error_reporting  =  E_ALL  ~E_NOTICE  ~E_STRICT
+error_reporting  =  E_ALL  ~E_NOTICE
 
 ; Print out errors (as a part of the output).  For production web sites,
 ; you're strongly encouraged to turn this feature off, and use error logging
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.184r2=1.185ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.184 php-src/php.ini-recommended:1.185
--- php-src/php.ini-recommended:1.184   Tue Nov  1 11:22:04 2005
+++ php-src/php.ini-recommended Sun Nov  6 06:08:50 2005
@@ -336,11 +336,11 @@
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL  ~E_NOTICE  ~E_STRICT
+;error_reporting = E_ALL  ~E_NOTICE
 ;
 ;   - Show all errors, except for notices
 ;
-;error_reporting = E_ALL  ~E_NOTICE
+;error_reporting = E_ALL  ~E_NOTICE | E_STRICT
 ;
 ;   - Show only errors
 ;

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /ext/pdo config.w32 /ext/sqlite config.w32

[Edin Kadribasic]

edink   Sat Sep 24 11:15:13 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/ext/pdoconfig.w32 
/php-src/ext/sqlite config.w32 
  Log:
  MFB: Build PDO and SQLite as shared
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.234r2=1.235ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.234 php-src/php.ini-dist:1.235
--- php-src/php.ini-dist:1.234  Thu Sep 15 12:19:37 2005
+++ php-src/php.ini-distSat Sep 24 11:15:13 2005
@@ -603,6 +603,7 @@
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
+;extension=php_sqlite.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.182r2=1.183ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.182 php-src/php.ini-recommended:1.183
--- php-src/php.ini-recommended:1.182   Thu Sep 15 12:19:37 2005
+++ php-src/php.ini-recommended Sat Sep 24 11:15:13 2005
@@ -660,6 +660,7 @@
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
+;extension=php_sqlite.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
http://cvs.php.net/diff.php/php-src/ext/pdo/config.w32?r1=1.5r2=1.6ty=u
Index: php-src/ext/pdo/config.w32
diff -u php-src/ext/pdo/config.w32:1.5 php-src/ext/pdo/config.w32:1.6
--- php-src/ext/pdo/config.w32:1.5  Fri Mar 11 20:15:37 2005
+++ php-src/ext/pdo/config.w32  Sat Sep 24 11:15:13 2005
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.5 2005/03/12 01:15:37 wez Exp $
+// $Id: config.w32,v 1.6 2005/09/24 15:15:13 edink Exp $
 // vim:ft=javascript
 
-ARG_ENABLE(pdo, Enable PHP Data Objects support, yes);
+ARG_ENABLE(pdo, Enable PHP Data Objects support, no);
 
 if (PHP_PDO != no) {
EXTENSION('pdo', 'pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c 
pdo_sqlstate.c');
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.w32?r1=1.8r2=1.9ty=u
Index: php-src/ext/sqlite/config.w32
diff -u php-src/ext/sqlite/config.w32:1.8 php-src/ext/sqlite/config.w32:1.9
--- php-src/ext/sqlite/config.w32:1.8   Fri Mar 11 20:14:21 2005
+++ php-src/ext/sqlite/config.w32   Sat Sep 24 11:15:13 2005
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.8 2005/03/12 01:14:21 wez Exp $
+// $Id: config.w32,v 1.9 2005/09/24 15:15:13 edink Exp $
 // vim:ft=javascript
 
-ARG_WITH(sqlite, SQLite support, yes);
+ARG_WITH(sqlite, SQLite support, no);
 
 if (PHP_SQLITE != no) {
copy_and_subst(configure_module_dirname + 
\\libsqlite\\src\\sqlite.h.in,

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended run-tests.php /ext/mcrypt mcrypt.c /ext/session session.c /ext/simplexml simplexml.c /ext/simplexml/tests 012.phpt /ext/spl/tests array_0

[Derick Rethans]

derick  Thu Sep 15 12:19:49 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended run-tests.php 
/ZendEngine2zend.c zend_constants.c zend_errors.h zend_execute.c 
/ZendEngine2/tests  array_type_hint_001.phpt bug33996.phpt 
/php-src/ext/mcrypt mcrypt.c 
/php-src/ext/sessionsession.c 
/php-src/ext/simplexml  simplexml.c 
/php-src/ext/simplexml/tests012.phpt 
/php-src/ext/spl/tests  array_013.phpt 
/php-src/main   main.c 
/php-src/tests/classes  array_access_003.phpt private_003.phpt 
type_hinting_001.phpt 
/php-src/tests/lang bug24658.phpt type_hints_001.phpt 
/php-src/tests/run-test test005.phpt test008a.phpt 
  Log:
  - Add E_RECOVERABLE.
  #- Thought I did this before already actually...
  
  http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.233r2=1.234ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.233 php-src/php.ini-dist:1.234
--- php-src/php.ini-dist:1.233  Mon Aug 29 10:46:00 2005
+++ php-src/php.ini-distThu Sep 15 12:19:37 2005
@@ -254,6 +254,7 @@
 ; reporting level
 ; E_ALL - All errors and warnings (doesn't include E_STRICT)
 ; E_ERROR   - fatal run-time errors
+; E_RECOVERABLE_ERROR - almost fatal run-time errors
 ; E_WARNING - run-time warnings (non-fatal errors)
 ; E_PARSE   - compile-time parse errors
 ; E_NOTICE  - run-time notices (these are warnings which often result
@@ -285,7 +286,7 @@
 ;
 ;   - Show only errors
 ;
-;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
+;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
 ;
 ;   - Show all errors except for notices and coding standards warnings
 ;
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.181r2=1.182ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.181 php-src/php.ini-recommended:1.182
--- php-src/php.ini-recommended:1.181   Mon Aug 29 10:46:00 2005
+++ php-src/php.ini-recommended Thu Sep 15 12:19:37 2005
@@ -312,6 +312,7 @@
 ; reporting level
 ; E_ALL - All errors and warnings (doesn't include E_STRICT)
 ; E_ERROR   - fatal run-time errors
+; E_RECOVERABLE_ERROR - almost fatal run-time errors
 ; E_WARNING - run-time warnings (non-fatal errors)
 ; E_PARSE   - compile-time parse errors
 ; E_NOTICE  - run-time notices (these are warnings which often result
@@ -343,7 +344,7 @@
 ;
 ;   - Show only errors
 ;
-;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
+;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
 ;
 ;   - Show all errors, except coding standards warnings
 ;
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.230r2=1.231ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.230 php-src/run-tests.php:1.231
--- php-src/run-tests.php:1.230 Mon Aug 15 18:34:37 2005
+++ php-src/run-tests.php   Thu Sep 15 12:19:37 2005
@@ -23,7 +23,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.230 2005/08/15 22:34:37 sniper Exp $ */
+/* $Id: run-tests.php,v 1.231 2005/09/15 16:19:37 derick Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -143,7 +143,7 @@
'safe_mode=0',
'disable_functions=',
'output_buffering=Off',
-   'error_reporting=4095',
+   'error_reporting=8191',
'display_errors=1',
'log_errors=0',
'html_errors=0',
http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.322r2=1.323ty=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.322 ZendEngine2/zend.c:1.323
--- ZendEngine2/zend.c:1.322Fri Sep  9 04:19:56 2005
+++ ZendEngine2/zend.c  Thu Sep 15 12:19:41 2005
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend.c,v 1.322 2005/09/09 08:19:56 dmitry Exp $ */
+/* $Id: zend.c,v 1.323 2005/09/15 16:19:41 derick Exp $ */
 
 #include zend.h
 #include zend_extensions.h
@@ -1672,6 +1672,7 @@
case E_USER_ERROR:
case E_USER_WARNING:
case E_USER_NOTICE:
+   case E_RECOVERABLE_ERROR:
if (zend_is_compiling(TSRMLS_C)) {
error_filename = 
zend_get_compiled_filename(TSRMLS_C);
error_lineno = 
zend_get_compiled_lineno(TSRMLS_C);
http://cvs.php.net/diff.php/ZendEngine2/zend_constants.c?r1=1.74r2=1.75ty=u
Index: ZendEngine2/zend_constants.c
diff -u ZendEngine2/zend_constants.c:1.74 ZendEngine2/zend_constants.c:1.75
--- ZendEngine2/zend_constants.c:1.74   Thu Sep  8 07:10:28 2005
+++ ZendEngine2/zend_constants.cThu Sep 

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

sniper  Mon Aug 29 10:46:01 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Clean away PECled exts and added date.timezone setting
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.232r2=1.233ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.232 php-src/php.ini-dist:1.233
--- php-src/php.ini-dist:1.232  Fri Aug 12 01:30:02 2005
+++ php-src/php.ini-distMon Aug 29 10:46:00 2005
@@ -576,21 +576,17 @@
 
 ;extension=php_mbstring.dll
 ;extension=php_bz2.dll
-;extension=php_cpdf.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
-;extension=php_dbx.dll
 ;extension=php_exif.dll
 ;extension=php_fdf.dll
 ;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_ifx.dll
-;extension=php_iisfunc.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
-;extension=php_java.dll
 ;extension=php_ldap.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
@@ -602,24 +598,24 @@
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
 ;extension=php_oracle.dll
-;extension=php_pdf.dll
 ;extension=php_pgsql.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
-;extension=php_w32api.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-;extension=php_yaz.dll
-;extension=php_zip.dll
 
 
 ;;;
 ; Module Settings ;
 ;;;
 
+[Date]
+; Defines the default timezone used by the date functions
+;date.timezone = 
+
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
@@ -711,7 +707,7 @@
 ; SQL-Errors will be displayed.
 mysql.trace_mode = Off
 
-[MySQLI]
+[MySQLi]
 
 ; Maximum number of links.  -1 means no limit.
 mysqli.max_links = -1
@@ -815,16 +811,6 @@
 ; Minimum client message severity to display.
 sybct.min_client_severity = 10
 
-[dbx]
-; returned column names can be converted for compatibility reasons
-; possible values for dbx.colnames_case are
-; unchanged (default, if not set)
-; lowercase
-; uppercase
-; the recommended default is either upper- or lowercase, but
-; unchanged is currently set for backwards compatibility
-dbx.colnames_case = unchanged
-
 [bcmath]
 ; Number of decimal digits for all bcmath functions.
 bcmath.scale = 0
@@ -1071,25 +1057,6 @@
 ; error_reporting(0) around the eval().
 ;assert.quiet_eval = 0
 
-[Ingres II]
-; Allow or prevent persistent links.
-ingres.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-ingres.max_persistent = -1
-
-; Maximum number of links, including persistents.  -1 means no limit.
-ingres.max_links = -1
-
-; Default database (format: [node_id::]dbname[/srv_class]).
-ingres.default_database =
-
-; Default user.
-ingres.default_user =
-
-; Default password.
-ingres.default_password =
-
 [Verisign Payflow Pro]
 ; Default Payflow Pro server.
 pfpro.defaulthost = test-payflow.verisign.com
@@ -1112,7 +1079,7 @@
 ; Default proxy password.
 ;pfpro.proxypassword =
 
-[com]
+[COM]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
 ;com.typelib_file =
 ; allow Distributed-COM calls
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.180r2=1.181ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.180 php-src/php.ini-recommended:1.181
--- php-src/php.ini-recommended:1.180   Fri Aug 12 01:30:02 2005
+++ php-src/php.ini-recommended Mon Aug 29 10:46:00 2005
@@ -633,21 +633,17 @@
 
 ;extension=php_mbstring.dll
 ;extension=php_bz2.dll
-;extension=php_cpdf.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
-;extension=php_dbx.dll
 ;extension=php_exif.dll
 ;extension=php_fdf.dll
 ;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_ifx.dll
-;extension=php_iisfunc.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
-;extension=php_java.dll
 ;extension=php_ldap.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
@@ -659,24 +655,24 @@
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
 ;extension=php_oracle.dll
-;extension=php_pdf.dll
 ;extension=php_pgsql.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
-;extension=php_w32api.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-;extension=php_yaz.dll
-;extension=php_zip.dll
 
 
 ;;;
 ; Module Settings ;
 ;;;
 
+[Date]
+; Defines the default timezone used by the date functions
+;date.timezone =
+
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
@@ -768,7 +764,7 @@
 ; SQL-Errors will be displayed.
 mysql.trace_mode = Off
 
-[MySQLI]
+[MySQLi]
 
 ; Maximum number of links.  -1 means 

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Andi Gutmans]

andiFri Aug 12 01:30:07 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - Add unicode INI settings
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.231r2=1.232ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231 php-src/php.ini-dist:1.232
--- php-src/php.ini-dist:1.231  Wed Jul 13 04:20:32 2005
+++ php-src/php.ini-distFri Aug 12 01:30:02 2005
@@ -435,6 +435,14 @@
 ; Always populate the $HTTP_RAW_POST_DATA variable.
 ;always_populate_raw_post_data = On
 
+; Unicode settings
+unicode_semantics = off
+unicode.runtime_encoding = iso-8859-1
+unicode.script_encoding = utf-8
+unicode.output_encoding = utf-8
+unicode.from_error_mode = U_INVALID_SUBSTITUTE
+unicode.from_error_subst_char = 3f
+
 
 ;
 ; Paths and Directories ;
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.179r2=1.180ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179 php-src/php.ini-recommended:1.180
--- php-src/php.ini-recommended:1.179   Wed Jul 13 04:20:32 2005
+++ php-src/php.ini-recommended Fri Aug 12 01:30:02 2005
@@ -493,6 +493,13 @@
 ; Always populate the $HTTP_RAW_POST_DATA variable.
 ;always_populate_raw_post_data = On
 
+; Unicode settings
+unicode_semantics = off
+unicode.runtime_encoding = iso-8859-1 
+unicode.script_encoding = utf-8
+unicode.output_encoding = utf-8
+unicode.from_error_mode = U_INVALID_SUBSTITUTE
+unicode.from_error_subst_char = 3f
 
 ;
 ; Paths and Directories ;

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

sniper  Wed Jul 13 04:20:36 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  fix typo
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.230r2=1.231ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.230 php-src/php.ini-dist:1.231
--- php-src/php.ini-dist:1.230  Thu May  5 08:22:48 2005
+++ php-src/php.ini-distWed Jul 13 04:20:32 2005
@@ -564,7 +564,7 @@
 ; Note that ODBC support is built in, so no dll is needed for it.
 ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
 ; extension folders as well as the separate PECL DLL download (PHP 5).
-; Be sure to appropriately set the extensions_dir directive.
+; Be sure to appropriately set the extension_dir directive.
 
 ;extension=php_mbstring.dll
 ;extension=php_bz2.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.178r2=1.179ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.178 php-src/php.ini-recommended:1.179
--- php-src/php.ini-recommended:1.178   Fri Jul  1 19:47:08 2005
+++ php-src/php.ini-recommended Wed Jul 13 04:20:32 2005
@@ -622,7 +622,7 @@
 ; Note that ODBC support is built in, so no dll is needed for it.
 ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
 ; extension folders as well as the separate PECL DLL download (PHP 5).
-; Be sure to appropriately set the extensions_dir directive.
+; Be sure to appropriately set the extension_dir directive.
 
 ;extension=php_mbstring.dll
 ;extension=php_bz2.dll

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Georg Richter]

georg   Thu May  5 08:22:49 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  fix for bug #32947 (Incorrect option for mysqli default password)
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.229r2=1.230ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.229 php-src/php.ini-dist:1.230
--- php-src/php.ini-dist:1.229  Thu Apr 28 21:37:19 2005
+++ php-src/php.ini-distThu May  5 08:22:48 2005
@@ -726,10 +726,10 @@
 
 ; Default password for mysqli_connect() (doesn't apply in safe mode).
 ; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo 
get_cfg_var(mysqli.default_password)
+; *Any* user with PHP access can run 'echo get_cfg_var(mysqli.default_pw)
 ; and reveal this password!  And of course, any users with read access to this
 ; file will be able to reveal the password as well.
-mysqli.default_password =
+mysqli.default_pw =
 
 ; Allow or prevent reconnect
 mysqli.reconnect = Off
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.175r2=1.176ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.175 php-src/php.ini-recommended:1.176
--- php-src/php.ini-recommended:1.175   Thu Apr 28 21:37:19 2005
+++ php-src/php.ini-recommended Thu May  5 08:22:48 2005
@@ -784,10 +784,10 @@
 
 ; Default password for mysqli_connect() (doesn't apply in safe mode).
 ; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo 
get_cfg_var(mysqli.default_password)
+; *Any* user with PHP access can run 'echo get_cfg_var(mysqli.default_pw)
 ; and reveal this password!  And of course, any users with read access to this
 ; file will be able to reveal the password as well.
-mysqli.default_password =
+mysqli.default_pw =
 
 ; Allow or prevent reconnect
 mysqli.reconnect = Off

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /sapi/cgi cgi_main.c

[Jani Taskinen]

sniper  Thu Apr 28 09:14:26 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/sapi/cgi   cgi_main.c 
  Log:
  - Added fastcgi.logging php.ini option to be able to disable
logging through the fastcgi connection
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.227r2=1.228ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.227 php-src/php.ini-dist:1.228
--- php-src/php.ini-dist:1.227  Sat Apr  2 18:04:02 2005
+++ php-src/php.ini-distThu Apr 28 09:14:25 2005
@@ -481,6 +481,9 @@
 ; Set to 1 if running under IIS.  Default is zero.
 ; fastcgi.impersonate = 1;
 
+; Disable logging through FastCGI connection
+; fastcgi.log = 0
+
 ; cgi.rfc2616_headers configuration option tells PHP what type of headers to
 ; use when sending HTTP response code. If it's set 0 PHP sends Status: header 
that
 ; is supported by Apache. When this option is set to 1 PHP will send
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.173r2=1.174ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.173 php-src/php.ini-recommended:1.174
--- php-src/php.ini-recommended:1.173   Mon Apr  4 03:55:13 2005
+++ php-src/php.ini-recommended Thu Apr 28 09:14:25 2005
@@ -539,6 +539,9 @@
 ; Set to 1 if running under IIS.  Default is zero.
 ; fastcgi.impersonate = 1;
 
+; Disable logging through FastCGI connection
+; fastcgi.log = 0
+
 ; cgi.rfc2616_headers configuration option tells PHP what type of headers to
 ; use when sending HTTP response code. If it's set 0 PHP sends Status: header 
that
 ; is supported by Apache. When this option is set to 1 PHP will send
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.262r2=1.263ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.262 php-src/sapi/cgi/cgi_main.c:1.263
--- php-src/sapi/cgi/cgi_main.c:1.262   Mon Mar 14 14:25:39 2005
+++ php-src/sapi/cgi/cgi_main.c Thu Apr 28 09:14:26 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.262 2005/03/14 19:25:39 rasmus Exp $ */
+/* $Id: cgi_main.c,v 1.263 2005/04/28 13:14:26 sniper Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -482,9 +482,14 @@
 static void sapi_cgi_log_message(char *message)
 {
 #if PHP_FASTCGI
+   int logging = 1;
TSRMLS_FETCH();
 
-   if (!FCGX_IsCGI()) {
+   if (cfg_get_long(fastcgi.logging, logging) == FAILURE) {
+   logging = 1;
+   }
+   
 
+   if (!FCGX_IsCGI()  logging) {
FCGX_Request *request = (FCGX_Request *)SG(server_context);
FCGX_FPrintF( request-err, %s\n, message );
/* ignore return code */

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

Re: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /sapi/cgi cgi_main.c

[Joe Orton]

On Thu, Apr 28, 2005 at 01:14:26PM -, Jani Taskinen wrote:
 @@ -482,9 +482,14 @@
  static void sapi_cgi_log_message(char *message)
  {
  #if PHP_FASTCGI
 + int logging = 1;
   TSRMLS_FETCH();
  
 - if (!FCGX_IsCGI()) {
 + if (cfg_get_long(fastcgi.logging, logging) == FAILURE) {
 + logging = 1;
 + }

long != int and the initialization is unnecessary too, I think?

joe

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

Re: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /sapi/cgi cgi_main.c

[Jani Taskinen]

On Thu, 28 Apr 2005, Joe Orton wrote:
On Thu, Apr 28, 2005 at 01:14:26PM -, Jani Taskinen wrote:
@@ -482,9 +482,14 @@
 static void sapi_cgi_log_message(char *message)
 {
 #if PHP_FASTCGI
+   int logging = 1;
TSRMLS_FETCH();
-   if (!FCGX_IsCGI()) {
+   if (cfg_get_long(fastcgi.logging, logging) == FAILURE) {
+   logging = 1;
+   }
long != int and the initialization is unnecessary too, I think?
Changed the int to long..copy'n'paste error. :)
Initialization doesn't hurt, IMO.
--Jani
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

sniper  Thu Apr 28 21:37:19 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Add auto_globals_jit entry to php.ini-* (bug #29514)
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.228r2=1.229ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.228 php-src/php.ini-dist:1.229
--- php-src/php.ini-dist:1.228  Thu Apr 28 09:14:25 2005
+++ php-src/php.ini-distThu Apr 28 21:37:19 2005
@@ -398,6 +398,13 @@
 ; should turn it off for increased performance.
 register_argc_argv = On
 
+; When enabled, the SERVER and ENV variables are created when they're first
+; used (Just In Time) instead of when the script starts. If these variables
+; are not used within a script, having this directive on will result in a
+; performance gain. The PHP directives register_globals, register_long_arrays,
+; and register_argc_argv must be disabled for this directive to have any 
affect.
+auto_globals_jit = On
+
 ; Maximum size of POST data that PHP will accept.
 post_max_size = 8M
 
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.174r2=1.175ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.174 php-src/php.ini-recommended:1.175
--- php-src/php.ini-recommended:1.174   Thu Apr 28 09:14:25 2005
+++ php-src/php.ini-recommended Thu Apr 28 21:37:19 2005
@@ -456,6 +456,13 @@
 ; should turn it off for increased performance.
 register_argc_argv = Off
 
+; When enabled, the SERVER and ENV variables are created when they're first
+; used (Just In Time) instead of when the script starts. If these variables
+; are not used within a script, having this directive on will result in a
+; performance gain. The PHP directives register_globals, register_long_arrays,
+; and register_argc_argv must be disabled for this directive to have any 
affect.
+auto_globals_jit = On
+
 ; Maximum size of POST data that PHP will accept.
 post_max_size = 8M
 

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

sniper  Sat Apr  2 18:04:04 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Make sure php_mbstring.dll is first to getting loaded..(bug #32552)
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.226r2=1.227ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.226 php-src/php.ini-dist:1.227
--- php-src/php.ini-dist:1.226  Mon Mar 28 02:26:06 2005
+++ php-src/php.ini-distSat Apr  2 18:04:02 2005
@@ -556,6 +556,7 @@
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extensions_dir directive.
 
+;extension=php_mbstring.dll
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
 ;extension=php_curl.dll
@@ -573,7 +574,6 @@
 ;extension=php_interbase.dll
 ;extension=php_java.dll
 ;extension=php_ldap.dll
-;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.171r2=1.172ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.171 php-src/php.ini-recommended:1.172
--- php-src/php.ini-recommended:1.171   Mon Mar 28 02:26:06 2005
+++ php-src/php.ini-recommended Sat Apr  2 18:04:02 2005
@@ -614,6 +614,7 @@
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extensions_dir directive.
 
+;extension=php_mbstring.dll
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
 ;extension=php_curl.dll
@@ -631,7 +632,6 @@
 ;extension=php_interbase.dll
 ;extension=php_java.dll
 ;extension=php_ldap.dll
-;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
 ;extension=php_mime_magic.dll

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Joey Smith]

joeyMon Mar 28 02:26:06 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Adding comments to .ini files at [EMAIL PROTECTED]'s request.
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.225r2=1.226ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.225 php-src/php.ini-dist:1.226
--- php-src/php.ini-dist:1.225  Mon Feb 28 19:23:31 2005
+++ php-src/php.ini-distMon Mar 28 02:26:06 2005
@@ -550,9 +550,11 @@
 ; extension_dir directive above.
 
 
-;Windows Extensions
-;Note that ODBC support is built in, so no dll is needed for it.
-;
+; Windows Extensions
+; Note that ODBC support is built in, so no dll is needed for it.
+; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
+; extension folders as well as the separate PECL DLL download (PHP 5).
+; Be sure to appropriately set the extensions_dir directive.
 
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.170r2=1.171ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.170 php-src/php.ini-recommended:1.171
--- php-src/php.ini-recommended:1.170   Mon Feb 28 19:23:31 2005
+++ php-src/php.ini-recommended Mon Mar 28 02:26:06 2005
@@ -608,9 +608,11 @@
 ; extension_dir directive above.
 
 
-;Windows Extensions
-;Note that ODBC support is built in, so no dll is needed for it.
-;
+; Windows Extensions
+; Note that ODBC support is built in, so no dll is needed for it.
+; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
+; extension folders as well as the separate PECL DLL download (PHP 5).
+; Be sure to appropriately set the extensions_dir directive.
 
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Ilia Alshanetsky]

iliaa   Mon Feb 28 17:09:23 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Added notes about ignore_user_abort to php.ini*
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.223r2=1.224ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.223 php-src/php.ini-dist:1.224
--- php-src/php.ini-dist:1.223  Mon Feb 14 03:23:53 2005
+++ php-src/php.ini-distMon Feb 28 17:09:21 2005
@@ -222,6 +222,10 @@
 ;highlight.default = #BB
 ;highlight.html= #00
 
+; If enabled, the request will be allowed to complete even if the user aborts
+; the request. Consider enabling it if executing long request, which may end up
+; being interrupted by the user or a browser timing out.
+; ignore_user_abort = On
 
 ;
 ; Misc
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.168r2=1.169ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.168 php-src/php.ini-recommended:1.169
--- php-src/php.ini-recommended:1.168   Mon Feb 14 03:23:54 2005
+++ php-src/php.ini-recommended Mon Feb 28 17:09:22 2005
@@ -280,6 +280,10 @@
 ;highlight.default = #BB
 ;highlight.html= #00
 
+; If enabled, the request will be allowed to complete even if the user aborts
+; the request. Consider enabling it if executing long request, which may end up
+; being interrupted by the user or a browser timing out.
+; ignore_user_abort = On
 
 ;
 ; Misc

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Johannes Schlüter]

johannesMon Feb 28 19:23:33 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - Change comment: Syntax highlighter uses span instead of font
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.224r2=1.225ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.224 php-src/php.ini-dist:1.225
--- php-src/php.ini-dist:1.224  Mon Feb 28 17:09:21 2005
+++ php-src/php.ini-distMon Feb 28 19:23:31 2005
@@ -214,7 +214,7 @@
 disable_classes =
 
 ; Colors for Syntax Highlighting mode.  Anything that's acceptable in
-; font color=?? would work.
+; span style=color: ??? would work.
 ;highlight.string  = #DD
 ;highlight.comment = #FF9900
 ;highlight.keyword = #007700
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.169r2=1.170ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.169 php-src/php.ini-recommended:1.170
--- php-src/php.ini-recommended:1.169   Mon Feb 28 17:09:22 2005
+++ php-src/php.ini-recommended Mon Feb 28 19:23:31 2005
@@ -272,7 +272,7 @@
 disable_classes =
 
 ; Colors for Syntax Highlighting mode.  Anything that's acceptable in
-; font color=?? would work.
+; span style=color: ??? would work.
 ;highlight.string  = #DD
 ;highlight.comment = #FF9900
 ;highlight.keyword = #007700

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

sniper  Mon Feb 14 03:23:54 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Nuke non-existing ini option
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.222r2=1.223ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.222 php-src/php.ini-dist:1.223
--- php-src/php.ini-dist:1.222  Mon Dec 27 02:19:25 2004
+++ php-src/php.ini-distMon Feb 14 03:23:53 2005
@@ -1088,10 +1088,6 @@
 ; Default proxy password.
 ;pfpro.proxypassword =
 
-[Sockets]
-; Use the system read() function instead of the php_read() wrapper.
-sockets.use_system_read = On
-
 [com]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
 ;com.typelib_file =
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.167r2=1.168ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.167 php-src/php.ini-recommended:1.168
--- php-src/php.ini-recommended:1.167   Mon Dec 27 22:48:18 2004
+++ php-src/php.ini-recommended Mon Feb 14 03:23:54 2005
@@ -1146,10 +1146,6 @@
 ; Default proxy password.
 ;pfpro.proxypassword =
 
-[Sockets]
-; Use the system read() function instead of the php_read() wrapper.
-sockets.use_system_read = On
-
 [com]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
 ;com.typelib_file =

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Antony Dovgal]

tony2001Sun Nov 28 08:21:09 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  fix #30314
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.220r2=1.221ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.220 php-src/php.ini-dist:1.221
--- php-src/php.ini-dist:1.220  Mon Nov 15 18:27:48 2004
+++ php-src/php.ini-distSun Nov 28 08:21:09 2004
@@ -248,7 +248,7 @@
 
 ; error_reporting is a bit-field.  Or each number up to get desired error
 ; reporting level
-; E_ALL - All errors and warnings
+; E_ALL - All errors and warnings (doesn't include E_STRICT)
 ; E_ERROR   - fatal run-time errors
 ; E_WARNING - run-time warnings (non-fatal errors)
 ; E_PARSE   - compile-time parse errors
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.164r2=1.165ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.164 php-src/php.ini-recommended:1.165
--- php-src/php.ini-recommended:1.164   Mon Nov 15 18:27:48 2004
+++ php-src/php.ini-recommended Sun Nov 28 08:21:09 2004
@@ -306,7 +306,7 @@
 
 ; error_reporting is a bit-field.  Or each number up to get desired error
 ; reporting level
-; E_ALL - All errors and warnings
+; E_ALL - All errors and warnings (doesn't include E_STRICT)
 ; E_ERROR   - fatal run-time errors
 ; E_WARNING - run-time warnings (non-fatal errors)
 ; E_PARSE   - compile-time parse errors

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Edin Kadribasic]

edink   Mon Nov 15 18:27:49 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  iconv is built-in in php5
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.219r2=1.220ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.219 php-src/php.ini-dist:1.220
--- php-src/php.ini-dist:1.219  Tue Aug 17 19:08:44 2004
+++ php-src/php.ini-distMon Nov 15 18:27:48 2004
@@ -561,7 +561,6 @@
 ;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
-;extension=php_iconv.dll
 ;extension=php_ifx.dll
 ;extension=php_iisfunc.dll
 ;extension=php_imap.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.163r2=1.164ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.163 php-src/php.ini-recommended:1.164
--- php-src/php.ini-recommended:1.163   Tue Aug 17 19:08:44 2004
+++ php-src/php.ini-recommended Mon Nov 15 18:27:48 2004
@@ -619,7 +619,6 @@
 ;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
-;extension=php_iconv.dll
 ;extension=php_ifx.dll
 ;extension=php_iisfunc.dll
 ;extension=php_imap.dll

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Antony Dovgal]

tony2001Tue Aug 17 06:57:40 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  fix typo
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.217r2=1.218ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.217 php-src/php.ini-dist:1.218
--- php-src/php.ini-dist:1.217  Mon Aug  9 20:44:20 2004
+++ php-src/php.ini-distTue Aug 17 06:57:40 2004
@@ -681,7 +681,7 @@
 ; file will be able to reveal the password as well.
 mysql.default_password =
 
-; Maximum time (in secondes) for connect timeout. -1 means no limimt
+; Maximum time (in secondes) for connect timeout. -1 means no limit
 mysql.connect_timeout = 60
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.161r2=1.162ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.161 php-src/php.ini-recommended:1.162
--- php-src/php.ini-recommended:1.161   Mon Aug  9 20:44:20 2004
+++ php-src/php.ini-recommended Tue Aug 17 06:57:40 2004
@@ -739,7 +739,7 @@
 ; file will be able to reveal the password as well.
 mysql.default_password =
 
-; Maximum time (in secondes) for connect timeout. -1 means no limimt
+; Maximum time (in secondes) for connect timeout. -1 means no limit
 mysql.connect_timeout = 60
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Andi Gutmans]

andiTue Aug 17 19:08:44 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - Fix typos
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.218r2=1.219ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.218 php-src/php.ini-dist:1.219
--- php-src/php.ini-dist:1.218  Tue Aug 17 06:57:40 2004
+++ php-src/php.ini-distTue Aug 17 19:08:44 2004
@@ -137,7 +137,7 @@
 ; implications and is generally recommended for debugging purposes only.
 implicit_flush = Off
 
-; The unserialize callback function will called (with the undefind class'
+; The unserialize callback function will be called (with the undefined class'
 ; name as parameter), if the unserializer finds an undefined class
 ; which should be instanciated.
 ; A warning appears if the specified function is not defined, or if the
@@ -259,7 +259,7 @@
 ; empty string)
 ; E_STRICT - run-time notices, enable to have PHP suggest changes
 ; to your code which will ensure the best interoperability
-; and forward compatability of your code
+; and forward compatibility of your code
 ; E_CORE_ERROR  - fatal errors that occur during PHP's initial startup
 ; E_CORE_WARNING- warnings (non-fatal errors) that occur during PHP's
 ; initial startup
@@ -927,7 +927,7 @@
 ; PHP 4.2 and less have an undocumented feature/bug that allows you to
 ; to initialize a session variable in the global scope, albeit register_globals
 ; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning seperately. At this time,
+; You can disable the feature and the warning separately. At this time,
 ; the warning is only displayed, if bug_compat_42 is enabled.
 
 session.bug_compat_42 = 1
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.162r2=1.163ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.162 php-src/php.ini-recommended:1.163
--- php-src/php.ini-recommended:1.162   Tue Aug 17 06:57:40 2004
+++ php-src/php.ini-recommended Tue Aug 17 19:08:44 2004
@@ -195,7 +195,7 @@
 ; implications and is generally recommended for debugging purposes only.
 implicit_flush = Off
 
-; The unserialize callback function will called (with the undefind class'
+; The unserialize callback function will be called (with the undefined class'
 ; name as parameter), if the unserializer finds an undefined class
 ; which should be instanciated.
 ; A warning appears if the specified function is not defined, or if the
@@ -317,7 +317,7 @@
 ; empty string)
 ; E_STRICT  - run-time notices, enable to have PHP suggest changes
 ; to your code which will ensure the best interoperability
-; and forward compatability of your code
+; and forward compatibility of your code
 ; E_CORE_ERROR  - fatal errors that occur during PHP's initial startup
 ; E_CORE_WARNING- warnings (non-fatal errors) that occur during PHP's
 ; initial startup
@@ -985,7 +985,7 @@
 ; PHP 4.2 and less have an undocumented feature/bug that allows you to
 ; to initialize a session variable in the global scope, albeit register_globals
 ; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning seperately. At this time,
+; You can disable the feature and the warning separately. At this time,
 ; the warning is only displayed, if bug_compat_42 is enabled.
 
 session.bug_compat_42 = 0

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Ilia Alshanetsky]

iliaa   Mon Aug  9 20:44:21 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Fixed bug #29581 (Typo inside php.ini comments for mysql.trace_mode).
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.216r2=1.217ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.216 php-src/php.ini-dist:1.217
--- php-src/php.ini-dist:1.216  Tue Aug  3 02:19:16 2004
+++ php-src/php.ini-distMon Aug  9 20:44:20 2004
@@ -685,7 +685,7 @@
 mysql.connect_timeout = 60
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
-; SQL-Erros will be displayed.
+; SQL-Errors will be displayed.
 mysql.trace_mode = Off
 
 [MySQLI]
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.160r2=1.161ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.160 php-src/php.ini-recommended:1.161
--- php-src/php.ini-recommended:1.160   Tue Aug  3 02:19:16 2004
+++ php-src/php.ini-recommended Mon Aug  9 20:44:20 2004
@@ -743,7 +743,7 @@
 mysql.connect_timeout = 60
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
-; SQL-Erros will be displayed.
+; SQL-Errors will be displayed.
 mysql.trace_mode = Off
 
 [MySQLI]

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Antony Dovgal]

tony2001Tue Aug  3 02:19:17 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  fix typo in php.ini: paramAters - paramEters
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.215r2=1.216ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.215 php-src/php.ini-dist:1.216
--- php-src/php.ini-dist:1.215  Thu Jul 15 15:09:37 2004
+++ php-src/php.ini-distTue Aug  3 02:19:16 2004
@@ -617,7 +617,7 @@
 ; 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
 ; the 5th parameter to mail(), even in safe mode.
-;mail.force_extra_paramaters =
+;mail.force_extra_parameters =
 
 [SQL]
 sql.safe_mode = Off
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.159r2=1.160ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.159 php-src/php.ini-recommended:1.160
--- php-src/php.ini-recommended:1.159   Thu Jul 15 15:09:37 2004
+++ php-src/php.ini-recommended Tue Aug  3 02:19:16 2004
@@ -675,7 +675,7 @@
 ; 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
 ; the 5th parameter to mail(), even in safe mode.
-;mail.force_extra_paramaters =
+;mail.force_extra_parameters =
 
 [SQL]
 sql.safe_mode = Off

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Dmitry Stogov]

dmitry  Wed Jun 23 04:18:43 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Added SOAP configuration directives
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.213r2=1.214ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.213 php-src/php.ini-dist:1.214
--- php-src/php.ini-dist:1.213  Mon May 17 12:30:22 2004
+++ php-src/php.ini-distWed Jun 23 04:18:42 2004
@@ -1168,6 +1168,15 @@
 ; such as dynamic images
 tidy.clean_output = Off
 
+[soap]
+; Enables or disables WSDL caching feature.
+soap.wsdl_cache_enabled=1
+; Sets the directory name where SOAP extension will put cache files.
+soap.wsdl_cache_dir=/tmp
+; (time to live) Sets the number of second while cached file will be used 
+; instead of original one.
+soap.wsdl_cache_ttl=86400
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.157r2=1.158ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.157 php-src/php.ini-recommended:1.158
--- php-src/php.ini-recommended:1.157   Mon May 17 12:30:22 2004
+++ php-src/php.ini-recommended Wed Jun 23 04:18:42 2004
@@ -1182,6 +1182,15 @@
 ; such as dynamic images
 tidy.clean_output = Off
 
+[soap]
+; Enables or disables WSDL caching feature.
+soap.wsdl_cache_enabled=1
+; Sets the directory name where SOAP extension will put cache files.
+soap.wsdl_cache_dir=/tmp
+; (time to live) Sets the number of second while cached file will be used 
+; instead of original one.
+soap.wsdl_cache_ttl=86400
+
 ; Local Variables:
 ; tab-width: 4
 ; End:

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Derick Rethans]

derick  Mon May 17 12:30:24 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - Document the smtp_port setting in php.ini
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.212r2=1.213ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.212 php-src/php.ini-dist:1.213
--- php-src/php.ini-dist:1.212  Mon Mar 29 16:44:07 2004
+++ php-src/php.ini-distMon May 17 12:30:22 2004
@@ -593,6 +593,7 @@
 [mail function]
 ; For Win32 only.
 SMTP = localhost
+smtp_port = 25
 
 ; For Win32 only.
 ;sendmail_from = [EMAIL PROTECTED]
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.156r2=1.157ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.156 php-src/php.ini-recommended:1.157
--- php-src/php.ini-recommended:1.156   Mon Mar 29 16:44:07 2004
+++ php-src/php.ini-recommended Mon May 17 12:30:22 2004
@@ -613,6 +613,7 @@
 [mail function]
 ; For Win32 only.
 SMTP = localhost
+smtp_port = 25
 
 ; For Win32 only.
 ;sendmail_from = [EMAIL PROTECTED]

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Derick Rethans]

derick  Sun Mar 14 16:36:19 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - The extension list is ordered alphabetically, also moved the tidy section
to a more suitable place (new things go at the end, not at the start).
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.209r2=1.210ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.209 php-src/php.ini-dist:1.210
--- php-src/php.ini-dist:1.209  Sat Mar 13 20:26:33 2004
+++ php-src/php.ini-distSun Mar 14 16:36:17 2004
@@ -389,7 +389,7 @@
 ;
 
 ; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = On
+magic_quotes_gpc = Off
 
 ; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
 magic_quotes_runtime = Off
@@ -538,7 +538,6 @@
 ;Note that ODBC support is built in, so no dll is needed for it.
 ;
 
-;extension=php_tidy.dll
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
 ;extension=php_curl.dll
@@ -573,6 +572,7 @@
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
 ;extension=php_sybase_ct.dll
+;extension=php_tidy.dll
 ;extension=php_w32api.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
@@ -584,15 +584,6 @@
 ; Module Settings ;
 ;;;
 
-[Tidy]
-; The path to a default tidy configuration file to use when using tidy
-;tidy.default_config = /usr/local/lib/php/default.tcfg
-
-; Should tidy clean and repair output automatically?
-; WARNING: Do not use this option if you are generating non-html content
-; such as dynamic images
-tidy.clean_output = Off
-
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
@@ -1167,6 +1158,15 @@
 ;exif.decode_jis_motorola = JIS
 ;exif.decode_jis_intel= JIS
 
+[Tidy]
+; The path to a default tidy configuration file to use when using tidy
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+tidy.clean_output = Off
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.154r2=1.155ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.154 php-src/php.ini-recommended:1.155
--- php-src/php.ini-recommended:1.154   Sat Mar 13 20:26:33 2004
+++ php-src/php.ini-recommended Sun Mar 14 16:36:17 2004
@@ -557,7 +557,6 @@
 ;Note that ODBC support is built in, so no dll is needed for it.
 ;
 
-;extension=php_tidy.dll
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
 ;extension=php_curl.dll
@@ -593,6 +592,7 @@
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
 ;extension=php_sybase_ct.dll
+;extension=php_tidy.dll
 ;extension=php_w32api.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
@@ -604,15 +604,6 @@
 ; Module Settings ;
 ;;;
 
-[Tidy]
-; The path to a default tidy configuration file to use when using tidy
-;tidy.default_config = /usr/local/lib/php/default.tcfg
-
-; Should tidy clean and repair output automatically?
-; WARNING: Do not use this option if you are generating non-html content
-; such as dynamic images
-tidy.clean_output = Off
-
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
@@ -1181,6 +1172,15 @@
 ;exif.decode_jis_motorola = JIS
 ;exif.decode_jis_intel= JIS
 
+[Tidy]
+; The path to a default tidy configuration file to use when using tidy
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+tidy.clean_output = Off
+
 ; Local Variables:
 ; tab-width: 4
 ; End:

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[John Coggeshall]

johnSat Mar 13 20:26:34 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  
  Adding extension=php_tidy.dll
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.208r2=1.209ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.208 php-src/php.ini-dist:1.209
--- php-src/php.ini-dist:1.208  Thu Feb 26 06:40:34 2004
+++ php-src/php.ini-distSat Mar 13 20:26:33 2004
@@ -537,6 +537,8 @@
 ;Windows Extensions
 ;Note that ODBC support is built in, so no dll is needed for it.
 ;
+
+;extension=php_tidy.dll
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
 ;extension=php_curl.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.153r2=1.154ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.153 php-src/php.ini-recommended:1.154
--- php-src/php.ini-recommended:1.153   Thu Feb 26 06:40:34 2004
+++ php-src/php.ini-recommended Sat Mar 13 20:26:33 2004
@@ -556,6 +556,8 @@
 ;Windows Extensions
 ;Note that ODBC support is built in, so no dll is needed for it.
 ;
+
+;extension=php_tidy.dll
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
 ;extension=php_curl.dll

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c php_mysqli.h

[Georg Richter]

georg   Thu Feb 26 06:40:36 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c 
php_mysqli.h 
  Log:
  added MySQLI ini entries
  added ini parameter for mysql-reconnect
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.207r2=1.208ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.207 php-src/php.ini-dist:1.208
--- php-src/php.ini-dist:1.207  Wed Feb 25 05:58:05 2004
+++ php-src/php.ini-distThu Feb 26 06:40:34 2004
@@ -681,6 +681,37 @@
 ; SQL-Erros will be displayed.
 mysql.trace_mode = Off
 
+[MySQLI]
+
+; Maximum number of links.  -1 means no limit.
+mysqli.max_links = -1
+
+; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
+; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
+; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
+; at MYSQL_PORT.
+mysqli.default_port = 3306
+
+; Default socket name for local MySQL connects.  If empty, uses the built-in
+; MySQL defaults.
+mysqli.default_socket =
+
+; Default host for mysql_connect() (doesn't apply in safe mode).
+mysqli.default_host =
+
+; Default user for mysql_connect() (doesn't apply in safe mode).
+mysqli.default_user =
+
+; Default password for mysqli_connect() (doesn't apply in safe mode).
+; Note that this is generally a *bad* idea to store passwords in this file.
+; *Any* user with PHP access can run 'echo get_cfg_var(mysqli.default_password)
+; and reveal this password!  And of course, any users with read access to this
+; file will be able to reveal the password as well.
+mysqli.default_password =
+
+; Allow or prevent reconnect
+mysqli.reconnect = Off
+
 [mSQL]
 ; Allow or prevent persistent links.
 msql.allow_persistent = On
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.152r2=1.153ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.152 php-src/php.ini-recommended:1.153
--- php-src/php.ini-recommended:1.152   Wed Feb 25 05:58:05 2004
+++ php-src/php.ini-recommended Thu Feb 26 06:40:34 2004
@@ -701,6 +701,37 @@
 ; SQL-Erros will be displayed.
 mysql.trace_mode = Off
 
+[MySQLI]
+
+; Maximum number of links.  -1 means no limit.
+mysqli.max_links = -1
+
+; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
+; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
+; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
+; at MYSQL_PORT.
+mysqli.default_port = 3306
+
+; Default socket name for local MySQL connects.  If empty, uses the built-in
+; MySQL defaults.
+mysqli.default_socket =
+
+; Default host for mysql_connect() (doesn't apply in safe mode).
+mysqli.default_host =
+
+; Default user for mysql_connect() (doesn't apply in safe mode).
+mysqli.default_user =
+
+; Default password for mysqli_connect() (doesn't apply in safe mode).
+; Note that this is generally a *bad* idea to store passwords in this file.
+; *Any* user with PHP access can run 'echo get_cfg_var(mysqli.default_password)
+; and reveal this password!  And of course, any users with read access to this
+; file will be able to reveal the password as well.
+mysqli.default_password =
+
+; Allow or prevent reconnect
+mysqli.reconnect = Off
+
 [mSQL]
 ; Allow or prevent persistent links.
 msql.allow_persistent = On
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.32r2=1.33ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.32 php-src/ext/mysqli/mysqli.c:1.33
--- php-src/ext/mysqli/mysqli.c:1.32Sun Feb 15 07:58:18 2004
+++ php-src/ext/mysqli/mysqli.c Thu Feb 26 06:40:35 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli.c,v 1.32 2004/02/15 12:58:18 zeev Exp $ 
+  $Id: mysqli.c,v 1.33 2004/02/26 11:40:35 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -316,6 +316,7 @@
STD_PHP_INI_ENTRY(mysqli.default_pw,  NULL,   
PHP_INI_ALL,OnUpdateString, default_pw, 
zend_mysqli_globals,mysqli_globals)
STD_PHP_INI_ENTRY(mysqli.default_port,3306, 
PHP_INI_ALL,OnUpdateLong,   default_port,   
zend_mysqli_globals,mysqli_globals)
STD_PHP_INI_ENTRY(mysqli.default_socket,  NULL,   
PHP_INI_ALL,OnUpdateStringUnempty,  default_socket, zend_mysqli_globals,   
 mysqli_globals)
+   STD_PHP_INI_BOOLEAN(mysqli.reconnect, 0,
PHP_INI_SYSTEM, OnUpdateLong,   reconnect,  
zend_mysqli_globals,mysqli_globals)
 PHP_INI_END()
 
 /* }}} */
@@ -331,6 +332,7 @@
mysqli_globals-default_user = NULL;

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c

[Zeev Suraski]

zeevWed Feb 25 05:58:07 2004 EDT

  Modified files:  
/php-srcphp.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.206r2=1.207ty=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-distWed 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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /sapi/cgi cgi_main.c

[Ilia Alshanetsky]

iliaa   Mon Feb  9 19:02:39 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Fixed bug #27026 (Added cgi.nph that allows forcing of the Status: 200 
  header that is not normally needed).
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.205r2=1.206ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.205 php-src/php.ini-dist:1.206
--- php-src/php.ini-dist:1.205  Sun Jan 25 23:15:04 2004
+++ php-src/php.ini-distMon Feb  9 19:02:37 2004
@@ -445,6 +445,10 @@
 ; **You CAN safely turn this off for IIS, in fact, you MUST.**
 ; cgi.force_redirect = 1
 
+; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
+; every request.
+; cgi.nph = 1
+
 ; 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
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.150r2=1.151ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.150 php-src/php.ini-recommended:1.151
--- php-src/php.ini-recommended:1.150   Sun Jan 25 23:15:04 2004
+++ php-src/php.ini-recommended Mon Feb  9 19:02:38 2004
@@ -464,6 +464,10 @@
 ; **You CAN safely turn this off for IIS, in fact, you MUST.**
 ; cgi.force_redirect = 1
 
+; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
+; every request.
+; cgi.nph = 1
+
 ; 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
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.244r2=1.245ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.244 php-src/sapi/cgi/cgi_main.c:1.245
--- php-src/sapi/cgi/cgi_main.c:1.244   Thu Jan  8 03:18:08 2004
+++ php-src/sapi/cgi/cgi_main.c Mon Feb  9 19:02:38 2004
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.244 2004/01/08 08:18:08 andi Exp $ */
+/* $Id: cgi_main.c,v 1.245 2004/02/10 00:02:38 iliaa Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -289,7 +289,7 @@
char buf[SAPI_CGI_MAX_HEADER_LENGTH];
sapi_header_struct *h;
zend_llist_position pos;
-   long rfc2616_headers = 0;
+   long rfc2616_headers = 0, nph = 0;
 
if(SG(request_info).no_headers == 1) {
return  SAPI_HEADER_SENT_SUCCESSFULLY;
@@ -303,7 +303,11 @@
rfc2616_headers = 0;
}
 
-   if (SG(sapi_headers).http_response_code != 200) {
+   if (cfg_get_long(cgi.nph, nph) == FAILURE) {
+   nph = 0;
+   }
+
+   if (nph || SG(sapi_headers).http_response_code != 200) {
int len;
 
if (rfc2616_headers  SG(sapi_headers).http_status_line) {

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Ard Biesheuvel]

abies   Sun Jan 25 10:18:03 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  MySQL is no longer built in by default
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.203r2=1.204ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.203 php-src/php.ini-dist:1.204
--- php-src/php.ini-dist:1.203  Wed Dec 17 21:06:00 2003
+++ php-src/php.ini-distSun Jan 25 10:18:02 2004
@@ -531,7 +531,7 @@
 
 
 ;Windows Extensions
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
+;Note that ODBC support is now built in, so no dll is needed for it.
 ;
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.148r2=1.149ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.148 php-src/php.ini-recommended:1.149
--- php-src/php.ini-recommended:1.148   Wed Dec 17 21:06:00 2003
+++ php-src/php.ini-recommended Sun Jan 25 10:18:02 2004
@@ -550,7 +550,7 @@
 
 
 ;Windows Extensions
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
+;Note that ODBC support is now built in, so no dll is needed for it.
 ;
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c php_globals.h php_variables.c

[Jani Taskinen]

sniper  Sun Jan 25 23:15:09 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/main   main.c php_globals.h php_variables.c 
  Log:
  - Remove gpc_order since it doesn't serve any purpose.
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.204r2=1.205ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.204 php-src/php.ini-dist:1.205
--- php-src/php.ini-dist:1.204  Sun Jan 25 10:18:02 2004
+++ php-src/php.ini-distSun Jan 25 23:15:04 2004
@@ -382,9 +382,6 @@
 ; Maximum size of POST data that PHP will accept.
 post_max_size = 8M
 
-; This directive is deprecated.  Use variables_order instead.
-gpc_order = GPC
-
 ; Magic quotes
 ;
 
@@ -531,7 +528,7 @@
 
 
 ;Windows Extensions
-;Note that ODBC support is now built in, so no dll is needed for it.
+;Note that ODBC support is built in, so no dll is needed for it.
 ;
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.149r2=1.150ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.149 php-src/php.ini-recommended:1.150
--- php-src/php.ini-recommended:1.149   Sun Jan 25 10:18:02 2004
+++ php-src/php.ini-recommended Sun Jan 25 23:15:04 2004
@@ -401,9 +401,6 @@
 ; Maximum size of POST data that PHP will accept.
 post_max_size = 8M
 
-; This directive is deprecated.  Use variables_order instead.
-gpc_order = GPC
-
 ; Magic quotes
 ;
 
@@ -550,7 +547,7 @@
 
 
 ;Windows Extensions
-;Note that ODBC support is now built in, so no dll is needed for it.
+;Note that ODBC support is built in, so no dll is needed for it.
 ;
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.585r2=1.586ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.585 php-src/main/main.c:1.586
--- php-src/main/main.c:1.585   Thu Jan  8 03:17:53 2004
+++ php-src/main/main.c Sun Jan 25 23:15:08 2004
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.585 2004/01/08 08:17:53 andi Exp $ */
+/* $Id: main.c,v 1.586 2004/01/26 04:15:08 sniper Exp $ */
 
 /* {{{ includes
  */
@@ -297,7 +297,6 @@
STD_PHP_INI_ENTRY(default_mimetype,   SAPI_DEFAULT_MIMETYPE,  
PHP_INI_ALL,OnUpdateString, default_mimetype,   
sapi_globals_struct,sapi_globals)
STD_PHP_INI_ENTRY(error_log,  NULL,   
PHP_INI_ALL,OnUpdateString, error_log, 
 php_core_globals,   core_globals)
STD_PHP_INI_ENTRY(extension_dir,  PHP_EXTENSION_DIR, 
 PHP_INI_SYSTEM, OnUpdateStringUnempty,  extension_dir,
  php_core_globals,   core_globals)
-   STD_PHP_INI_ENTRY(gpc_order,  GPC,  
PHP_INI_ALL,OnUpdateStringUnempty,  gpc_order, 
 php_core_globals,   core_globals)
STD_PHP_INI_ENTRY(include_path,   PHP_INCLUDE_PATH,  
 PHP_INI_ALL,OnUpdateStringUnempty,  include_path, 
  php_core_globals,   core_globals)
PHP_INI_ENTRY(max_execution_time, 30,   
PHP_INI_ALL,OnUpdateTimeout)
STD_PHP_INI_ENTRY(open_basedir,   NULL,   
PHP_INI_SYSTEM, OnUpdateString, open_basedir,  
 php_core_globals,   core_globals)
@@ -309,7 +308,7 @@
STD_PHP_INI_ENTRY(upload_tmp_dir, NULL,   
PHP_INI_SYSTEM, OnUpdateStringUnempty,  upload_tmp_dir, 
php_core_globals,   core_globals)
 
STD_PHP_INI_ENTRY(user_dir,   NULL,   
PHP_INI_SYSTEM, OnUpdateString, user_dir,  
 php_core_globals,   core_globals)
-   STD_PHP_INI_ENTRY(variables_order,NULL,   PHP_INI_ALL,   
 OnUpdateStringUnempty,  variables_order,php_core_globals, 
  core_globals)
+   STD_PHP_INI_ENTRY(variables_order,EGPCS,PHP_INI_ALL,   
 OnUpdateStringUnempty,  variables_order,php_core_globals, 
  core_globals)
 
STD_PHP_INI_ENTRY(error_append_string,NULL,   PHP_INI_ALL,   
 OnUpdateString, error_append_string,php_core_globals, 
  core_globals)
STD_PHP_INI_ENTRY(error_prepend_string,   NULL,   PHP_INI_ALL,   
 OnUpdateString, error_prepend_string,   php_core_globals, 
  core_globals)
http://cvs.php.net/diff.php/php-src/main/php_globals.h?r1=1.95r2=1.96ty=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.95 php-src/main/php_globals.h:1.96
--- 

Re: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

Why do you add ini options for extension that doesn't exist
in php-src ?? And there's no need to add those anyway,
document them in the manual..

--Jani


On Thu, 18 Dec 2003, John Coggeshall wrote:

john   Wed Dec 17 21:06:01 2003 EDT

  Modified files:  
/php-src   php.ini-dist php.ini-recommended 
  Log:
  Adding the tidy.default_config and tidy.clean_output options to the .ini
  files
  
  
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.202 php-src/php.ini-dist:1.203
--- php-src/php.ini-dist:1.202 Thu Dec  4 07:05:54 2003
+++ php-src/php.ini-dist   Wed Dec 17 21:06:00 2003
@@ -578,6 +578,15 @@
 ; Module Settings ;
 ;;;
 
+[Tidy]
+; The path to a default tidy configuration file to use when using tidy
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+tidy.clean_output = Off
+
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.147 php-src/php.ini-recommended:1.148
--- php-src/php.ini-recommended:1.147  Thu Dec  4 07:05:54 2003
+++ php-src/php.ini-recommendedWed Dec 17 21:06:00 2003
@@ -598,6 +598,15 @@
 ; Module Settings ;
 ;;;
 
+[Tidy]
+; The path to a default tidy configuration file to use when using tidy
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+tidy.clean_output = Off
+
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In



 

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

Re: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Rasmus Lerdorf]

We probably should move towards the config-file-path mechanism I added a
while back.  Instead of simply specifying a php.ini file (or in addition
to if we so choose) byt default we should do a
--with-config-file-path=/etc/php (exact default path to be argued over in
numerous threads for years to come, I am sure) and have each extension
have their own .ini file with their extension-specific ini directives.

This is how we are doing it at Yahoo with what is now 100+ custom
extensions and it is actually working very nicely.

-Rasmus

On Thu, 18 Dec 2003, Jani Taskinen wrote:


 Why do you add ini options for extension that doesn't exist
 in php-src ?? And there's no need to add those anyway,
 document them in the manual..

 --Jani


 On Thu, 18 Dec 2003, John Coggeshall wrote:

 john Wed Dec 17 21:06:01 2003 EDT
 
   Modified files:
 /php-src php.ini-dist php.ini-recommended
   Log:
   Adding the tidy.default_config and tidy.clean_output options to the .ini
   files
 
 
 
 Index: php-src/php.ini-dist
 diff -u php-src/php.ini-dist:1.202 php-src/php.ini-dist:1.203
 --- php-src/php.ini-dist:1.202   Thu Dec  4 07:05:54 2003
 +++ php-src/php.ini-dist Wed Dec 17 21:06:00 2003
 @@ -578,6 +578,15 @@
  ; Module Settings ;
  ;;;
 
 +[Tidy]
 +; The path to a default tidy configuration file to use when using tidy
 +;tidy.default_config = /usr/local/lib/php/default.tcfg
 +
 +; Should tidy clean and repair output automatically?
 +; WARNING: Do not use this option if you are generating non-html content
 +; such as dynamic images
 +tidy.clean_output = Off
 +
  [Syslog]
  ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
  ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
 Index: php-src/php.ini-recommended
 diff -u php-src/php.ini-recommended:1.147 php-src/php.ini-recommended:1.148
 --- php-src/php.ini-recommended:1.147Thu Dec  4 07:05:54 2003
 +++ php-src/php.ini-recommended  Wed Dec 17 21:06:00 2003
 @@ -598,6 +598,15 @@
  ; Module Settings ;
  ;;;
 
 +[Tidy]
 +; The path to a default tidy configuration file to use when using tidy
 +;tidy.default_config = /usr/local/lib/php/default.tcfg
 +
 +; Should tidy clean and repair output automatically?
 +; WARNING: Do not use this option if you are generating non-html content
 +; such as dynamic images
 +tidy.clean_output = Off
 +
  [Syslog]
  ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
  ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
 
 



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


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

Re: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[John Coggeshall]

Actually, it does exist in php-src. Wez added the symlink to it and it
is in the B3 tarball.

John

On Thu, 2003-12-18 at 03:27, Jani Taskinen wrote:
 Why do you add ini options for extension that doesn't exist
 in php-src ?? And there's no need to add those anyway,
 document them in the manual..
 
 --Jani
 
 
 On Thu, 18 Dec 2003, John Coggeshall wrote:
 
 john Wed Dec 17 21:06:01 2003 EDT
 
   Modified files:  
 /php-src php.ini-dist php.ini-recommended 
   Log:
   Adding the tidy.default_config and tidy.clean_output options to the .ini
   files
   
   
   
 Index: php-src/php.ini-dist
 diff -u php-src/php.ini-dist:1.202 php-src/php.ini-dist:1.203
 --- php-src/php.ini-dist:1.202   Thu Dec  4 07:05:54 2003
 +++ php-src/php.ini-dist Wed Dec 17 21:06:00 2003
 @@ -578,6 +578,15 @@
  ; Module Settings ;
  ;;;
  
 +[Tidy]
 +; The path to a default tidy configuration file to use when using tidy
 +;tidy.default_config = /usr/local/lib/php/default.tcfg
 +
 +; Should tidy clean and repair output automatically?
 +; WARNING: Do not use this option if you are generating non-html content
 +; such as dynamic images
 +tidy.clean_output = Off
 +
  [Syslog]
  ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
  ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
 Index: php-src/php.ini-recommended
 diff -u php-src/php.ini-recommended:1.147 php-src/php.ini-recommended:1.148
 --- php-src/php.ini-recommended:1.147Thu Dec  4 07:05:54 2003
 +++ php-src/php.ini-recommended  Wed Dec 17 21:06:00 2003
 @@ -598,6 +598,15 @@
  ; Module Settings ;
  ;;;
  
 +[Tidy]
 +; The path to a default tidy configuration file to use when using tidy
 +;tidy.default_config = /usr/local/lib/php/default.tcfg
 +
 +; Should tidy clean and repair output automatically?
 +; WARNING: Do not use this option if you are generating non-html content
 +; such as dynamic images
 +tidy.clean_output = Off
 +
  [Syslog]
  ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
  ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
 
 
 
  
-- 
-=~=--=~=--=~=--=~=--=~=--=~=--=~=--=~=--=~=--=~=--=~=--=~=-
John Coggeshall   http://www.coggeshall.org/
The PHP Developer's Handbookhttp://www.php-handbook.com/
-=~=--=~=--=~=--=~=--=~=--=~=--=~=--=~=--=~=--=~=--=~=--=~=-

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

Re: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

Wouldn't it be a good idea to add a NEWS entry about this new 
extension?

--Jani


On Thu, 18 Dec 2003, John Coggeshall wrote:

Actually, it does exist in php-src. Wez added the symlink to it and it
is in the B3 tarball.

John

On Thu, 2003-12-18 at 03:27, Jani Taskinen wrote:
 Why do you add ini options for extension that doesn't exist
 in php-src ?? And there's no need to add those anyway,
 document them in the manual..
 
 --Jani
 
 
 On Thu, 18 Dec 2003, John Coggeshall wrote:
 
 johnWed Dec 17 21:06:01 2003 EDT
 
   Modified files:  
 /php-srcphp.ini-dist php.ini-recommended 
   Log:
   Adding the tidy.default_config and tidy.clean_output options to the .ini
   files
   
   
   
 Index: php-src/php.ini-dist
 diff -u php-src/php.ini-dist:1.202 php-src/php.ini-dist:1.203
 --- php-src/php.ini-dist:1.202  Thu Dec  4 07:05:54 2003
 +++ php-src/php.ini-distWed Dec 17 21:06:00 2003
 @@ -578,6 +578,15 @@
  ; Module Settings ;
  ;;;
  
 +[Tidy]
 +; The path to a default tidy configuration file to use when using tidy
 +;tidy.default_config = /usr/local/lib/php/default.tcfg
 +
 +; Should tidy clean and repair output automatically?
 +; WARNING: Do not use this option if you are generating non-html content
 +; such as dynamic images
 +tidy.clean_output = Off
 +
  [Syslog]
  ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
  ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
 Index: php-src/php.ini-recommended
 diff -u php-src/php.ini-recommended:1.147 php-src/php.ini-recommended:1.148
 --- php-src/php.ini-recommended:1.147   Thu Dec  4 07:05:54 2003
 +++ php-src/php.ini-recommended Wed Dec 17 21:06:00 2003
 @@ -598,6 +598,15 @@
  ; Module Settings ;
  ;;;
  
 +[Tidy]
 +; The path to a default tidy configuration file to use when using tidy
 +;tidy.default_config = /usr/local/lib/php/default.tcfg
 +
 +; Should tidy clean and repair output automatically?
 +; WARNING: Do not use this option if you are generating non-html content
 +; such as dynamic images
 +tidy.clean_output = Off
 +
  [Syslog]
  ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
  ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
 
 
 
  


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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[John Coggeshall]

johnWed Dec 17 21:06:01 2003 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Adding the tidy.default_config and tidy.clean_output options to the .ini
  files
  
  
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.202 php-src/php.ini-dist:1.203
--- php-src/php.ini-dist:1.202  Thu Dec  4 07:05:54 2003
+++ php-src/php.ini-distWed Dec 17 21:06:00 2003
@@ -578,6 +578,15 @@
 ; Module Settings ;
 ;;;
 
+[Tidy]
+; The path to a default tidy configuration file to use when using tidy
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+tidy.clean_output = Off
+
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.147 php-src/php.ini-recommended:1.148
--- php-src/php.ini-recommended:1.147   Thu Dec  4 07:05:54 2003
+++ php-src/php.ini-recommended Wed Dec 17 21:06:00 2003
@@ -598,6 +598,15 @@
 ; Module Settings ;
 ;;;
 
+[Tidy]
+; The path to a default tidy configuration file to use when using tidy
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+tidy.clean_output = Off
+
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Sara Golemon]

pollita Fri Nov 28 21:49:58 2003 EDT

  Modified files:  
/php-srcphp.ini-recommended php.ini-dist 
  Log:
  Update php.ini-* with E_STRICT error reporting level.  -dist excludes E_STRICT, 
-recommended includes it.
  
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.145 php-src/php.ini-recommended:1.146
--- php-src/php.ini-recommended:1.145   Thu Nov 20 02:46:46 2003
+++ php-src/php.ini-recommended Fri Nov 28 21:49:57 2003
@@ -261,6 +261,9 @@
 ; intentional (e.g., using an uninitialized variable and
 ; relying on the fact it's automatically initialized to an
 ; empty string)
+; E_STRICT  - run-time notices, enable to have PHP suggest changes
+; to your code which will ensure the best interoperability
+; and forward compatability of your code
 ; E_CORE_ERROR  - fatal errors that occur during PHP's initial startup
 ; E_CORE_WARNING- warnings (non-fatal errors) that occur during PHP's
 ; initial startup
@@ -272,6 +275,10 @@
 ;
 ; Examples:
 ;
+;   - Show all errors, except for notices and coding standards warnings
+;
+;error_reporting = E_ALL  ~E_NOTICE  ~E_STRICT
+;
 ;   - Show all errors, except for notices
 ;
 ;error_reporting = E_ALL  ~E_NOTICE
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.200 php-src/php.ini-dist:1.201
--- php-src/php.ini-dist:1.200  Thu Nov 20 02:46:46 2003
+++ php-src/php.ini-distFri Nov 28 21:49:57 2003
@@ -246,6 +246,9 @@
 ; intentional (e.g., using an uninitialized variable and
 ; relying on the fact it's automatically initialized to an
 ; empty string)
+; E_STRICT - run-time notices, enable to have PHP suggest changes
+; to your code which will ensure the best interoperability
+; and forward compatability of your code
 ; E_CORE_ERROR  - fatal errors that occur during PHP's initial startup
 ; E_CORE_WARNING- warnings (non-fatal errors) that occur during PHP's
 ; initial startup
@@ -265,9 +268,9 @@
 ;
 ;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
 ;
-;   - Show all errors except for notices
+;   - Show all errors except for notices and coding standards warnings
 ;
-error_reporting  =  E_ALL  ~E_NOTICE
+error_reporting  =  E_ALL  ~E_NOTICE  ~E_STRICT
 
 ; Print out errors (as a part of the output).  For production web sites,
 ; you're strongly encouraged to turn this feature off, and use error logging

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

sniper  Thu Nov 20 02:46:47 2003 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Removed entries which no longer have no function
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.199 php-src/php.ini-dist:1.200
--- php-src/php.ini-dist:1.199  Mon Sep  1 12:25:07 2003
+++ php-src/php.ini-distThu Nov 20 02:46:46 2003
@@ -601,12 +601,6 @@
 ; the 5th parameter to mail(), even in safe mode.
 ;mail.force_extra_paramaters = 
 
-[Java]
-;java.class.path = .\php_java.jar
-;java.home = c:\jdk
-;java.library = c:\jdk\jre\bin\hotspot\jvm.dll 
-;java.library.path = .\
-
 [SQL]
 sql.safe_mode = Off
 
@@ -1060,9 +1054,6 @@
 ; show warnings on duplicate constat registrations
 ;com.autoregister_verbose = true
 
-[Printer]
-;printer.default_printer = 
-
 [mbstring]
 ; language for internal character representation.
 ;mbstring.language = Japanese
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.144 php-src/php.ini-recommended:1.145
--- php-src/php.ini-recommended:1.144   Mon Sep  1 12:25:07 2003
+++ php-src/php.ini-recommended Thu Nov 20 02:46:46 2003
@@ -616,12 +616,6 @@
 ; the 5th parameter to mail(), even in safe mode.
 ;mail.force_extra_paramaters = 
 
-[Java]
-;java.class.path = .\php_java.jar
-;java.home = c:\jdk
-;java.library = c:\jdk\jre\bin\hotspot\jvm.dll 
-;java.library.path = .\
-
 [SQL]
 sql.safe_mode = Off
 
@@ -1069,9 +1063,6 @@
 ; show warnings on duplicate constat registrations
 ;com.autoregister_verbose = true
 
-[Printer]
-;printer.default_printer = 
-
 [mbstring]
 ; language for internal character representation.
 ;mbstring.language = Japanese



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

sniper  Mon Sep  1 12:25:08 2003 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  fixed bug #25344 (regular domain localhost.com used in php.ini)
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.198 php-src/php.ini-dist:1.199
--- php-src/php.ini-dist:1.198  Wed Aug  6 09:28:59 2003
+++ php-src/php.ini-distMon Sep  1 12:25:07 2003
@@ -591,7 +591,7 @@
 SMTP = localhost
 
 ; For Win32 only.
-sendmail_from = [EMAIL PROTECTED]
+;sendmail_from = [EMAIL PROTECTED]
 
 ; For Unix only.  You may supply arguments as well (default: sendmail -t -i).
 ;sendmail_path =
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.143 php-src/php.ini-recommended:1.144
--- php-src/php.ini-recommended:1.143   Wed Aug  6 09:28:59 2003
+++ php-src/php.ini-recommended Mon Sep  1 12:25:07 2003
@@ -606,7 +606,7 @@
 SMTP = localhost
 
 ; For Win32 only.
-sendmail_from = [EMAIL PROTECTED]
+;sendmail_from = [EMAIL PROTECTED]
 
 ; For Unix only.  You may supply arguments as well (default: sendmail -t -i).
 ;sendmail_path =

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Jani Taskinen]

sniper  Wed Aug  6 09:28:59 2003 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  php_xslt.dll - php_xsl.dll, removed non-existing php_domxml.dll (bug #24960)
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.197 php-src/php.ini-dist:1.198
--- php-src/php.ini-dist:1.197  Wed Jul  9 18:38:46 2003
+++ php-src/php.ini-distWed Aug  6 09:28:59 2003
@@ -538,7 +538,6 @@
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_dbx.dll
-;extension=php_domxml.dll
 ;extension=php_exif.dll
 ;extension=php_fdf.dll
 ;extension=php_filepro.dll
@@ -572,7 +571,7 @@
 ;extension=php_sybase_ct.dll
 ;extension=php_w32api.dll
 ;extension=php_xmlrpc.dll
-;extension=php_xslt.dll
+;extension=php_xsl.dll
 ;extension=php_yaz.dll
 ;extension=php_zip.dll
 
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.142 php-src/php.ini-recommended:1.143
--- php-src/php.ini-recommended:1.142   Wed Jul  9 18:38:46 2003
+++ php-src/php.ini-recommended Wed Aug  6 09:28:59 2003
@@ -553,7 +553,6 @@
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_dbx.dll
-;extension=php_domxml.dll
 ;extension=php_exif.dll
 ;extension=php_fdf.dll
 ;extension=php_filepro.dll
@@ -587,7 +586,7 @@
 ;extension=php_sybase_ct.dll
 ;extension=php_w32api.dll
 ;extension=php_xmlrpc.dll
-;extension=php_xslt.dll
+;extension=php_xsl.dll
 ;extension=php_yaz.dll
 ;extension=php_zip.dll
 



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Frank M. Kromann]

fmk Wed Jul  9 18:36:18 2003 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Adding missing MSSQL Server ini settings
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.195 php-src/php.ini-dist:1.196
--- php-src/php.ini-dist:1.195  Mon Jun 30 16:36:38 2003
+++ php-src/php.ini-distWed Jul  9 18:36:18 2003
@@ -961,6 +961,12 @@
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
+; Connec timeout
+;mssql.connect_timeout = 5
+
+; Query timeout
+;mssql.timeout = 60
+
 ; Valid range 0 - 2147483647.  Default = 4096.
 ;mssql.textlimit = 4096
 
@@ -969,6 +975,11 @@
 
 ; Limits the number of records in each batch.  0 = all records in one batch.
 ;mssql.batchsize = 0
+
+; Specify how datetime and datetim4 columns are returned
+; On = Returns data converted to SQL server settings
+; Off = Returns values as -MM-DD hh:mm:ss
+;mssql.datetimeconvert = On
 
 ; Use NT authentication when connecting to the server
 mssql.secure_connection = Off
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.140 php-src/php.ini-recommended:1.141
--- php-src/php.ini-recommended:1.140   Mon Jun 30 16:36:38 2003
+++ php-src/php.ini-recommended Wed Jul  9 18:36:18 2003
@@ -970,6 +970,12 @@
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
+; Connec timeout
+;mssql.connect_timeout = 5
+
+; Query timeout
+;mssql.timeout = 60
+
 ; Valid range 0 - 2147483647.  Default = 4096.
 ;mssql.textlimit = 4096
 
@@ -978,6 +984,11 @@
 
 ; Limits the number of records in each batch.  0 = all records in one batch.
 ;mssql.batchsize = 0
+
+; Specify how datetime and datetim4 columns are returned
+; On = Returns data converted to SQL server settings
+; Off = Returns values as -MM-DD hh:mm:ss
+;mssql.datetimeconvert = On
 
 ; Use NT authentication when connecting to the server
 mssql.secure_connection = Off



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Frank M. Kromann]

fmk Wed Jul  9 18:38:46 2003 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  oops. fix spelling
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.196 php-src/php.ini-dist:1.197
--- php-src/php.ini-dist:1.196  Wed Jul  9 18:36:18 2003
+++ php-src/php.ini-distWed Jul  9 18:38:46 2003
@@ -961,7 +961,7 @@
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
-; Connec timeout
+; Connect timeout
 ;mssql.connect_timeout = 5
 
 ; Query timeout
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.141 php-src/php.ini-recommended:1.142
--- php-src/php.ini-recommended:1.141   Wed Jul  9 18:36:18 2003
+++ php-src/php.ini-recommended Wed Jul  9 18:38:46 2003
@@ -970,7 +970,7 @@
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
-; Connec timeout
+; Connect timeout
 ;mssql.connect_timeout = 5
 
 ; Query timeout



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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[Edin Kadribasic]

edink   Mon Jun 30 16:36:38 2003 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  MySQL is back as a shared extension.
  
  
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.194 php-src/php.ini-dist:1.195
--- php-src/php.ini-dist:1.194  Wed Jun 18 11:19:16 2003
+++ php-src/php.ini-distMon Jun 30 16:36:38 2003
@@ -559,6 +559,7 @@
 ;extension=php_ming.dll
 ;extension=php_mssql.dll
 ;extension=php_msql.dll
+;extension=php_mysql.dll
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
 ;extension=php_oracle.dll
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.139 php-src/php.ini-recommended:1.140
--- php-src/php.ini-recommended:1.139   Wed Jun 18 11:19:16 2003
+++ php-src/php.ini-recommended Mon Jun 30 16:36:38 2003
@@ -574,6 +574,7 @@
 ;extension=php_ming.dll
 ;extension=php_mssql.dll
 ;extension=php_msql.dll
+;extension=php_mysql.dll
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
 ;extension=php_oracle.dll



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