Re: [PHP-CVS] cvs: php4 /ext/iconv/tests translit-failure.phpt
Thanks!
Moriyoshi Koizumi
"Jani Taskinen" <[EMAIL PROTECTED]> wrote:
> sniperMon Oct 14 19:09:48 2002 EDT
>
> Modified files:
> /php4/ext/iconv/tests translit-failure.phpt
> Log:
> This test should not print out the error (which is correct).
>
>
> Index: php4/ext/iconv/tests/translit-failure.phpt
> diff -u php4/ext/iconv/tests/translit-failure.phpt:1.4
>php4/ext/iconv/tests/translit-failure.phpt:1.5
> --- php4/ext/iconv/tests/translit-failure.phpt:1.4Fri Oct 11 14:07:47 2002
> +++ php4/ext/iconv/tests/translit-failure.phptMon Oct 14 19:09:48 2002
> @@ -21,8 +21,10 @@
> */
>
> $test = ' rit par %s.';
> -if (!iconv("ISO-8859-1", "ASCII//TRANSLIT", $test))
> +
> +if (!@iconv("ISO-8859-1", "ASCII//TRANSLIT", $test)) {
> echo 'wrong is right';
> +}
> ?>
> --EXPECT--
> wrong is right
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/exif/tests 002.phpt
derick Tue Oct 15 02:37:06 2002 EDT Modified files: /php4/ext/exif/tests002.phpt Log: - Staying consistent with other tests Index: php4/ext/exif/tests/002.phpt diff -u php4/ext/exif/tests/002.phpt:1.4 php4/ext/exif/tests/002.phpt:1.5 --- php4/ext/exif/tests/002.phpt:1.4Mon Oct 14 20:35:05 2002 +++ php4/ext/exif/tests/002.phptTue Oct 15 02:37:05 2002 @@ -4,8 +4,8 @@ --INI-- magic_quotes_runtime=0 -output_handler = -zlib.output_compression = Off +output_handler= +zlib.output_compression=0 --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/zlib zlib_fopen_wrapper.c
wez Mon Oct 14 22:27:15 2002 EDT
Modified files:
/php4/ext/zlib zlib_fopen_wrapper.c
Log:
Don't use streams-level buffer on zlib streams.
Index: php4/ext/zlib/zlib_fopen_wrapper.c
diff -u php4/ext/zlib/zlib_fopen_wrapper.c:1.31 php4/ext/zlib/zlib_fopen_wrapper.c:1.32
--- php4/ext/zlib/zlib_fopen_wrapper.c:1.31 Sat Oct 5 06:35:13 2002
+++ php4/ext/zlib/zlib_fopen_wrapper.c Mon Oct 14 22:27:15 2002
@@ -16,7 +16,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: zlib_fopen_wrapper.c,v 1.31 2002/10/05 10:35:13 wez Exp $ */
+/* $Id: zlib_fopen_wrapper.c,v 1.32 2002/10/15 02:27:15 wez Exp $ */
#define IS_EXT_MODULE
#define _GNU_SOURCE
@@ -111,8 +111,10 @@
self->gz_file = gzdopen(fd, mode);
if (self->gz_file) {
stream = php_stream_alloc_rel(&php_stream_gzio_ops,
self, 0, mode);
- if (stream)
+ if (stream) {
+ stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
return stream;
+ }
gzclose(self->gz_file);
}
if (options & REPORT_ERRORS)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main user_streams.c
iliaa Mon Oct 14 22:05:28 2002 EDT
Modified files:
/php4/main user_streams.c
Log:
Fixed possible memory leaks.
Index: php4/main/user_streams.c
diff -u php4/main/user_streams.c:1.28 php4/main/user_streams.c:1.29
--- php4/main/user_streams.c:1.28 Mon Oct 14 21:57:19 2002
+++ php4/main/user_streams.cMon Oct 14 22:05:27 2002
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: user_streams.c,v 1.28 2002/10/15 01:57:19 wez Exp $ */
+/* $Id: user_streams.c,v 1.29 2002/10/15 02:05:27 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -586,6 +586,10 @@
/* stream_seek is not implemented, so disable seeks for this stream */
stream->flags |= PHP_STREAM_FLAG_NO_SEEK;
/* there should be no retval to clean up */
+
+ if (retval)
+ zval_ptr_dtor(&retval);
+
return -1;
} else if (call_result == SUCCESS && retval != NULL && zval_is_true(retval)) {
ret = 0;
@@ -681,6 +685,10 @@
us->wrapper->classname);
}
}
+
+ if (retval)
+ zval_ptr_dtor(&retval);
+
return ret;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main user_streams.c
wez Mon Oct 14 21:57:19 2002 EDT
Modified files:
/php4/main user_streams.c
Log:
Fix leak, and avoid initialization problems where retval is re-used
within a function.
Index: php4/main/user_streams.c
diff -u php4/main/user_streams.c:1.27 php4/main/user_streams.c:1.28
--- php4/main/user_streams.c:1.27 Sun Oct 13 20:16:02 2002
+++ php4/main/user_streams.cMon Oct 14 21:57:19 2002
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: user_streams.c,v 1.27 2002/10/14 00:16:02 wez Exp $ */
+/* $Id: user_streams.c,v 1.28 2002/10/15 01:57:19 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -464,8 +464,10 @@
}
zval_ptr_dtor(&zcount);
- if (retval)
+ if (retval) {
zval_ptr_dtor(&retval);
+ retval = NULL;
+ }
/* since the user stream has no way of setting the eof flag directly, we need
to ask it if we hit eof */
@@ -487,6 +489,11 @@
stream->eof = 1;
}
+ if (retval) {
+ zval_ptr_dtor(&retval);
+ retval = NULL;
+ }
+
return didread;
}
@@ -586,8 +593,10 @@
ret = -1;
}
- if (retval)
+ if (retval) {
zval_ptr_dtor(&retval);
+ retval = NULL;
+ }
/* now determine where we are */
ZVAL_STRINGL(&func_name, USERSTREAM_TELL, sizeof(USERSTREAM_TELL)-1, 0);
@@ -603,10 +612,10 @@
else
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_TELL "
is not implemented!",
us->wrapper->classname);
-
+
if (retval)
zval_ptr_dtor(&retval);
-
+
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sniper Mon Oct 14 21:16:46 2002 EDT
Modified files:
/php4 NEWS
Log:
Try keep those moved/removed exts entry at top.
Index: php4/NEWS
diff -u php4/NEWS:1.1206 php4/NEWS:1.1207
--- php4/NEWS:1.1206Mon Oct 14 20:46:51 2002
+++ php4/NEWS Mon Oct 14 21:16:45 2002
@@ -1,13 +1,6 @@
PHP 4 NEWS
|||
? ? ??? 2002, Version 4.3.0
-- fgets($fp) (with no length parameter) now uses a buffer as long as the
- the next line available from the $fp. Previously, there was a 1KB limit.
- (Wez)
-- Changed registry entries under "HKLM\SOFTWARE\PHP\Per Directory Values" to
- work also with administrative directives such as safe_mode, open_basedir,
- etc. (Claudio Felber)
-- Added PGSQL_CONNECT_FORCE_NEW option to pg_connect() (Yasuo)
- ATTENTION! "make install" will *by default* install the CLI SAPI binary in
{PREFIX}/bin/php. If you don't disable the CGI binary, it will be
installed as {PREFIX}/bin/php-cgi.
@@ -18,6 +11,12 @@
. ext/icap
. sapi/fhttpd
- Moved ext/vpopmail to PECL. (James)
+- Fixed fgets($fp) to read until line-end when length parameter is not used.
+ (Wez)
+- Changed registry entries under "HKLM\SOFTWARE\PHP\Per Directory Values" to
+ work also with administrative directives such as safe_mode, open_basedir,
+ etc. (Claudio Felber)
+- Added PGSQL_CONNECT_FORCE_NEW option to pg_connect() (Yasuo)
- Added ICONV_IMPL and ICONV_VERSION constants to iconv extension to
indicate which iconv implementation is used. (Moriyoshi)
- Fixed bug #17580 (Allow ini parser to parse files >16K). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
iliaa Mon Oct 14 20:46:53 2002 EDT Modified files: /php4 NEWS Log: Bug fixing news entries. Index: php4/NEWS diff -u php4/NEWS:1.1205 php4/NEWS:1.1206 --- php4/NEWS:1.1205Mon Oct 14 20:36:04 2002 +++ php4/NEWS Mon Oct 14 20:46:51 2002 @@ -20,6 +20,8 @@ - Moved ext/vpopmail to PECL. (James) - Added ICONV_IMPL and ICONV_VERSION constants to iconv extension to indicate which iconv implementation is used. (Moriyoshi) +- Fixed bug #17580 (Allow ini parser to parse files >16K). (Ilia) +- Fixed bug #19649 (Sanity checks for browscap.ini parser). (Ilia) - Added experimental patch to address problem with floats on various locales. (Bug #17079). (Ilia) - Fixed bug #19280 (imap_header fails with many To: addresses). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/snmp config.m4 snmp.c
sniper Mon Oct 14 20:43:34 2002 EDT
Modified files:
/php4/ext/snmp config.m4 snmp.c
Log:
Make this thing to compile with net-snmp-5.0.x
Index: php4/ext/snmp/config.m4
diff -u php4/ext/snmp/config.m4:1.26 php4/ext/snmp/config.m4:1.27
--- php4/ext/snmp/config.m4:1.26Sat Jun 1 16:14:58 2002
+++ php4/ext/snmp/config.m4 Mon Oct 14 20:43:34 2002
@@ -1,11 +1,38 @@
dnl
-dnl $Id: config.m4,v 1.26 2002/06/01 20:14:58 sr Exp $
+dnl $Id: config.m4,v 1.27 2002/10/15 00:43:34 sniper Exp $
dnl
PHP_ARG_WITH(snmp,for SNMP support,
[ --with-snmp[=DIR] Include SNMP support.])
- if test "$PHP_SNMP" != "no"; then
+if test "$PHP_SNMP" != "no"; then
+
+ dnl
+ dnl Try net-snmp first
+ dnl
+ if test "$PHP_SNMP" = "yes"; then
+AC_PATH_PROG(SNMP_CONFIG,net-snmp-config,,[/usr/local/bin:$PATH])
+ else
+SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config"
+ fi
+
+ if test -x "$SNMP_CONFIG"; then
+SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs`
+SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`"
+SNMP_PREFIX=`$SNMP_CONFIG --prefix`
+
+if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
+ PHP_ADD_INCLUDE(${SNMP_PREFIX}/include)
+ PHP_EVAL_LIBLINE($SNMP_LIBS, SNMP_SHARED_LIBADD)
+ AC_DEFINE(HAVE_NET_SNMP,1,[ ])
+else
+ AC_MSG_ERROR([Could not find the required paths. Please check your net-snmp
+installation.])
+fi
+ else
+
+dnl
+dnl Try ucd-snmp if net-snmp test failed
+dnl
if test "$PHP_SNMP" = "yes"; then
for i in /usr/include /usr/local/include; do
@@ -60,14 +87,14 @@
fi
AC_CHECK_LIB(kstat, kstat_read, [ PHP_ADD_LIBRARY(kstat,,SNMP_SHARED_LIBADD) ])
-
-AC_DEFINE(HAVE_SNMP,1,[ ])
PHP_ADD_INCLUDE($SNMP_INCDIR)
PHP_ADD_LIBRARY_WITH_PATH(snmp, $SNMP_LIBDIR, SNMP_SHARED_LIBADD)
-
-PHP_NEW_EXTENSION(snmp, snmp.c, $ext_shared)
-PHP_SUBST(SNMP_SHARED_LIBADD)
fi
+
+ PHP_NEW_EXTENSION(snmp, snmp.c, $ext_shared)
+ PHP_SUBST(SNMP_SHARED_LIBADD)
+ AC_DEFINE(HAVE_SNMP,1,[ ])
+fi
AC_MSG_CHECKING(whether to enable UCD SNMP hack)
Index: php4/ext/snmp/snmp.c
diff -u php4/ext/snmp/snmp.c:1.61 php4/ext/snmp/snmp.c:1.62
--- php4/ext/snmp/snmp.c:1.61 Sun Oct 13 22:46:52 2002
+++ php4/ext/snmp/snmp.cMon Oct 14 20:43:34 2002
@@ -17,7 +17,7 @@
| Steven Lawrance <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: snmp.c,v 1.61 2002/10/14 02:46:52 sniper Exp $ */
+/* $Id: snmp.c,v 1.62 2002/10/15 00:43:34 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -26,6 +26,9 @@
#include "php.h"
#include "ext/standard/info.h"
#include "php_snmp.h"
+
+#if HAVE_SNMP
+
#include
#ifdef PHP_WIN32
#include
@@ -60,7 +63,6 @@
#ifdef HAVE_UNISTD_H
#include
#endif
-#if HAVE_SNMP
#ifndef __P
#ifdef __GNUC__
@@ -70,6 +72,11 @@
#endif
#endif
+#ifdef HAVE_NET_SNMP
+#include
+#include
+#define VersionInfo NetSnmpVersionInfo
+#else
#ifdef HAVE_DEFAULT_STORE_H
#include "default_store.h"
#endif
@@ -81,6 +88,7 @@
#include "parse.h"
#include "mib.h"
#include "version.h"
+#endif
/* ucd-snmp 3.3.1 changed the name of a few #defines... They've been changed back to
the original ones in 3.5.3! */
#ifndef SNMP_MSG_GET
@@ -329,7 +337,11 @@
}
if (st != 11) {
- sprint_value((struct sbuf
*)buf,vars->name, vars->name_length, vars);
+#ifdef HAVE_NET_SNMP
+ snprint_value(buf, strlen(buf),
+vars->name, vars->name_length, vars);
+#else
+ sprint_value((struct sbuf *)
+buf,vars->name, vars->name_length, vars);
+#endif
}
if (st == 1) {
@@ -337,7 +349,11 @@
} else if (st == 2) {
add_next_index_string(return_value,buf,1); /* Add to returned array */
} else if (st == 3) {
+#ifdef HAVE_NET_SNMP
+ snprint_objid(buf2, strlen(buf2),
+vars->name, vars->name_length);
+#else
sprint_objid((struct sbuf *)buf2,
vars->name, vars->name_length);
+#endif
add_assoc_string(return_value,buf2,buf,1);
}
if (st >= 2 && st != 11) {
@@ -356,7 +372,11 @@
for (count=1, vars =
response->variables; vars && count != response->errindex;
vars = vars->next_variable, count++);
if (vars) {
+#ifdef HAVE_NET_SNMP
+
[PHP-CVS] cvs: php4 /ext/exif/tests 002.phpt
helly Mon Oct 14 20:35:06 2002 EDT Modified files: /php4/ext/exif/tests002.phpt Log: remove ob_end_clean() and instead use ini section #Derick you're right this was no good idea. I just left it over after testing #the test. Index: php4/ext/exif/tests/002.phpt diff -u php4/ext/exif/tests/002.phpt:1.3 php4/ext/exif/tests/002.phpt:1.4 --- php4/ext/exif/tests/002.phpt:1.3Sun Aug 25 14:48:46 2002 +++ php4/ext/exif/tests/002.phptMon Oct 14 20:35:05 2002 @@ -4,6 +4,8 @@ --INI-- magic_quotes_runtime=0 +output_handler = +zlib.output_compression = Off --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/iconv/tests translit-failure.phpt
sniper Mon Oct 14 19:09:48 2002 EDT
Modified files:
/php4/ext/iconv/tests translit-failure.phpt
Log:
This test should not print out the error (which is correct).
Index: php4/ext/iconv/tests/translit-failure.phpt
diff -u php4/ext/iconv/tests/translit-failure.phpt:1.4
php4/ext/iconv/tests/translit-failure.phpt:1.5
--- php4/ext/iconv/tests/translit-failure.phpt:1.4 Fri Oct 11 14:07:47 2002
+++ php4/ext/iconv/tests/translit-failure.phpt Mon Oct 14 19:09:48 2002
@@ -21,8 +21,10 @@
*/
$test = 'Écrit par %s.';
-if (!iconv("ISO-8859-1", "ASCII//TRANSLIT", $test))
+
+if (!@iconv("ISO-8859-1", "ASCII//TRANSLIT", $test)) {
echo 'wrong is right';
+}
?>
--EXPECT--
wrong is right
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/embed config.m4
edink Mon Oct 14 18:18:36 2002 EDT Modified files: /php4/sapi/embedconfig.m4 Log: Respect INSTALL_ROOT var. Thanks to Jani for catching this one. Index: php4/sapi/embed/config.m4 diff -u php4/sapi/embed/config.m4:1.6 php4/sapi/embed/config.m4:1.7 --- php4/sapi/embed/config.m4:1.6 Mon Oct 14 05:05:28 2002 +++ php4/sapi/embed/config.m4 Mon Oct 14 18:18:35 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.6 2002/10/14 09:05:28 edink Exp $ +dnl $Id: config.m4,v 1.7 2002/10/14 22:18:35 edink Exp $ dnl AC_MSG_CHECKING(for embedded SAPI library support) @@ -11,11 +11,11 @@ case $enableval in yes|shared) PHP_EMBED_TYPE=shared - INSTALL_IT="\$(mkinstalldirs) \$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(prefix)/lib" + INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m +0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" ;; static) PHP_EMBED_TYPE=static - INSTALL_IT="\$(mkinstalldirs) \$(prefix)/lib; \$(INSTALL) -m 0644 $SAPI_STATIC \$(prefix)/lib" + INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m +0644 $SAPI_STATIC \$(INSTALL_ROOT)\$(prefix)/lib" ;; *) PHP_EMBED_TYPE=no -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard browscap.c
iliaa Mon Oct 14 14:13:18 2002 EDT
Modified files:
/php4/ext/standard browscap.c
Log:
Fixed bug #19649.
Index: php4/ext/standard/browscap.c
diff -u php4/ext/standard/browscap.c:1.59 php4/ext/standard/browscap.c:1.60
--- php4/ext/standard/browscap.c:1.59 Fri Aug 23 21:19:27 2002
+++ php4/ext/standard/browscap.cMon Oct 14 14:13:18 2002
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: browscap.c,v 1.59 2002/08/24 01:19:27 helly Exp $ */
+/* $Id: browscap.c,v 1.60 2002/10/14 18:13:18 iliaa Exp $ */
#include "php.h"
#include "php_regex.h"
@@ -88,9 +88,13 @@
*/
static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type, void
*arg)
{
+ if (!arg1) {
+ return;
+ }
+
switch (callback_type) {
case ZEND_INI_PARSER_ENTRY:
- if (current_section) {
+ if (current_section && arg2) {
zval *new_property;
char *new_key;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard/tests/general_functions 001.phpt
iliaa Mon Oct 14 12:31:56 2002 EDT
Modified files:
/php4/ext/standard/tests/general_functions 001.phpt
Log:
Added float printing tests.
Index: php4/ext/standard/tests/general_functions/001.phpt
diff -u php4/ext/standard/tests/general_functions/001.phpt:1.1
php4/ext/standard/tests/general_functions/001.phpt:1.2
--- php4/ext/standard/tests/general_functions/001.phpt:1.1 Sun Aug 27 15:45:58
2000
+++ php4/ext/standard/tests/general_functions/001.phpt Mon Oct 14 12:31:56 2002
@@ -46,6 +46,8 @@
echo("failed!\n");
}
+echo sprintf("%.2f\n", "99.00");
+echo sprintf("%.2f\n", 99.00);
?>
--EXPECT--
sprintf string truncate test: passed
@@ -53,3 +55,5 @@
sprintf octal and hex test: passed
sprintf octal binary test: passed
sprintf float test: passed
+99.00
+99.00
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main php_network.h
sebastian Mon Oct 14 12:14:18 2002 EDT Modified files: /php4/main php_network.h Log: Revert to 1.34. Index: php4/main/php_network.h diff -u php4/main/php_network.h:1.35 php4/main/php_network.h:1.36 --- php4/main/php_network.h:1.35Mon Oct 14 01:56:03 2002 +++ php4/main/php_network.h Mon Oct 14 12:14:18 2002 @@ -15,21 +15,21 @@ | Author: Stig Venaas <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_network.h,v 1.35 2002/10/14 05:56:03 sebastian Exp $ */ +/* $Id: php_network.h,v 1.36 2002/10/14 16:14:18 sebastian Exp $ */ #ifndef _PHP_NETWORK_H #define _PHP_NETWORK_H #ifdef PHP_WIN32 -#ifndef WINNT -#define WINNT 1 -#endif -#undef FD_SETSIZE -#include "arpa/inet.h" -#define socklen_t unsigned int +# ifndef WINNT +# define WINNT 1 +# endif +# undef FD_SETSIZE +# include "arpa/inet.h" +# define socklen_t unsigned int #else -#undef closesocket -#define closesocket close +# undef closesocket +# define closesocket close #endif #ifndef HAVE_SHUTDOWN @@ -55,7 +55,7 @@ PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize); #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_SYS_SOCKET_H @@ -65,9 +65,9 @@ /* These are here, rather than with the win32 counterparts above, * since defines them. */ #ifndef SHUT_RD -#define SHUT_RD 0 -#define SHUT_WR 1 -#define SHUT_RDWR 2 +# define SHUT_RD 0 +# define SHUT_WR 1 +# define SHUT_RDWR 2 #endif #ifdef HAVE_SYS_TIME_H @@ -83,13 +83,13 @@ #endif #ifdef PHP_WIN32 -#define SOCK_ERR INVALID_SOCKET -#define SOCK_CONN_ERR SOCKET_ERROR -#define SOCK_RECV_ERR SOCKET_ERROR +# define SOCK_ERR INVALID_SOCKET +# define SOCK_CONN_ERR SOCKET_ERROR +# define SOCK_RECV_ERR SOCKET_ERROR #else -#define SOCK_ERR -1 -#define SOCK_CONN_ERR -1 -#define SOCK_RECV_ERR -1 +# define SOCK_ERR -1 +# define SOCK_CONN_ERR -1 +# define SOCK_RECV_ERR -1 #endif #define PHP_SOCK_CHUNK_SIZE8192 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard formatted_print.c
iliaa Mon Oct 14 12:03:17 2002 EDT Modified files: /php4/ext/standard formatted_print.c Log: Fixed a bug (introduced in previous patch) that caused non-double values to be converted to 0 by printf/sprint functions when %f format is specified. Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.55 php4/ext/standard/formatted_print.c:1.56 --- php4/ext/standard/formatted_print.c:1.55Fri Oct 11 00:44:14 2002 +++ php4/ext/standard/formatted_print.c Mon Oct 14 12:03:16 2002 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: formatted_print.c,v 1.55 2002/10/11 04:44:14 sebastian Exp $ */ +/* $Id: formatted_print.c,v 1.56 2002/10/14 16:03:16 iliaa Exp $ */ #include /* modf() */ #include "php.h" @@ -605,6 +605,7 @@ case 'e': case 'f': /* XXX not done */ + convert_to_double_ex(args[argnum]); php_sprintf_appenddouble(&result, &outpos, &size, Z_DVAL_PP(args[argnum]), width, padding, alignment, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS /win32 registry.c
zeevMon Oct 14 08:05:09 2002 EDT
Modified files:
/php4 NEWS
/php4/win32 registry.c
Log:
Change the 'security level' of registry entries to PHP_INI_SYSTEM. They're
in the system hive in the registry, so only people with administrative
priveleges can add stuff in there.
Index: php4/NEWS
diff -u php4/NEWS:1.1203 php4/NEWS:1.1204
--- php4/NEWS:1.1203Sun Oct 13 20:36:11 2002
+++ php4/NEWS Mon Oct 14 08:05:09 2002
@@ -1,6 +1,9 @@
PHP 4 NEWS
|||
? ? ??? 2002, Version 4.3.0
+- Changed registry entries under "HKLM\SOFTWARE\PHP\Per Directory Values" to
+ work also with administrative directives such as safe_mode, open_basedir,
+ etc. (Claudio Felber)
- Added PGSQL_CONNECT_FORCE_NEW option to pg_connect() (Yasuo)
- ATTENTION! "make install" will *by default* install the CLI SAPI binary in
{PREFIX}/bin/php. If you don't disable the CGI binary, it will be
Index: php4/win32/registry.c
diff -u php4/win32/registry.c:1.11 php4/win32/registry.c:1.12
--- php4/win32/registry.c:1.11 Sat Aug 4 21:42:48 2001
+++ php4/win32/registry.c Mon Oct 14 08:05:09 2002
@@ -70,7 +70,7 @@
RegEnumValue(hKey, i, namebuf, &namebuf_len, NULL,
&lType, valuebuf, &valuebuf_len);
if ((lType == REG_SZ) || (lType == REG_EXPAND_SZ)) {
- zend_alter_ini_entry(namebuf, namebuf_len + 1,
valuebuf, valuebuf_len, PHP_INI_PERDIR, PHP_INI_STAGE_ACTIVATE);
+ zend_alter_ini_entry(namebuf, namebuf_len + 1,
+valuebuf, valuebuf_len, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
}
i++;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/cli php_cli.c
derick Mon Oct 14 07:59:59 2002 EDT
Modified files:
/php4/sapi/cli php_cli.c
Log:
- Revert, got tricked by a stale object file
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.36 php4/sapi/cli/php_cli.c:1.37
--- php4/sapi/cli/php_cli.c:1.36Mon Oct 14 02:58:57 2002
+++ php4/sapi/cli/php_cli.c Mon Oct 14 07:59:58 2002
@@ -156,7 +156,7 @@
/* In CGI mode, we consider the environment to be a part of the server
* variables
*/
- _php_import_environment_variables(track_vars_array TSRMLS_CC);
+ php_import_environment_variables(track_vars_array TSRMLS_CC);
/* Build the special-case PHP_SELF variable for the CLI version */
php_register_variable("PHP_SELF", php_self, track_vars_array TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / run-tests.php
yohgaki Mon Oct 14 05:32:36 2002 EDT
Modified files:
/php4 run-tests.php
Log:
Fixed warnings
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.70 php4/run-tests.php:1.71
--- php4/run-tests.php:1.70 Mon Oct 14 03:18:23 2002
+++ php4/run-tests.php Mon Oct 14 05:32:36 2002
@@ -87,7 +87,7 @@
if (getenv('TEST_PHP_USER')) {
$user_tests = explode (',', getenv('TEST_PHP_USER'));
} else {
- $user_tests = NULL;
+ $user_tests = array();
}
// Write test context information.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/embed config.m4
edink Mon Oct 14 05:05:28 2002 EDT Modified files: /php4/sapi/embedconfig.m4 Log: Install lib into $(prefix)/lib. Make $(prefix)/lib before trying to copy the lib into it. Index: php4/sapi/embed/config.m4 diff -u php4/sapi/embed/config.m4:1.5 php4/sapi/embed/config.m4:1.6 --- php4/sapi/embed/config.m4:1.5 Fri Oct 11 22:50:16 2002 +++ php4/sapi/embed/config.m4 Mon Oct 14 05:05:28 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.5 2002/10/12 02:50:16 sniper Exp $ +dnl $Id: config.m4,v 1.6 2002/10/14 09:05:28 edink Exp $ dnl AC_MSG_CHECKING(for embedded SAPI library support) @@ -11,11 +11,11 @@ case $enableval in yes|shared) PHP_EMBED_TYPE=shared - INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)/lib" + INSTALL_IT="\$(mkinstalldirs) \$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED +\$(prefix)/lib" ;; static) PHP_EMBED_TYPE=static - INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_STATIC \$(INSTALL_ROOT)/lib" + INSTALL_IT="\$(mkinstalldirs) \$(prefix)/lib; \$(INSTALL) -m 0644 $SAPI_STATIC +\$(prefix)/lib" ;; *) PHP_EMBED_TYPE=no -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
