Re: [PHP-CVS] cvs: php4 /main SAPI.h fopen_wrappers.c /sapi/cgi cgi_main.c
On Mon, Apr 16, 2001 at 11:20:47PM -, Stig Bakken wrote:
There's a lot of whitespace pollution in this commit (bad tab
spacing). I'd fix it, but I don't want to commit over anything you
might be in the middle of.
- Jon
Index: php4/main/SAPI.h
diff -u php4/main/SAPI.h:1.68 php4/main/SAPI.h:1.69
--- php4/main/SAPI.h:1.68 Sat Mar 17 18:32:04 2001
+++ php4/main/SAPI.h Mon Apr 16 16:20:47 2001
@@ -25,6 +25,8 @@
#include "zend_operators.h"
#include sys/stat.h
+#define SAPI_OPTION_NO_CHDIR 1
+
#define SAPI_POST_BLOCK_SIZE 4000
#ifdef PHP_WIN32
@@ -109,6 +111,7 @@
char *default_charset;
HashTable *rfc1867_uploaded_files;
long post_max_size;
+int options;
} sapi_globals_struct;
Index: php4/main/fopen_wrappers.c
diff -u php4/main/fopen_wrappers.c:1.111 php4/main/fopen_wrappers.c:1.112
--- php4/main/fopen_wrappers.c:1.111 Sun Feb 25 22:07:31 2001
+++ php4/main/fopen_wrappers.cMon Apr 16 16:20:47 2001
@@ -16,7 +16,7 @@
| Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.111 2001/02/26 06:07:31 andi Exp $ */
+/* $Id: fopen_wrappers.c,v 1.112 2001/04/16 23:20:47 ssb Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -348,7 +348,9 @@
STR_FREE(SG(request_info).path_translated); /* for same reason as
above */
return NULL;
}
- V_CHDIR_FILE(filename);
+if (!(SG(options) SAPI_OPTION_NO_CHDIR)) {
+ V_CHDIR_FILE(filename);
+}
SG(request_info).path_translated = filename;
return fp;
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.100 php4/sapi/cgi/cgi_main.c:1.101
--- php4/sapi/cgi/cgi_main.c:1.100Thu Mar 22 10:54:51 2001
+++ php4/sapi/cgi/cgi_main.c Mon Apr 16 16:20:47 2001
@@ -80,7 +80,7 @@
extern char *ap_php_optarg;
extern int ap_php_optind;
-#define OPTSTRING "ac:d:ef:g:hilmnqs?vz:"
+#define OPTSTRING "aCc:d:ef:g:hilmnqs?vz:"
static int _print_module_info ( zend_module_entry *module, void *arg ) {
php_printf("%s\n", module-name);
@@ -246,6 +246,7 @@
" -s Display colour syntax highlighted
source.\n"
" -f file Parse file. Implies `-q'\n"
" -v Version number\n"
+" -C Do not chdir to the script's directory\n"
" -c path Look for php.ini file in this
directory\n"
#if SUPPORT_INTERACTIVE
" -a Run interactively\n"
@@ -525,7 +526,10 @@
#endif
break;
- case 'd': /* define ini entries on command line */
+ case 'C': /* don't chdir to the script directory */
+ SG(options) |= SAPI_OPTION_NO_CHDIR;
+ break;
+ case 'd': /* define ini entries on command line */
define_command_line_ini_entry(ap_php_optarg);
break;
--
Jon Parise ([EMAIL PROTECTED]) . Rochester Inst. of Technology
http://www.csh.rit.edu/~jon/ : Computer Science House Member
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/imap config.m4
jon Tue Apr 10 10:31:35 2001 EDT Modified files: /php4/ext/imap config.m4 Log: Statements end with a period. Index: php4/ext/imap/config.m4 diff -u php4/ext/imap/config.m4:1.26 php4/ext/imap/config.m4:1.27 --- php4/ext/imap/config.m4:1.26Tue Mar 27 12:34:28 2001 +++ php4/ext/imap/config.m4 Tue Apr 10 10:31:35 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26 2001/03/27 20:34:28 sniper Exp $ +dnl $Id: config.m4,v 1.27 2001/04/10 17:31:35 jon Exp $ AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then AC_DEFINE(HAVE_IMAP2000, 1, [ ]) @@ -60,7 +60,7 @@ PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR) if test -z "$IMAP_DIR"; then - AC_MSG_ERROR(Cannot find rfc822.h. Please check your IMAP installation) + AC_MSG_ERROR(Cannot find rfc822.h. Please check your IMAP installation.) fi if test -r "$IMAP_DIR/c-client/c-client.a"; then @@ -76,7 +76,7 @@ done if test -z "$IMAP_LIBDIR"; then - AC_MSG_ERROR(Cannot find imap library. Please check your IMAP installation) + AC_MSG_ERROR(Cannot find imap library. Please check your IMAP installation.) fi PHP_ADD_INCLUDE($IMAP_INC_DIR) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/standard dir.c
jon Mon Apr 9 14:08:47 2001 EDT
Modified files:
/php4/ext/standard dir.c
Log:
Fix whitespace (use tabs).
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.60 php4/ext/standard/dir.c:1.61
--- php4/ext/standard/dir.c:1.60Mon Apr 9 13:56:49 2001
+++ php4/ext/standard/dir.c Mon Apr 9 14:08:47 2001
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dir.c,v 1.60 2001/04/09 20:56:49 elixer Exp $ */
+/* $Id: dir.c,v 1.61 2001/04/09 21:08:47 jon Exp $ */
/* {{{ includes/startup/misc */
@@ -128,7 +128,7 @@
PHP_MINIT_FUNCTION(dir)
{
-static char tmpstr[2];
+ static char tmpstr[2];
zend_class_entry dir_class_entry;
le_dirp = zend_register_list_destructors_ex(_dir_dtor, NULL, "dir",
module_number);
@@ -139,9 +139,9 @@
#ifdef ZTS
dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), NULL, NULL);
#endif
-tmpstr[0] = DEFAULT_SLASH;
-tmpstr[1] = '\0';
-REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, CONST_PERSISTENT);
+ tmpstr[0] = DEFAULT_SLASH;
+ tmpstr[1] = '\0';
+ REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, CONST_PERSISTENT);
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/yp yp.c
jon Sat Apr 7 11:22:27 2001 EDT
Modified files:
/php4/ext/ypyp.c
Log:
Fix compilation (strict compilers require constant initializers).
Index: php4/ext/yp/yp.c
diff -u php4/ext/yp/yp.c:1.19 php4/ext/yp/yp.c:1.20
--- php4/ext/yp/yp.c:1.19 Tue Mar 20 12:04:41 2001
+++ php4/ext/yp/yp.cSat Apr 7 11:22:26 2001
@@ -16,7 +16,7 @@
| Fredrik Ohrn|
+--+
*/
-/* $Id: yp.c,v 1.19 2001/03/20 20:04:41 ohrn Exp $ */
+/* $Id: yp.c,v 1.20 2001/04/07 18:22:26 jon Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -215,9 +215,13 @@
{
int r;
zval *status, *key, *value;
- zval **args [3] = { status, key, value };
+ zval **args [3];
zval *retval;
CLS_FETCH();
+
+ args[0] = status;
+ args[1] = key;
+ args[2] = value;
MAKE_STD_ZVAL (status);
ZVAL_LONG (status, ypprot_err (instatus));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/imap php_imap.c
jon Sat Apr 7 18:13:08 2001 EDT Modified files: /php4/ext/imap php_imap.c Log: Use tabs instead of spaces. Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.63 php4/ext/imap/php_imap.c:1.64 --- php4/ext/imap/php_imap.c:1.63 Fri Mar 16 05:17:54 2001 +++ php4/ext/imap/php_imap.cSat Apr 7 18:13:07 2001 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] | +--+ */ -/* $Id: php_imap.c,v 1.63 2001/03/16 13:17:54 sniper Exp $ */ +/* $Id: php_imap.c,v 1.64 2001/04/08 01:13:07 jon Exp $ */ #define IMAP41 @@ -428,29 +428,29 @@ #if 1 #ifndef PHP_WIN32 - mail_link(unixdriver); /* link in the unix driver */ + mail_link(unixdriver); /* link in the unix driver */ #endif - mail_link(imapdriver); /* link in the imap driver */ - mail_link(nntpdriver); /* link in the nntp driver */ - mail_link(pop3driver); /* link in the pop3 driver */ + mail_link(imapdriver); /* link in the imap driver */ + mail_link(nntpdriver); /* link in the nntp driver */ + mail_link(pop3driver); /* link in the pop3 driver */ #ifndef PHP_WIN32 - mail_link(mhdriver);/* link in the mh driver */ - mail_link(mxdriver);/* link in the mx driver */ + mail_link(mhdriver); /* link in the mh driver */ + mail_link(mxdriver); /* link in the mx driver */ #endif - mail_link(mbxdriver); /* link in the mbx driver */ - mail_link(tenexdriver); /* link in the tenex driver */ - mail_link(mtxdriver); /* link in the mtx driver */ + mail_link(mbxdriver); /* link in the mbx driver */ + mail_link(tenexdriver);/* link in the tenex driver */ + mail_link(mtxdriver); /* link in the mtx driver */ #ifndef PHP_WIN32 - mail_link(mmdfdriver); /* link in the mmdf driver */ - mail_link(newsdriver); /* link in the news driver */ - mail_link(philedriver); /* link in the phile driver */ - auth_link(auth_log);/* link in the log authenticator */ + mail_link(mmdfdriver); /* link in the mmdf driver */ + mail_link(newsdriver); /* link in the news driver */ + mail_link(philedriver);/* link in the phile driver */ + auth_link(auth_log); /* link in the log authenticator */ #ifdef HAVE_IMAP_SSL ssl_onceonlyinit (); - auth_link (auth_ssl); /* link in the ssl authenticator */ + auth_link (auth_ssl); /* link in the ssl authenticator */ #endif #endif - mail_link(dummydriver); /* link in the dummy driver */ + mail_link(dummydriver);/* link in the dummy driver */ #else /* link in the c-client mail and auth drivers */ #include "linkage.c" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 / configure.in
jon Fri Apr 6 09:01:20 2001 EDT
Modified files:
/php4 configure.in
Log:
Fix expansion of PEAR_INSTALLDIR.
Index: php4/configure.in
diff -u php4/configure.in:1.229 php4/configure.in:1.230
--- php4/configure.in:1.229 Wed Apr 4 13:52:43 2001
+++ php4/configure.in Fri Apr 6 09:01:20 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.229 2001/04/04 20:52:43 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.230 2001/04/06 16:01:20 jon Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -717,9 +717,9 @@
PEAR_INSTALLDIR="$prefix/lib/php"
fi
-EXTENSION_DIR="\${PEAR_INSTALLDIR}/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO"
+EXTENSION_DIR="${PEAR_INSTALLDIR}/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO"
-INCLUDE_PATH=".:\${PEAR_INSTALLDIR}"
+INCLUDE_PATH=".:${PEAR_INSTALLDIR}"
PHP_BUILD_RPATH
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/skeleton skeleton.c
jon Fri Apr 6 09:04:25 2001 EDT Modified files: /php4/ext/skeleton skeleton.c Log: Make this message more grammatically correct. Index: php4/ext/skeleton/skeleton.c diff -u php4/ext/skeleton/skeleton.c:1.12 php4/ext/skeleton/skeleton.c:1.13 --- php4/ext/skeleton/skeleton.c:1.12 Fri Apr 6 07:42:06 2001 +++ php4/ext/skeleton/skeleton.cFri Apr 6 09:04:25 2001 @@ -97,7 +97,7 @@ convert_to_string_ex(arg); - len = sprintf(string, "Congratulations, you have successfully modified ext/%.80s/config.m4, module %.80s is compiled into PHP", "extname", Z_STRVAL_PP(arg)); + len = sprintf(string, "Congratulations! You have successfully modified +ext/%.80s/config.m4. Module %.80s is now compiled into PHP.", "extname", +Z_STRVAL_PP(arg)); RETURN_STRINGL(string, len, 1); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 / php.ini-dist
jon Fri Apr 6 09:24:56 2001 EDT Modified files: /php4 php.ini-dist Log: Comment out the 'include_path' variable by default. # Leaving it blank overrides the default include path, which contains the # PEAR directory. # The other option is to have the build system generate this file and expand # @PEAR_INSTALLDIR@ on this line to reflect the system default. Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.77 php4/php.ini-dist:1.78 --- php4/php.ini-dist:1.77 Thu Apr 5 05:41:25 2001 +++ php4/php.ini-dist Fri Apr 6 09:24:55 2001 @@ -1,5 +1,5 @@ [PHP] -; $Id: php.ini-dist,v 1.77 2001/04/05 12:41:25 dbeu Exp $ +; $Id: php.ini-dist,v 1.78 2001/04/06 16:24:55 jon Exp $ ;;; ; About this file ; @@ -308,12 +308,11 @@ ; ; UNIX: "/path1:/path2" Windows: "\path1;\path2" -include_path = +;include_path = ; The root of the PHP pages, used only if nonempty. doc_root = - ; The directory under which PHP opens the script using /~usernamem used only ; if nonempty. user_dir = @@ -779,4 +778,4 @@ ; Local Variables: ; tab-width: 4 -; End: \ No newline at end of file +; End: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /pear PEAR.php.in
jon Mon Apr 2 20:12:49 2001 EDT
Modified files:
/php4/pear PEAR.php.in
Log:
Cleaner (and probably safer) condition handling.
Index: php4/pear/PEAR.php.in
diff -u php4/pear/PEAR.php.in:1.17 php4/pear/PEAR.php.in:1.18
--- php4/pear/PEAR.php.in:1.17 Thu Mar 29 11:54:27 2001
+++ php4/pear/PEAR.php.in Mon Apr 2 20:12:49 2001
@@ -17,7 +17,7 @@
// | Stig Bakken [EMAIL PROTECTED] |
// +--+
//
-// $Id: PEAR.php.in,v 1.17 2001/03/29 19:54:27 chagenbu Exp $
+// $Id: PEAR.php.in,v 1.18 2001/04/03 03:12:49 jon Exp $
//
define('PEAR_ERROR_RETURN', 1);
@@ -236,8 +236,7 @@
if ($mode === null) {
if (isset($this-_default_error_mode)) {
$mode = $this-_default_error_mode;
-}
-if ($mode === null) {
+} else {
$mode = $GLOBALS['_PEAR_default_error_mode'];
}
}
@@ -245,8 +244,7 @@
if ($mode == PEAR_ERROR_TRIGGER $options === null) {
if (isset($this-_default_error_options)) {
$options = $this-_default_error_options;
-}
-if ($options === null) {
+} else {
$options = $GLOBALS['_PEAR_default_error_options'];
}
}
@@ -257,8 +255,7 @@
is_object($options[0]) is_string($options[1]))) {
if (isset($this-_default_error_callback)) {
$options = $this-_default_error_callback;
-}
-if ($options === null) {
+} else {
$options = $GLOBALS['_PEAR_default_error_callback'];
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /pear/DB pgsql.php
jon Mon Apr 2 20:27:46 2001 EDT
Modified files:
/php4/pear/DB pgsql.php
Log:
Make the 'protocol' DSN element optional.
Index: php4/pear/DB/pgsql.php
diff -u php4/pear/DB/pgsql.php:1.34 php4/pear/DB/pgsql.php:1.35
--- php4/pear/DB/pgsql.php:1.34 Wed Mar 28 15:52:21 2001
+++ php4/pear/DB/pgsql.php Mon Apr 2 20:27:46 2001
@@ -79,8 +79,9 @@
{
$this-dsn = $dsninfo;
$host = $dsninfo['hostspec'];
+$protocol = (isset($dsninfo['protocol'])) ? $dsninfo['protocol'] : '';
$connstr = '';
-if (($host !== false) ($dsninfo['protocol'] != 'unix')){
+if (($host !== false) ($protocol != 'unix')){
if (($pos=strpos(':', $host)) !== false) {
$dbhost = substr($host, 0, $pos);
$port = substr($host, $pos+1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /pear/DB pgsql.php
jon Mon Apr 2 20:33:58 2001 EDT
Modified files:
/php4/pear/DB pgsql.php
Log:
Style and whitespace.
Index: php4/pear/DB/pgsql.php
diff -u php4/pear/DB/pgsql.php:1.35 php4/pear/DB/pgsql.php:1.36
--- php4/pear/DB/pgsql.php:1.35 Mon Apr 2 20:27:46 2001
+++ php4/pear/DB/pgsql.php Mon Apr 2 20:33:58 2001
@@ -82,20 +82,31 @@
$protocol = (isset($dsninfo['protocol'])) ? $dsninfo['protocol'] : '';
$connstr = '';
if (($host !== false) ($protocol != 'unix')){
-if (($pos=strpos(':', $host)) !== false) {
+if (($pos = strpos(':', $host)) !== false) {
$dbhost = substr($host, 0, $pos);
-$port = substr($host, $pos+1);
+$port = substr($host, $pos + 1);
} else {
$dbhost = $host;
$port = '5432';
}
-$connstr="host=".$dsninfo['hostspec']." port=".$port;
+$connstr = 'host=' . $dsninfo['hostspec'] . ' port=' . $port;
}
-$connstr .= $dsninfo['database'] ? " dbname=".$dsninfo['database'] : NULL;
-$connstr .= $dsninfo['username'] ? " user=".$dsninfo['username'] : NULL;
-$connstr .= $dsninfo['password'] ? " password=".$dsninfo['password'] : NULL;
-$connstr .= (!empty($dsninfo['options'])) ? " options=".$dsninfo['options'] :
NULL;
-$connstr .= (!empty($dsninfo['tty'])) ? " tty=".$dsninfo['tty'] : NULL;
+
+if (isset($dsninfo['database'])) {
+$connstr .= ' dbname=' . $dsninfo['database'];
+}
+if (isset($dsninfo['username'])) {
+$connstr .= ' user=' . $dsninfo['username'];
+}
+if (isset($dsninfo['password'])) {
+$connstr .= ' password=' . $dsninfo['password'];
+}
+if (!empty($dsninfo['options'])) {
+$connstr .= ' options=' . $dsninfo['options'];
+}
+if (!empty($dsninfo['tty'])) {
+$connstr .= ' tty=' . $dsninfo['tty'];
+}
$connect_function = $persistent ? 'pg_pconnect' : 'pg_connect';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /pear Makefile.in
jon Sat Mar 24 13:48:42 2001 EDT Modified files: /php4/pear Makefile.in Log: Install the Informix database implementation. Index: php4/pear/Makefile.in diff -u php4/pear/Makefile.in:1.74 php4/pear/Makefile.in:1.75 --- php4/pear/Makefile.in:1.74 Sat Mar 24 13:40:25 2001 +++ php4/pear/Makefile.in Sat Mar 24 13:48:41 2001 @@ -52,6 +52,7 @@ DB.php \ DB/common.php \ DB/ibase.php \ + DB/ifx.php \ DB/msql.php \ DB/mssql.php \ DB/mysql.php \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /pear/DB MAINTAINERS ifx.php
jon Fri Mar 23 11:26:55 2001 EDT
Added files:
/php4/pear/DB ifx.php
Modified files:
/php4/pear/DB MAINTAINERS
Log:
Adding an Informix (ifx) database implementation.
Submitted by: "Tomas V.V.Cox" [EMAIL PROTECTED]
Index: php4/pear/DB/MAINTAINERS
diff -u php4/pear/DB/MAINTAINERS:1.3 php4/pear/DB/MAINTAINERS:1.4
--- php4/pear/DB/MAINTAINERS:1.3Wed Dec 13 06:41:04 2000
+++ php4/pear/DB/MAINTAINERSFri Mar 23 11:26:55 2001
@@ -9,3 +9,4 @@
pgsql : Rui Hirokawa [EMAIL PROTECTED]
Stig Bakken [EMAIL PROTECTED]
sybase:
+ifx : Tomas V.V.Cox [EMAIL PROTECTED]
Index: php4/pear/DB/ifx.php
+++ php4/pear/DB/ifx.php
?php
//
// +--+
// | PHP version 4.0 |
// +--+
// | Copyright (c) 1997-2001 The PHP Group|
// +--+
// | This source file is subject to version 2.02 of the PHP license, |
// | that is bundled with this package in the file LICENSE, and is|
// | available at through the world-wide-web at |
// | http://www.php.net/license/2_02.txt. |
// | If you did not receive a copy of the PHP license and are unable to |
// | obtain it through the world-wide-web, please send a note to |
// | [EMAIL PROTECTED] so we can mail you a copy immediately. |
// +--+
// | Authors:Tomas V.V.Cox [EMAIL PROTECTED] |
// +--+
//
// Database independent query interface definition for PHP's Informix
// extension.
//
// Legend:
// For more info on Informix errors see:
// http://www.informix.com/answers/english/ierrors.htm
//
require_once 'DB/common.php';
class DB_ifx extends DB_common
{
var $connection;
var $numrows;
var $row;
var $affected = 0;
var $fetchmode = DB_FETCHMODE_ASSOC; /* Default fetch mode */
function DB_ifx()
{
$this-phptype = 'ifx';
$this-dbsyntax = 'ifx';
$this-features = array(
'prepare' = false,
'pconnect' = true,
'transactions' = false
);
$this-errorcode_map = array();
}
/**
* Connect to a database and log in as the specified user.
*
* @param $dsn the data source name (see DB::parseDSN for syntax)
* @param $persistent (optional) whether the connection should
*be persistent
*
* @return int DB_OK on success, a DB error code on failure
*/
function connect($dsn, $persistent = false)
{
$dsninfo = DB::parseDSN($dsn);
$dbhost = $dsninfo['hostspec'] ? '@' . $dsninfo['hostspec'] : '';
$dbname = $dsninfo['database'] ? $dsninfo['database'] . $dbhost : '';
$user = $dsninfo['username'] ? $dsninfo['username'] : '';
$pw = $dsninfo['password'] ? $dsninfo['password'] : '';
$connect_function = $persistent ? 'ifx_pconnect' : 'ifx_connect';
$this-connection = @$connect_function($dbname, $user, $pw);
if ($this-connection == false) {
return $this-ifxraiseError();
}
return DB_OK;
}
/**
* Log out and disconnect from the database.
*
* @return bool TRUE on success, FALSE if not connected.
*/
function disconnect()
{
return @ifx_close($this-connection);
}
/**
* Send a query to Informix and return the results as a
* Informix resource identifier.
*
* @param $query the SQL query
*
* @return int returns a valid Informix result for successful SELECT
* queries, DB_OK for other successful queries. A DB error code
* is returned on failure.
*/
function simpleQuery($query)
{
$this-last_query = $query;
// the scroll is needed for fetching absolute row numbers
// in a select query result
$cursor = (preg_match('/(SELECT)/i', $query)) ? IFX_SCROLL : null;
if (!$result = @ifx_prepare($query, $this-connection, $cursor)) {
return $this-ifxraiseError();
}
if (!@ifx_do($result)) {
return $this-ifxraiseError();
}
$this-affected = ifx_affected_rows ($result);
// Determine which queries that should return data, and which
// should return an error code only.
if (preg_match('/(SELECT)/i', $query)) {
return $result;
} else {
return DB_OK;
}
}
/**
* Gets the number of rows affected by the last query.
* if the last query was a select, returns an _estimate_ value.
*
[PHP-CVS] cvs: php4 /pear DB.php
jon Tue Mar 20 20:15:41 2001 EDT
Modified files:
/php4/pear DB.php
Log:
Style and whitespace, based mostly on a submission from
"Tomas V.V.Cox" [EMAIL PROTECTED].
Index: php4/pear/DB.php
diff -u php4/pear/DB.php:1.50 php4/pear/DB.php:1.51
--- php4/pear/DB.php:1.50 Sun Mar 11 15:26:18 2001
+++ php4/pear/DB.phpTue Mar 20 20:15:40 2001
@@ -17,7 +17,7 @@
// | Tomas V.V.Cox [EMAIL PROTECTED] |
// +--+
//
-// $Id: DB.php,v 1.50 2001/03/11 23:26:18 jon Exp $
+// $Id: DB.php,v 1.51 2001/03/21 04:15:40 jon Exp $
//
// Database independent query interface.
//
@@ -63,8 +63,8 @@
* DB::isWarning().
*/
-define("DB_WARNING", -1000);
-define("DB_WARNING_READ_ONLY", -1001);
+define('DB_WARNING', -1000);
+define('DB_WARNING_READ_ONLY', -1001);
/*
* These constants are used when storing information about prepared
@@ -78,8 +78,8 @@
* into your database).
*/
-define("DB_PARAM_SCALAR", 1);
-define("DB_PARAM_OPAQUE", 2);
+define('DB_PARAM_SCALAR', 1);
+define('DB_PARAM_OPAQUE', 2);
/*
* These constants define different ways of returning binary data
@@ -93,28 +93,28 @@
* hex format, for example the string "123" would become "313233".
*/
-define("DB_BINMODE_PASSTHRU", 1);
-define("DB_BINMODE_RETURN", 2);
-define("DB_BINMODE_CONVERT", 3);
+define('DB_BINMODE_PASSTHRU', 1);
+define('DB_BINMODE_RETURN', 2);
+define('DB_BINMODE_CONVERT', 3);
/**
* This is a special constant that tells DB the user hasn't specified
* any particular get mode, so the default should be used.
*/
-define("DB_FETCHMODE_DEFAULT", 0);
+define('DB_FETCHMODE_DEFAULT', 0);
/**
* Column data indexed by numbers, ordered from 0 and up
*/
-define("DB_FETCHMODE_ORDERED", 1);
+define('DB_FETCHMODE_ORDERED', 1);
/**
* Column data indexed by column names
*/
-define("DB_FETCHMODE_ASSOC", 2);
+define('DB_FETCHMODE_ASSOC', 2);
/**
* For multi-dimensional results: normally the first level of arrays
@@ -123,13 +123,13 @@
* is the column name, and the second level the row number.
*/
-define("DB_FETCHMODE_FLIPPED", 4);
+define('DB_FETCHMODE_FLIPPED', 4);
/* for compatibility */
-define("DB_GETMODE_ORDERED", DB_FETCHMODE_ORDERED);
-define("DB_GETMODE_ASSOC", DB_FETCHMODE_ASSOC);
-define("DB_GETMODE_FLIPPED", DB_FETCHMODE_FLIPPED);
+define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED);
+define('DB_GETMODE_ASSOC', DB_FETCHMODE_ASSOC);
+define('DB_GETMODE_FLIPPED', DB_FETCHMODE_FLIPPED);
/**
* The main "DB" class is simply a container class with some static
@@ -141,7 +141,7 @@
* DB The main DB class. This is simply a utility class
* with some "static" methods for creating DB objects as
* well as common utility functions for other DB classes.
- *
+ *
* DB_commonThe base for each DB implementation. Provides default
* |implementations (in OO lingo virtual methods) for
* |the actual DB implementations as well as a bunch of
@@ -170,16 +170,16 @@
function factory($type)
{
- @include_once("DB/${type}.php");
+@include_once("DB/${type}.php");
- $classname = "DB_${type}";
- @$obj = new $classname;
+$classname = "DB_${type}";
+@$obj = new $classname;
- if (!$obj) {
- return new DB_Error(DB_ERROR_NOT_FOUND);
- }
+if (!$obj) {
+return new DB_Error(DB_ERROR_NOT_FOUND);
+}
- return $obj;
+return $obj;
}
/**
@@ -208,8 +208,8 @@
$dsninfo = DB::parseDSN($dsn);
}
$type = $dsninfo["phptype"];
-
- @include_once "DB/${type}.php";
+
+@include_once "DB/${type}.php";
$classname = "DB_${type}";
@$obj = new $classname;
@@ -243,7 +243,7 @@
*/
function apiVersion()
{
- return 2;
+return 2;
}
/**
@@ -255,9 +255,9 @@
*/
function isError($value)
{
- return (is_object($value)
- (get_class($value) == 'db_error' ||
-is_subclass_of($value, 'db_error')));
+return (is_object($value)
+(get_class($value) == 'db_error' ||
+ is_subclass_of($value, 'db_error')));
}
/**
@@ -289,9 +289,9 @@
*/
function isWarning($value)
{
- return is_object($value)
- (get_class( $value ) == "db_warning" ||
-is_subclass_of($value, "db_warning"));
+return is_object($value)
+(get_class( $value ) == "db_warning" ||
+ is_subclass_of($value, "db_warning"));
}
/**
@@ -304,39 +304,39 @@
*/
function errorMessage($value)
{
- if (!isset($errorMessages)) {
- $errorMessages = array(
- DB_ERROR= "unknown error",
-
Re: [PHP-CVS] cvs: php4(PHP_4_0_5) / configure.in
On Tue, Mar 20, 2001 at 03:53:46AM +0200, Zeev Suraski wrote: Merge From Head. It would be helpful to include the revision(s) from which you are merging, for future reference. -- Jon Parise ([EMAIL PROTECTED]) . Rochester Inst. of Technology http://www.csh.rit.edu/~jon/ : Computer Science House Member -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 /ext/midgard attachment.c
On Thu, Mar 15, 2001 at 09:57:49PM -, Emiliano Heyns wrote:
Index: php4/ext/midgard/attachment.c
diff -u php4/ext/midgard/attachment.c:1.10 php4/ext/midgard/attachment.c:1.11
--- php4/ext/midgard/attachment.c:1.10Sun Mar 11 15:30:36 2001
+++ php4/ext/midgard/attachment.c Thu Mar 15 13:57:48 2001
@@ -1,4 +1,4 @@
-/* $Id: attachment.c,v 1.10 2001/03/11 23:30:36 davidg Exp $
+/* $Id: attachment.c,v 1.11 2001/03/15 21:57:48 emile Exp $
Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
Copyright (C) 2000 The Midgard Project ry
Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
@@ -434,6 +434,7 @@
if (sapi_send_headers() != SUCCESS) {
mgd_free_pool(pool);
mgd_release(res);
+ fclose(fp);
RETURN_FALSE_BECAUSE(MGD_ERR_INTERNAL);
}
@@ -442,6 +443,7 @@
PHPWRITE(buf, b);
}
+ fclose(fp);
mgd_free_pool(pool);
mgd_release(res);
RETVAL_TRUE;
Whitespace pollution.
--
Jon Parise ([EMAIL PROTECTED]) . Rochester Inst. of Technology
http://www.csh.rit.edu/~jon/ : Computer Science House Member
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/standard credits.h
jon Wed Mar 14 21:07:32 2001 EDT Modified files: /php4/ext/standard credits.h Log: Whitespace (spaces to four-column tabs) Index: php4/ext/standard/credits.h diff -u php4/ext/standard/credits.h:1.3 php4/ext/standard/credits.h:1.4 --- php4/ext/standard/credits.h:1.3 Wed Mar 14 13:28:58 2001 +++ php4/ext/standard/credits.h Wed Mar 14 21:07:31 2001 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: credits.h,v 1.3 2001/03/14 21:28:58 jmoore Exp $ */ +/* $Id: credits.h,v 1.4 2001/03/15 05:07:31 jon Exp $ */ #ifndef CREDITS_H #define CREDITS_H @@ -32,7 +32,7 @@ #define PHP_CREDITS_DOCS (14) #define PHP_CREDITS_FULLPAGE (15) #define PHP_CREDITS_QA (16) -#define PHP_CREDITS_WEB (17) +#define PHP_CREDITS_WEB(17) #define PHP_CREDITS_ALL0x #endif /* HAVE_CREDITS_DEFS */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /pear DB.php
jon Sun Mar 11 15:26:19 2001 EDT
Modified files:
/php4/pear DB.php
Log:
Revised version of the parseDSN function.
Submitted by: "Tomas V.V.Cox" [EMAIL PROTECTED]
Index: php4/pear/DB.php
diff -u php4/pear/DB.php:1.49 php4/pear/DB.php:1.50
--- php4/pear/DB.php:1.49 Tue Feb 20 15:00:08 2001
+++ php4/pear/DB.phpSun Mar 11 15:26:18 2001
@@ -1,5 +1,5 @@
?php
-//
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +--+
// | PHP version 4.0 |
// +--+
@@ -14,10 +14,10 @@
// | [EMAIL PROTECTED] so we can mail you a copy immediately. |
// +--+
// | Authors: Stig Bakken [EMAIL PROTECTED] |
-// | |
+// | Tomas V.V.Cox [EMAIL PROTECTED] |
// +--+
//
-// $Id: DB.php,v 1.49 2001/02/20 23:00:08 ssb Exp $
+// $Id: DB.php,v 1.50 2001/03/11 23:26:18 jon Exp $
//
// Database independent query interface.
//
@@ -346,95 +346,106 @@
*
* @return array an associative array with the following keys:
*
- * phptype: Database backend used in PHP (mysql, odbc etc.)
- * dbsyntax: Database used with regards to SQL syntax etc.
- * protocol: Communication protocol to use (tcp, unix etc.)
- * hostspec: Host specification (hostname[:port])
- * database: Database to use on the DBMS server
- * username: User name for login
- * password: Password for login
+ * phptype: Database backend used in PHP (mysql, odbc etc.)
+ * dbsyntax: Database used with regards to SQL syntax etc.
+ * protocol: Communication protocol to use (tcp, unix etc.)
+ * hostspec: Host specification (hostname[:port])
+ * database: Database to use on the DBMS server
+ * username: User name for login
+ * password: Password for login
*
* The format of the supplied DSN is in its fullest form:
*
* phptype(dbsyntax)://username:password@protocol+hostspec/database
*
* Most variations are allowed:
- * phptype://username:password@protocol+hostspec/database/li
- * phptype://username:password@hostspec/database/li
- * phptype://username:password@hostspec/li
- * phptype://hostspec/database/li
- * phptype://hostspec/li
- * phptype(dbsyntax)/li
- * phptype/li
+ *
+ * phptype://username:password@protocol+hostspec:110//usr/db_file.db
+ * phptype://username:password@hostspec/database_name
+ * phptype://username:password@hostspec
+ * phptype://username@hostspec
+ * phptype://hostspec/database
+ * phptype://hostspec
+ * phptype(dbsyntax)
+ * phptype
*
- * @return bool FALSE is returned on error
+ * @author Tomas V.V.Cox [EMAIL PROTECTED]
*/
function parseDSN($dsn)
{
- if (is_array($dsn)) {
- return $dsn;
- }
-
- $parsed = array(
- "phptype" = false,
- "dbsyntax" = false,
- "protocol" = false,
- "hostspec" = false,
- "database" = false,
- "username" = false,
- "password" = false
- );
-
- if (preg_match("|^([^:]+)://|", $dsn, $arr)) {
- $dbtype = $arr[ 1 ];
- $dsn = preg_replace( "|^[^:]+://|", '', $dsn);
-
- // match "phptype(dbsyntax)"
- if (preg_match("|^([^\(]+)\((.+)\)$|", $dbtype, $arr)) {
- $parsed["phptype"] = $arr[1];
- $parsed["dbsyntax"] = $arr[2];
- } else {
- $parsed["phptype"] = $dbtype;
- }
-} else {
- // match "phptype(dbsyntax)"
- if (preg_match("|^([^\(]+)\((.+)\)$|", $dsn, $arr)) {
- $parsed["phptype"] = $arr[1];
- $parsed["dbsyntax"] = $arr[2];
- } else {
- $parsed["phptype"] = $dsn;
- }
-
- return $parsed;
+if (is_array($dsn)) {
+return $dsn;
}
-if (preg_match("|^(.*)/([^/]+)/?$|", $dsn, $arr)) {
- $parsed["database"] = $arr[2];
- $dsn = $arr[1];
+$parsed = array(
+'phptype' = false,
+'dbsyntax' = false,
+'protocol' = false,
+'hostspec' = false,
+'database' = false,
+'username' = false,
+'password' = false
+);
+
+// Find phptype and dbsyntax
+if (($pos = strpos($dsn, '://')) !== false) {
+$str = substr($dsn, 0, $pos);
+$dsn = substr($dsn, $pos + 3);
+} else {
+$str = $dsn;
+
[PHP-CVS] cvs: php4 /pear/DB pgsql.php
jon Fri Mar 9 22:04:15 2001 EDT Modified files: /php4/pear/DB pgsql.php Log: Make the #options, $tty, and $port parameters optional. Index: php4/pear/DB/pgsql.php diff -u php4/pear/DB/pgsql.php:1.30 php4/pear/DB/pgsql.php:1.31 --- php4/pear/DB/pgsql.php:1.30 Mon Feb 19 04:22:26 2001 +++ php4/pear/DB/pgsql.php Fri Mar 9 22:04:14 2001 @@ -97,9 +97,9 @@ $user = $dsninfo['username']; $pw = $dsninfo['password']; $dbname = $dsninfo['database']; -$options = $dsninfo['options']; -$tty = $dsninfo['tty']; -$port = $dsninfo['port'] ? $dsninfo['port'] : '5432'; +$options = (!empty($dsninfo['options'])) ? $dsninfo['options'] : NULL; +$tty = (!empty($dsninfo['tty'])) ? $dsninfo['tty'] : NULL; +$port = (!empty($dsninfo['port'])) ? $dsninfo['port'] : '5432'; $connect_function = $persistent ? 'pg_pconnect' : 'pg_connect'; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 /ext/midgard sitegroup.c
On Tue, Mar 06, 2001 at 08:12:52AM -, Emiliano Heyns wrote: emile Tue Mar 6 00:12:52 2001 EDT Modified files: /php4/ext/midgard sitegroup.c Log: Bug #123 I assume this fixed _Midgard_ bug #123, not _PHP_ bug #123. Could you please distinguish between them in the future? While it is obvious which bug you mean now, it might be confusing for people looking back in the commit logs. -- Jon Parise ([EMAIL PROTECTED]) . Rochester Inst. of Technology http://www.csh.rit.edu/~jon/ : Computer Science House Member -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 /pear/Cache Container.php
On Sat, Mar 03, 2001 at 07:14:36PM -, Ulf Wendel wrote: PR: What does PR mean - Public Relations? In this context, it means "Problem Report". It should probably be renamed "Bug:" and filled in with the bug ID when the commit closes an open bug in the PHP bug tracker. -- Jon Parise ([EMAIL PROTECTED]) . Rochester Inst. of Technology http://www.csh.rit.edu/~jon/ : Computer Science House Member -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /pear CODING_STANDARDS
jon Sun Feb 18 09:47:44 2001 EDT Modified files: /php4/pear CODING_STANDARDS Log: Go back to listing the copyright years explicitly (instead of using a range). Index: php4/pear/CODING_STANDARDS diff -u php4/pear/CODING_STANDARDS:1.4 php4/pear/CODING_STANDARDS:1.5 --- php4/pear/CODING_STANDARDS:1.4 Tue Jan 9 09:42:40 2001 +++ php4/pear/CODING_STANDARDS Sun Feb 18 09:47:43 2001 @@ -2,7 +2,7 @@ || PEAR Coding Standards || === -$Id: CODING_STANDARDS,v 1.4 2001/01/09 17:42:40 jon Exp $ +$Id: CODING_STANDARDS,v 1.5 2001/02/18 17:47:43 jon Exp $ - [1] Indenting @@ -174,7 +174,7 @@ // +--+ // | PHP version 4.0 | // +--+ -// | Copyright (c) 1997-2001 The PHP Group| +// | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group | // +--+ // | This source file is subject to version 2.0 of the PHP license, | // | that is bundled with this package in the file LICENSE, and is| @@ -188,7 +188,7 @@ // | Your Name [EMAIL PROTECTED] | // +--+ // -// $Id: CODING_STANDARDS,v 1.4 2001/01/09 17:42:40 jon Exp $ +// $Id: CODING_STANDARDS,v 1.5 2001/02/18 17:47:43 jon Exp $ There's no hard rule to determine when a new code contributer should be added to the list of authors for a given source file. In general, their -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 /ext/midgard .cvsignore ChangeLog INSTALL Makefile.in article.c attachment.c calendar.c config.m4 element.c event.c eventmember.c file.c group.c host.c image.c mail.c member.c mgd_access.h mgd_article.h mgd_attachment.h mgd_calendar.h mgd_element.h mgd_errno.pl mgd_event.h mgd_eventmember.h mgd_file.h mgd_group.h mgd_host.h mgd_image.h mgd_internal.h mgd_mail.h mgd_member.h mgd_midgard.h mgd_oop.h mgd_page.h mgd_pageelement.h mgd_pagelink.h mgd_person.h mgd_preferences.h mgd_preparser.h mgd_sitegroup.h mgd_snippet.h mgd_snippetdir.h mgd_style.h mgd_topic.h midgard.c mkall oop.c page.c pageelement.c pagelink.c parameter.c person.c php_midgard.h preferences.c preparser-parser.y preparser-scanner.l preparser.c sitegroup.c snippet.c snippetdir.c style.c topic.c
On Sat, Feb 17, 2001 at 11:21:54PM -, Emiliano Heyns wrote: Index: php4/ext/midgard/.cvsignore diff -u /dev/null php4/ext/midgard/.cvsignore:1.3 --- /dev/null Sat Feb 17 15:21:51 2001 +++ php4/ext/midgard/.cvsignore Sat Feb 17 15:21:49 2001 @@ -0,0 +1,122 @@ +.deps +.libs +CVS +Makefile +access.lo +access.o +access.slo +acinclude.m4 +aclocal.m4 +article.lo +article.o +article.slo A lot of these can probably be shortened to: *.o *.lo *.slo -- Jon Parise ([EMAIL PROTECTED]) . Rochester Inst. of Technology http://www.csh.rit.edu/~jon/ : Computer Science House Member -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 /ext/mnogosearch config.m4
jon Wed Feb 14 12:10:15 2001 EDT Modified files: /php4/ext/mnogosearch config.m4 Log: Fix build. Index: php4/ext/mnogosearch/config.m4 diff -u php4/ext/mnogosearch/config.m4:1.5 php4/ext/mnogosearch/config.m4:1.6 --- php4/ext/mnogosearch/config.m4:1.5 Wed Feb 14 06:39:39 2001 +++ php4/ext/mnogosearch/config.m4 Wed Feb 14 12:10:14 2001 @@ -1,5 +1,5 @@ dnl $Source: /local/repository/php4/ext/mnogosearch/config.m4,v $ -dnl $Id: config.m4,v 1.5 2001/02/14 14:39:39 gluke Exp $ +dnl $Id: config.m4,v 1.6 2001/02/14 20:10:14 jon Exp $ PHP_ARG_WITH(mnogosearch,for mnoGoSearch support, [ --with-mnogosearch[=DIR] Include mnoGoSearch support. DIR is the mnoGoSearch base @@ -21,7 +21,7 @@ if test -x "$MNOGOSEARCH_BINDIR/udm-config"; then MNOGOSEARCH_VERSION=`$MNOGOSEARCH_BINDIR/udm-config --version` - MNOGOSEARCH_VERSION_ID=`$MNOGOSEARCH_BINDIR/udm-config -version-id` + MNOGOSEARCH_VERSION_ID=`$MNOGOSEARCH_BINDIR/udm-config --version-id` if test $? -ne 0; then AC_MSG_RESULT(= 3.1.9) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4 / php.ini-dist
On Thu, Feb 01, 2001 at 09:10:05PM -, James Moore wrote: This looks good although maybe something like the following would make it easier to find sections.. at the moment the [syslog] (required) titles seem to fade into the background a bit having this above the [title] would maybe make the sections easier to spot. ;; ; Syslog ; ;; That looks pretty good to me, although it would be easier to search for "^; Syslog" if it looked like this: ;; ; Syslog ; ;; But that's just a random thought. =) -- Jon Parise ([EMAIL PROTECTED]) . Rochester Inst. of Technology http://www.csh.rit.edu/~jon/ : Computer Science House Member -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
[PHP-CVS] cvs: php4 / php.ini-dist
jon Wed Jan 31 22:29:41 2001 EDT Modified files: /php4 php.ini-dist Log: Massive reformatting. Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.66 php4/php.ini-dist:1.67 --- php4/php.ini-dist:1.66 Mon Jan 22 11:15:31 2001 +++ php4/php.ini-dist Wed Jan 31 22:29:41 2001 @@ -1,4 +1,5 @@ [PHP] +; $Id: php.ini-dist,v 1.67 2001/02/01 06:29:41 jon Exp $ ;;; ; About this file ; @@ -40,9 +41,9 @@ ; foo = none ; sets foo to an empty string ; foo = "none"; sets foo to the string 'none' ; -; If you use constants in your value, and these constants belong to a dynamically -; loaded extension (either a PHP extension or a Zend extension), you may only -; use these constants *after* the line that loads the extension. +; If you use constants in your value, and these constants belong to a +; dynamically loaded extension (either a PHP extension or a Zend extension), +; you may only use these constants *after* the line that loads the extension. ; ; All the values in the php.ini-dist file correspond to the builtin ; defaults (that is, if no php.ini is used, or if you delete these lines, @@ -53,74 +54,82 @@ ; Language Options ; -engine = On ; Enable the PHP scripting language engine under Apache -short_open_tag = On ; allow the ? tag. otherwise, only ?php and script tags are recognized. -asp_tags = Off ; allow ASP-style % % tags -precision = 14 ; number of significant digits displayed in floating point numbers -y2k_compliance = Off ; whether to be year 2000 compliant (will cause problems with non y2k compliant browsers) -output_buffering = Off ; Output buffering allows you to send header lines (including cookies) - ; even after you send body content, in the price of slowing PHP's - ; output layer a bit. - ; You can enable output buffering by in runtime by calling the output - ; buffering functions, or enable output buffering for all files - ; by setting this directive to On. -output_handler = ; You can redirect all of the output of your scripts to a function, - ; that can be responsible to process or log it. For example, - ; if you set the output_handler to "ob_gzhandler", than output - ; will be transparently compressed for browsers that support gzip or - ; deflate encoding. Setting an output handler automatically turns on - ; output buffering. -implicit_flush = Off ; Implicit flush tells PHP to tell the output layer to flush itself - ; automatically after every output block. This is equivalent to - ; calling the PHP function flush() after each and every call to print() - ; or echo() and each and every HTML block. - ; Turning this option on has serious performance implications, and - ; is generally recommended for debugging purposes only. -allow_call_time_pass_reference = On; whether to enable the ability to force arguments to be - ; passed by reference at function-call time. This method - ; is deprecated, and is likely to be unsupported in future - ; versions of PHP/Zend. The encouraged method of specifying - ; which arguments should be passed by reference is in the - ; function declaration. You're encouraged to try and - ; turn this option Off, and make sure your scripts work - ; properly with it, to ensure they will work with future - ; versions of the language (you will receive a warning -
Re: [PHP-CVS] cvs: php4 / php.ini-dist
On Thu, Feb 01, 2001 at 06:29:41AM -, Jon Parise wrote: jon Wed Jan 31 22:29:41 2001 EDT Modified files: /php4 php.ini-dist Log: Massive reformatting. Before anyone says something, I know that I should have reformatted the php.ini-optimized file, too. I just don't have the time to finish the job right now. You have no idea how long it took to go through this one and reformat everything consistently. I'm glad it got done, though, because it's much easier to navigate this file, especially now that the comments conform to eighty column screen widths. I'd appreciate some members of the QA team reviewing this file. In a way, it's an important piece of PHP documentation in and of itself, and it really should receive a lot more attention than it has in the past. My eyes and fingers hurt, so I'm going to sleep now. =) -- Jon Parise ([EMAIL PROTECTED]) . Rochester Inst. of Technology http://www.csh.rit.edu/~jon/ : Computer Science House Member -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]
