[PHP-CVS-DAILY] cvs: php4 / NEWS
changelog Wed May 28 20:30:53 2003 EDT Modified files: /php4 NEWS Log: NEWS update Index: php4/NEWS diff -u php4/NEWS:1.1412 php4/NEWS:1.1413 --- php4/NEWS:1.1412Fri May 23 18:58:25 2003 +++ php4/NEWS Wed May 28 20:30:53 2003 @@ -1,6 +1,8 @@ PHPNEWS ||| ? ? ??? 200?, Version 5.0.0 +- fdf crash with ZTS builds fixed (see Bug #14877) +- fdf crash with ZTS builds fixed (see Bug #14877) - Moved extensions to PECL (http://pear.php.net/): (James, Tal) . ext/fribidi - Renamed stream_register_wrapper() to stream_wrapper_register(). (Derick)
[PHP-CVS] cvs: php4 /sapi/apache config.m4 /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
sniper Wed May 28 10:11:21 2003 EDT Modified files: /php4/sapi/apache config.m4 /php4/sapi/apache2filterconfig.m4 /php4/sapi/apache2handler config.m4 Log: - Fix the error message if apxs|2 is fubar. Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.70 php4/sapi/apache/config.m4:1.71 --- php4/sapi/apache/config.m4:1.70 Sun Mar 30 13:36:04 2003 +++ php4/sapi/apache/config.m4 Wed May 28 10:11:21 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.70 2003/03/30 18:36:04 sas Exp $ +dnl $Id: config.m4,v 1.71 2003/05/28 14:11:21 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -26,7 +26,7 @@ AC_MSG_RESULT([2. Apache was not compiled with DSO support (--enable-module=so);]) AC_MSG_RESULT([3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs]) AC_MSG_RESULT([The output of $APXS follows]) -$APXS +$APXS -q CFLAGS AC_MSG_ERROR([Aborting]) fi Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.31 php4/sapi/apache2filter/config.m4:1.32 --- php4/sapi/apache2filter/config.m4:1.31 Mon Apr 28 15:42:55 2003 +++ php4/sapi/apache2filter/config.m4 Wed May 28 10:11:21 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.31 2003/04/28 19:42:55 sas Exp $ +dnl $Id: config.m4,v 1.32 2003/05/28 14:11:21 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -27,7 +27,7 @@ AC_MSG_RESULT([3. Apache was not built using --enable-so (the apxs usage page is displayed)]) AC_MSG_RESULT() AC_MSG_RESULT([The output of $APXS follows:]) -$APXS +$APXS -q CFLAGS AC_MSG_ERROR([Aborting]) fi Index: php4/sapi/apache2handler/config.m4 diff -u php4/sapi/apache2handler/config.m4:1.5 php4/sapi/apache2handler/config.m4:1.6 --- php4/sapi/apache2handler/config.m4:1.5 Mon Apr 28 15:43:09 2003 +++ php4/sapi/apache2handler/config.m4 Wed May 28 10:11:21 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.5 2003/04/28 19:43:09 sas Exp $ +dnl $Id: config.m4,v 1.6 2003/05/28 14:11:21 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS) @@ -27,7 +27,7 @@ AC_MSG_RESULT([3. Apache was not built using --enable-so (the apxs usage page is displayed)]) AC_MSG_RESULT() AC_MSG_RESULT([The output of $APXS follows:]) -$APXS +$APXS -q CFLAGS AC_MSG_ERROR([Aborting]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache config.m4 /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
sniper Wed May 28 10:12:04 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/apache config.m4 /php4/sapi/apache2filterconfig.m4 /php4/sapi/apache2handler config.m4 Log: MFH Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.62.4.7 php4/sapi/apache/config.m4:1.62.4.8 --- php4/sapi/apache/config.m4:1.62.4.7 Sun Mar 30 13:36:46 2003 +++ php4/sapi/apache/config.m4 Wed May 28 10:12:04 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.62.4.7 2003/03/30 18:36:46 sas Exp $ +dnl $Id: config.m4,v 1.62.4.8 2003/05/28 14:12:04 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS) @@ -26,7 +26,7 @@ AC_MSG_RESULT([2. Apache was not compiled with DSO support (--enable-module=so);]) AC_MSG_RESULT([3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs]) AC_MSG_RESULT([The output of $APXS follows]) -$APXS +$APXS -q CFLAGS AC_MSG_ERROR([Aborting]) fi Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.25.2.5 php4/sapi/apache2filter/config.m4:1.25.2.6 --- php4/sapi/apache2filter/config.m4:1.25.2.5 Mon Apr 28 15:42:30 2003 +++ php4/sapi/apache2filter/config.m4 Wed May 28 10:12:04 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.5 2003/04/28 19:42:30 sas Exp $ +dnl $Id: config.m4,v 1.25.2.6 2003/05/28 14:12:04 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -27,7 +27,7 @@ AC_MSG_RESULT([3. Apache was not built using --enable-so (the apxs usage page is displayed)]) AC_MSG_RESULT() AC_MSG_RESULT([The output of $APXS follows:]) -$APXS +$APXS -q CFLAGS AC_MSG_ERROR([Aborting]) fi Index: php4/sapi/apache2handler/config.m4 diff -u php4/sapi/apache2handler/config.m4:1.1.2.4 php4/sapi/apache2handler/config.m4:1.1.2.5 --- php4/sapi/apache2handler/config.m4:1.1.2.4 Mon Apr 28 15:42:02 2003 +++ php4/sapi/apache2handler/config.m4 Wed May 28 10:12:04 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.1.2.4 2003/04/28 19:42:02 sas Exp $ +dnl $Id: config.m4,v 1.1.2.5 2003/05/28 14:12:04 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS) @@ -27,7 +27,7 @@ AC_MSG_RESULT([3. Apache was not built using --enable-so (the apxs usage page is displayed)]) AC_MSG_RESULT() AC_MSG_RESULT([The output of $APXS follows:]) -$APXS +$APXS -q CFLAGS AC_MSG_ERROR([Aborting]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/mysql php_mysql.c
rasmus Wed May 28 12:18:14 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/mysql php_mysql.c Log: I see no reason not to allow people to set the timeout on a mysql_connect from inside a script with ini_set(). We allow user-settable timeouts on other socket connections so having this as a system-settable only directive doesn't make much sense to me. Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.174.2.12 php4/ext/mysql/php_mysql.c:1.174.2.13 --- php4/ext/mysql/php_mysql.c:1.174.2.12 Fri May 16 15:07:57 2003 +++ php4/ext/mysql/php_mysql.c Wed May 28 12:18:14 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.174.2.12 2003/05/16 19:07:57 derick Exp $ */ +/* $Id: php_mysql.c,v 1.174.2.13 2003/05/28 16:18:14 rasmus Exp $ */ /* TODO: * @@ -315,7 +315,7 @@ STD_PHP_INI_ENTRY(mysql.default_password, NULL, PHP_INI_ALL, OnUpdateString, default_password, zend_mysql_globals, mysql_globals) PHP_INI_ENTRY(mysql.default_port, NULL, PHP_INI_ALL,OnMySQLPort) STD_PHP_INI_ENTRY(mysql.default_socket, NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysql_globals, mysql_globals) - STD_PHP_INI_ENTRY(mysql.connect_timeout, -1, PHP_INI_SYSTEM, OnUpdateInt,connect_timeout, zend_mysql_globals, mysql_globals) + STD_PHP_INI_ENTRY(mysql.connect_timeout, -1, PHP_INI_ALL, OnUpdateInt,connect_timeout,zend_mysql_globals, mysql_globals) STD_PHP_INI_BOOLEAN(mysql.trace_mode, 0,PHP_INI_ALL, OnUpdateInt,trace_mode, zend_mysql_globals, mysql_globals) PHP_INI_END() /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/sysvshm php_sysvshm.h sysvshm.c
iliaa Wed May 28 18:21:14 2003 EDT
Modified files:
/php4/ext/sysvshm php_sysvshm.h sysvshm.c
Log:
Fixed compiler warnings.
Index: php4/ext/sysvshm/php_sysvshm.h
diff -u php4/ext/sysvshm/php_sysvshm.h:1.13 php4/ext/sysvshm/php_sysvshm.h:1.14
--- php4/ext/sysvshm/php_sysvshm.h:1.13 Thu Mar 6 19:52:04 2003
+++ php4/ext/sysvshm/php_sysvshm.h Wed May 28 18:21:13 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_sysvshm.h,v 1.13 2003/03/07 00:52:04 sniper Exp $ */
+/* $Id: php_sysvshm.h,v 1.14 2003/05/28 22:21:13 iliaa Exp $ */
#ifndef PHP_SYSVSHM_H
#define PHP_SYSVSHM_H
@@ -63,10 +63,6 @@
PHP_FUNCTION(shm_put_var);
PHP_FUNCTION(shm_get_var);
PHP_FUNCTION(shm_remove_var);
-
-static int php_put_shm_data(sysvshm_chunk_head *ptr,long key,char *data, long len);
-static long php_check_shm_data(sysvshm_chunk_head *ptr, long key);
-static int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos);
extern sysvshm_module php_sysvshm;
Index: php4/ext/sysvshm/sysvshm.c
diff -u php4/ext/sysvshm/sysvshm.c:1.61 php4/ext/sysvshm/sysvshm.c:1.62
--- php4/ext/sysvshm/sysvshm.c:1.61 Thu Mar 6 19:52:04 2003
+++ php4/ext/sysvshm/sysvshm.c Wed May 28 18:21:13 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sysvshm.c,v 1.61 2003/03/07 00:52:04 sniper Exp $ */
+/* $Id: sysvshm.c,v 1.62 2003/05/28 22:21:13 iliaa Exp $ */
/* This has been built and tested on Linux 2.2.14
*
@@ -74,6 +74,10 @@
#undef shm_ptr /* undefine AIX-specific macro */
THREAD_LS sysvshm_module php_sysvshm;
+
+static int php_put_shm_data(sysvshm_chunk_head *ptr, long key, char *data, long len);
+static long php_check_shm_data(sysvshm_chunk_head *ptr, long key);
+static int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos);
/* {{{ php_release_sysvshm
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
sniper Wed May 28 21:28:14 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Added the header for 4.3.3 Index: php4/NEWS diff -u php4/NEWS:1.1247.2.215 php4/NEWS:1.1247.2.216 --- php4/NEWS:1.1247.2.215 Mon May 26 14:33:20 2003 +++ php4/NEWS Wed May 28 21:28:14 2003 @@ -1,6 +1,9 @@ PHP 4 NEWS ||| -?? May 2003, Version 4.3.2 +?? Jul 2003, Version 4.3.3 +- + +29 May 2003, Version 4.3.2 - Syncronized bundled GD library with GD 2.0.12. (Ilia) - Removed support for GDLIB version 1.x.x (php_gd.dll) on Windows. (Edin) - Enabled read-only GIF support in the bundled GDLIB (php_gd2.dll) on Windows. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sniper Wed May 28 21:34:02 2003 EDT Modified files: /php4 NEWS Log: Sync with PHP 4.3.2 NEWS Index: php4/NEWS diff -u php4/NEWS:1.1413 php4/NEWS:1.1414 --- php4/NEWS:1.1413Wed May 28 20:30:53 2003 +++ php4/NEWS Wed May 28 21:34:02 2003 @@ -1,8 +1,6 @@ PHPNEWS ||| ? ? ??? 200?, Version 5.0.0 -- fdf crash with ZTS builds fixed (see Bug #14877) -- fdf crash with ZTS builds fixed (see Bug #14877) - Moved extensions to PECL (http://pear.php.net/): (James, Tal) . ext/fribidi - Renamed stream_register_wrapper() to stream_wrapper_register(). (Derick) @@ -97,16 +95,253 @@ . imageline antialias support . imagepolygon antialias support +29 May 2003, Version 4.3.2 +- Syncronized bundled GD library with GD 2.0.12. (Ilia) +- Removed support for GDLIB version 1.x.x (php_gd.dll) on Windows. (Edin) +- Enabled read-only GIF support in the bundled GDLIB (php_gd2.dll) on Windows. + (Sebastian, Edin) +- Improved dba extension (Marcus) + . Added support for internal error handling of Berkeley db libraries. + . Disallowed Berkeley db versions 4.1.0 to 4.1.24 due to locking problems. + . Disallowed linkage of Berkeley db submodules against libraries with +different major versions. + . Disallowed configuring of more than one Berkeley db handler. + . Reenabled dba_popen() with new persistent STDIO streams. +- Added a new Apache 2.0 SAPI module (sapi/apache2handler) based on the old + version (sapi/apache2filter). (Ian Holsman, Justin Erenkrantz) +- Added disable_classes php.ini option to allow administrators to disable + certain classes for security reasons. (Harald) +- Added man page for CLI version of PHP. (Marcus) +- Added --clean option into phpize. (Jani) +- Added --ldflags option into php-config. (Jani) +- Added imagesavealpha() and imageistruecolor() functions. (Pierre) +- Added XBM support for bundled GD library. (Marcus) +- Added session_regenerate_id() function. (Sascha) +- Added zlib_get_coding_type() function which returns the coding type used for + output compression. (Moriyoshi) +- Added OCIPasswordChange() which allows renewing expired Oracle users. (Maxim) +- Added memory_get_usage(). Only available when PHP is configured with + --enable-memory-limit. (Andrey) +- Added improved JPEG 2000 support for getimagesize(). (Marcus, Adam Wright) +- Added XBM and WBMP support for getimagesize(). (Marcus) +- Added KOI8-R, CP866, and CP1251 support for htmlentities(). + (Antony Dovgal, Moriyoshi) +- Added domdocument-free() to free XML-documents from memory. (Rob Richards) +- Fixed a bug in error reporting with the CLI for start-up errors. (Derick) +- Fixed spurious fsync calls during socket communication. (Sascha) +- Fixed a possible vhost issue in thttpd. (Sascha, [EMAIL PROTECTED]) +- Fixed including from HTTP URLs. (Sascha) +- Fixed a lot of memory leaks in domxml. (Rob Richards, Chregu) +- Fixed a bug in GD's truecolor TTF handling. (Derick) +- Fixed several 64-bit problems. (Dave) +- Fixed several errors in hwapi extension. Objects weren't handled properly. + (Uwe) +- Fixed bug #23788 (str|preg_replace() clobber the array elements). (Ilia) +- Fixed bug #23765 (file uploads ignored due to case sensitivity). (Sara) +- Fixed bug #23738 (ifx_copy_blob() crash). (Jani) +- Fixed bug #23661 (mysql_fetch_array() gives no warning when an invalid + argument was passed as result_type). (Derick) +- Fixed bug #23619 (set_error_handler() registered handler not called for + object instances). (Jani, [EMAIL PROTECTED]) +- Fixed bug #23606 (Unable to build --with-db4 (db4.1.25)). (Marcus) +- Fixed bug #23567 (pfsockopen() returns dead connections). (Wez) +- Fixed bug #23539 (curl_exec() produces strange results). ([EMAIL PROTECTED]) +- Fixed bug #23527 (PostScript Type 1 fonts do not render properly). + ([EMAIL PROTECTED], Ilia) +- Fixed bug #23402 (crash with improper use of mssql_bind()). (Frank) +- Fixed bug #23371 (configure falsely detects c-client using SSL). (Jani) +- Fixed bug #23340 (fopen on multiple URLs causes memory corruption). (Wez) +- Fixed bug #23298 (serialize cuts off floats doubles). (Ilia, Marcus) +- Fixed bug #23232 (safe_mode does not honor PHP_AUTH_* in apache2). (Ilia) +- Fixed bug #23225 (money_format() didn't handle erroneous return of strfmon). + (Ilia, [EMAIL PROTECTED]) +- Fixed bug #23201 (set_file_buffer() crashes with stdio streams). (Ilia) +- Fixed Bug #23188 (CDB databases created with 'c' mode do not work). (Marcus) +- Fixed bug #23187 (memory leaks in sybase_connect/sybase_pconnect). (Ilia) +- Fixed bug #23162 (user_error() crashs if error message 1024 bytes). + (Jay, Marcus, Moriyoshi) +- Fixed bug #23152 ($http_response_header empty on invalid URLs). (Ilia) +- Fixed bug #23102 (integer overflow in exif_iif_add_value()). (Ilia) +- Fixed bug #23099
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/nsapi nsapi.c
thetaphiThu May 29 08:27:39 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/nsapinsapi.c
Log:
MFH: php.ini values in magnus/obj.conf; virtual() similar to apache;...
Index: php4/sapi/nsapi/nsapi.c
diff -u php4/sapi/nsapi/nsapi.c:1.28.2.7 php4/sapi/nsapi/nsapi.c:1.28.2.8
--- php4/sapi/nsapi/nsapi.c:1.28.2.7Wed May 21 05:34:15 2003
+++ php4/sapi/nsapi/nsapi.c Thu May 29 08:27:39 2003
@@ -17,13 +17,17 @@
+--+
*/
-/* $Id: nsapi.c,v 1.28.2.7 2003/05/21 09:34:15 zeev Exp $ */
+/* $Id: nsapi.c,v 1.28.2.8 2003/05/29 12:27:39 thetaphi Exp $ */
/*
* PHP includes
*/
#define NSAPI 1
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
+
#include php.h
#include php_variables.h
#include ext/standard/info.h
@@ -34,6 +38,12 @@
#include php_version.h
#include TSRM.h
#include ext/standard/php_standard.h
+#include sys/types.h
+#include sys/stat.h
+
+#ifndef RTLD_DEFAULT
+#define RTLD_DEFAULT NULL
+#endif
/*
* If neither XP_UNIX not XP_WIN32 is defined use PHP_WIN32
@@ -57,11 +67,6 @@
#include base/util.h /* is_mozilla, getline */
#include frame/log.h /* log_error */
-/*
- * Timeout for net_read(). This should probably go into php.ini
- */
-#define NSAPI_READ_TIMEOUT 60 /* 60 seconds */
-
#define NSLS_D struct nsapi_request_context *request_context
#define NSLS_DC, NSLS_D
#define NSLS_C request_context
@@ -144,6 +149,221 @@
}
}
+
+/***/
+/* PHP module part */
+/***/
+
+PHP_MINIT_FUNCTION(nsapi);
+PHP_MSHUTDOWN_FUNCTION(nsapi);
+PHP_RINIT_FUNCTION(nsapi);
+PHP_RSHUTDOWN_FUNCTION(nsapi);
+PHP_MINFO_FUNCTION(nsapi);
+
+PHP_FUNCTION(virtual);
+
+ZEND_BEGIN_MODULE_GLOBALS(nsapi)
+ long read_timeout;
+ZEND_END_MODULE_GLOBALS(nsapi)
+
+ZEND_DECLARE_MODULE_GLOBALS(nsapi)
+
+#define NSAPI_G(v) TSRMG(nsapi_globals_id, zend_nsapi_globals *, v)
+
+/* compatibility with PHP4_3 */
+#if !defined(OnUpdateLong)
+#define OnUpdateLong OnUpdateInt
+#endif
+
+/* {{{ nsapi_functions[]
+ *
+ * Every user visible function must have an entry in nsapi_functions[].
+ */
+function_entry nsapi_functions[] = {
+ PHP_FE(virtual, NULL) /* Make subrequest */
+ {NULL, NULL, NULL} /* Must be the last line in nsapi_functions[] */
+};
+/* }}} */
+
+/* {{{ nsapi_module_entry
+ */
+zend_module_entry nsapi_module_entry = {
+ STANDARD_MODULE_HEADER,
+ nsapi,
+ nsapi_functions,
+ PHP_MINIT(nsapi),
+ PHP_MSHUTDOWN(nsapi),
+ NULL,
+ NULL,
+ PHP_MINFO(nsapi),
+ NO_VERSION_YET,
+ STANDARD_MODULE_PROPERTIES
+};
+/* }}} */
+
+/* {{{ PHP_INI
+ */
+PHP_INI_BEGIN()
+STD_PHP_INI_ENTRY(nsapi.read_timeout, 60, PHP_INI_ALL, OnUpdateLong,
read_timeout, zend_nsapi_globals, nsapi_globals)
+PHP_INI_END()
+/* }}} */
+
+/* newer servers hide this functions from the programmer so redefine the functions
dynamically
+ thanks to Chris Elving from Sun for the function declarations */
+
+int (NSAPI_PUBLIC *nsapi_servact_uri2path)(Session *, Request *) = NULL;
+int (NSAPI_PUBLIC *nsapi_servact_pathchecks)(Session *, Request *) = NULL;
+int (NSAPI_PUBLIC *nsapi_servact_fileinfo)(Session *, Request *) = NULL;
+int (NSAPI_PUBLIC *nsapi_servact_service)(Session *, Request *) = NULL;
+
+/* {{{ php_nsapi_init_dynamic_symbols
+ */
+static void php_nsapi_init_dynamic_symbols(void)
+{
+#if defined(servact_uri2path) defined(servact_pathchecks)
defined(servact_fileinfo) defined(servact_service)
+ /* use functions from nsapi.h if available */
+ nsapi_servact_uri2path = servact_uri2path;
+ nsapi_servact_pathchecks = servact_pathchecks;
+ nsapi_servact_fileinfo = servact_fileinfo;
+ nsapi_servact_service = servact_service;
+#elif !defined(PHP_WIN32)
+ /* find address of internal NSAPI functions */
+ *(void **)(nsapi_servact_uri2path) = DL_FETCH_SYMBOL(RTLD_DEFAULT,
INTservact_uri2path);
+ *(void **)(nsapi_servact_pathchecks) = DL_FETCH_SYMBOL(RTLD_DEFAULT,
INTservact_pathchecks);
+ *(void **)(nsapi_servact_fileinfo) = DL_FETCH_SYMBOL(RTLD_DEFAULT,
INTservact_fileinfo);
+ *(void **)(nsapi_servact_service) = DL_FETCH_SYMBOL(RTLD_DEFAULT,
INTservact_service);
+ if (!(nsapi_servact_uri2path nsapi_servact_pathchecks
nsapi_servact_fileinfo nsapi_servact_service)) {
+ /* not found - could be cause they are undocumented */
+ nsapi_servact_uri2path = NULL;
+ nsapi_servact_pathchecks = NULL;
+ nsapi_servact_fileinfo = NULL;
+ nsapi_servact_service = NULL;
+ }
+#endif
+}
+/* }}} */
+
+/* {{{ php_nsapi_init_globals
+ */
+static void php_nsapi_init_globals(zend_nsapi_globals *nsapi_globals)
+{
+ nsapi_globals-read_timeout = 60;
+}
+/* }}} */
+
+/* {{{ PHP_MINIT_FUNCTION
+ */
+PHP_MINIT_FUNCTION(nsapi)
+{
+
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/nsapi nsapi-readme.txt
thetaphiThu May 29 08:29:50 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/nsapinsapi-readme.txt Log: MFH. Index: php4/sapi/nsapi/nsapi-readme.txt diff -u php4/sapi/nsapi/nsapi-readme.txt:1.3.8.1 php4/sapi/nsapi/nsapi-readme.txt:1.3.8.2 --- php4/sapi/nsapi/nsapi-readme.txt:1.3.8.1Sun Mar 9 07:08:36 2003 +++ php4/sapi/nsapi/nsapi-readme.txtThu May 29 08:29:50 2003 @@ -32,10 +32,10 @@ Windows: c:\path\to\PHP4\nsapiPHP4.dll -Note! Place following two lines after mime.types init: +Note! Place following two lines after mime.types init ([] means optional): Init fn=load-modules funcs=php4_init,php4_close,php4_execute,php4_auth_trans shlib=/php4/nsapiPHP4.dll -Init fn=php4_init errorString=Failed to initialize PHP! +Init fn=php4_init errorString=Failed to initialize PHP! [php_ini=/path/to/php.ini] Object name=default . @@ -43,8 +43,10 @@ . # NOTE this next line should happen after all 'ObjectType' and before # all 'AddLog' lines +# You can modify some entries in php.ini request specific by adding it to the Service +# directive, e.g. doc_root=/path -Service fn=php4_execute type=magnus-internal/x-httpd-php +Service fn=php4_execute type=magnus-internal/x-httpd-php [inikey=value ...] . . /Object -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba config.m4
helly Thu May 29 08:33:19 2003 EDT Modified files: /php4/ext/dba config.m4 Log: MFB (these parts were missing) Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.50 php4/ext/dba/config.m4:1.51 --- php4/ext/dba/config.m4:1.50 Tue May 20 20:14:16 2003 +++ php4/ext/dba/config.m4 Thu May 29 08:33:19 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.50 2003/05/21 00:14:16 helly Exp $ +dnl $Id: config.m4,v 1.51 2003/05/29 12:33:19 helly Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -140,7 +140,7 @@ AC_TRY_LINK([ #include $THIS_INCLUDE ],[ - (void)db_create((DB**)0, (DB_ENV*)0, 0); + $3; ],[ AC_EGREP_CPP(yes,[ #include $THIS_INCLUDE @@ -329,8 +329,10 @@ fi AC_DEFINE(DBA_DBM,1,[ ]) THIS_LIBS=$LIB -break ]) + if test -n $THIS_LIBS; then +break + fi ]) done fi @@ -352,7 +354,7 @@ AC_ARG_WITH(cdb, [ --with-cdb[=DIR] DBA: Include CDB support],[ - if test $withval = yes; then + if test $withval = yes -o $HAVE_DBA = 1; then PHP_DBA_BUILTIN_CDB elif test $withval != no; then PHP_DBA_STD_BEGIN -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc php_odbc.c
kalowskyThu May 29 08:34:38 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/odbc php_odbc.c
Log:
ODBC standards compliance is a good thing.
# Should be MFB'd, but my PHP5 is drastically different right now..
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.143.2.9 php4/ext/odbc/php_odbc.c:1.143.2.10
--- php4/ext/odbc/php_odbc.c:1.143.2.9 Thu May 1 20:40:35 2003
+++ php4/ext/odbc/php_odbc.cThu May 29 08:34:38 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_odbc.c,v 1.143.2.9 2003/05/02 00:40:35 sniper Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.10 2003/05/29 12:34:38 kalowsky Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2113,7 +2113,7 @@
* #ifdef HAVE_EMPRESS */
{
int direct = 0;
- chardsnbuf[300];
+ chardsnbuf[1024];
short dsnbuflen;
char*ldb = 0;
int ldb_len = 0;
@@ -2131,7 +2131,7 @@
}
if (direct)
- rc = SQLDriverConnect((*conn)-hdbc, NULL, ldb, strlen(ldb),
dsnbuf, 300,
+ rc = SQLDriverConnect((*conn)-hdbc, NULL, ldb, strlen(ldb),
dsnbuf, sizeof(dsnbuf),
dsnbuflen,
SQL_DRIVER_NOPROMPT);
else
rc = SQLConnect((*conn)-hdbc, db, SQL_NTS, uid, SQL_NTS, pwd,
SQL_NTS);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: spl / spl_functions.c
On Tue, 27 May 2003, Marcus Boerger wrote: helly Mon May 26 20:14:04 2003 EDT Modified files: /spl spl_functions.c Log: For now that works. # However some of the register stuff must be moved to the engine. # And inside the engine some fixes are needed, too. Marcus, How long before you copy the entire Zend engine into spl*.c? -Andrei -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
