Re: [PHP-CVS] cvs: php4 / NEWS
At 01:06 03.01.2003, Jani Taskinen wrote: sniper Thu Jan 2 19:06:24 2003 EDT Modified files: /php4 NEWS Log: - Removed entries that are going to 4.3.1 - Grouped the entries a bit. Index: php4/NEWS diff -u php4/NEWS:1.1297 php4/NEWS:1.1298 --- php4/NEWS:1.1297Mon Dec 30 20:33:05 2002 +++ php4/NEWS Thu Jan 2 19:06:23 2003 @@ -1,33 +1,16 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 4.4.0 -- Improved dba extension (Marcus) (snip) These are not in 4.3.1: -- Improved dba extension (Marcus) - . Made handler parameter of dba_(p)open() optional. - . Added php.ini option 'dba.default_handler' to specify a default handler. - . Added parameter full_info to dba_handlers() that can be set true to -receive information about the handlers such like the library version. These will be in 4.3.1: - . Added support for internal error handling of Berkeley db libraries. - . Disallow Berkeley db versions 4.1.0 to 4.1.24 due to locking problems. - . Disallow linkage of Berkeley db submodules against libraries with -different major version. - . Disallow configuring of more than one Berkeley db handler. (snip) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/iconv/tests iconv_mime_encode.phpt
moriyoshi Sat Jan 4 08:39:59 2003 EDT
Added files:
/php4/ext/iconv/tests iconv_mime_encode.phpt
Log:
Added test case for iconv_mime_encode()
Index: php4/ext/iconv/tests/iconv_mime_encode.phpt
+++ php4/ext/iconv/tests/iconv_mime_encode.phpt
--TEST--
iconv_mime_encode()
--SKIPIF--
?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?
--INI--
iconv.internal_charset=iso-8859-1
--FILE--
?php
function my_error_handler($errno, $errmsg, $filename, $linenum, $vars)
{
echo $errno: $errmsg\n;
}
set_error_handler('my_error_handler');
for ($line_len= 0; $line_len 80; ++$line_len) {
print line length=$line_len\n;
$result = iconv_mime_encode(From,
¥µ¥ó¥×¥ëʸ»úÎó¥µ¥ó¥×¥ëʸ»úÎóÆüËܸì¥Æ¥¥¹¥È, B, ISO-2022-JP, EUC-JP, $line_len,
\n);
var_dump($result);
if ($result !== false) {
list($max) = rsort(array_map(strlen, explode(\n, $result)));
print ;
var_dump(($max = $line_len));
} else {
print \n;
}
}
?
--EXPECTF--
line length=0
2: %s
bool(false)
line length=1
2: %s
bool(false)
line length=2
2: %s
bool(false)
line length=3
2: %s
bool(false)
line length=4
2: %s
bool(false)
line length=5
2: %s
bool(false)
line length=6
2: %s
bool(false)
line length=7
2: %s
bool(false)
line length=8
2: %s
bool(false)
line length=9
2: %s
bool(false)
line length=10
2: %s
bool(false)
line length=11
2: %s
bool(false)
line length=12
2: %s
bool(false)
line length=13
2: %s
bool(false)
line length=14
2: %s
bool(false)
line length=15
2: %s
bool(false)
line length=16
2: %s
bool(false)
line length=17
2: %s
bool(false)
line length=18
2: %s
bool(false)
line length=19
2: %s
bool(false)
line length=20
2: %s
bool(false)
line length=21
2: %s
bool(false)
line length=22
2: %s
bool(false)
line length=23
2: %s
bool(false)
line length=24
2: %s
bool(false)
line length=25
2: %s
bool(false)
line length=26
2: %s
bool(false)
line length=27
2: %s
bool(false)
line length=28
2: %s
bool(false)
line length=29
2: %s
bool(false)
line length=30
2: %s
bool(false)
line length=31
2: %s
bool(false)
line length=32
2: %s
bool(false)
line length=33
2: %s
bool(false)
line length=34
2: %s
bool(false)
line length=35
2: %s
bool(false)
line length=36
string(216) From: =?ISO-2022-JP?B?GyRCJTUbKEI=?=
=?ISO-2022-JP?B?JXMlVyVrSjgbKEI=?=
=?ISO-2022-JP?B?O3pOcyU1JXMbKEI=?=
=?ISO-2022-JP?B?JVcla0o4O3obKEI=?=
=?ISO-2022-JP?B?TnNGfEtcOGwbKEI=?=
=?ISO-2022-JP?B?JUYlLSU5JUgbKEI=?=
bool(true)
line length=37
string(216) From: =?ISO-2022-JP?B?GyRCJTUbKEI=?=
=?ISO-2022-JP?B?JXMlVyVrSjgbKEI=?=
=?ISO-2022-JP?B?O3pOcyU1JXMbKEI=?=
=?ISO-2022-JP?B?JVcla0o4O3obKEI=?=
=?ISO-2022-JP?B?TnNGfEtcOGwbKEI=?=
=?ISO-2022-JP?B?JUYlLSU5JUgbKEI=?=
bool(true)
line length=38
string(216) From: =?ISO-2022-JP?B?GyRCJTUbKEI=?=
=?ISO-2022-JP?B?JXMlVyVrSjgbKEI=?=
=?ISO-2022-JP?B?O3pOcyU1JXMbKEI=?=
=?ISO-2022-JP?B?JVcla0o4O3obKEI=?=
=?ISO-2022-JP?B?TnNGfEtcOGwbKEI=?=
=?ISO-2022-JP?B?JUYlLSU5JUgbKEI=?=
bool(true)
line length=39
string(196) From: =?ISO-2022-JP?B?GyRCJTUbKEI=?=
=?ISO-2022-JP?B?JXMlVyVrSjg7ehsoQg==?=
=?ISO-2022-JP?B?TnMlNSVzJVclaxsoQg==?=
=?ISO-2022-JP?B?Sjg7ek5zRnxLXBsoQg==?=
=?ISO-2022-JP?B?OGwlRiUtJTklSBsoQg==?=
bool(true)
line length=40
string(196) From: =?ISO-2022-JP?B?GyRCJTUlcxsoQg==?=
=?ISO-2022-JP?B?JVcla0o4O3pOcxsoQg==?=
=?ISO-2022-JP?B?JTUlcyVXJWtKOBsoQg==?=
=?ISO-2022-JP?B?O3pOc0Z8S1w4bBsoQg==?=
=?ISO-2022-JP?B?JUYlLSU5JUgbKEI=?=
bool(true)
line length=41
string(196) From: =?ISO-2022-JP?B?GyRCJTUlcxsoQg==?=
=?ISO-2022-JP?B?JVcla0o4O3pOcxsoQg==?=
=?ISO-2022-JP?B?JTUlcyVXJWtKOBsoQg==?=
=?ISO-2022-JP?B?O3pOc0Z8S1w4bBsoQg==?=
=?ISO-2022-JP?B?JUYlLSU5JUgbKEI=?=
bool(true)
line length=42
string(196) From: =?ISO-2022-JP?B?GyRCJTUlcxsoQg==?=
=?ISO-2022-JP?B?JVcla0o4O3pOcxsoQg==?=
=?ISO-2022-JP?B?JTUlcyVXJWtKOBsoQg==?=
=?ISO-2022-JP?B?O3pOc0Z8S1w4bBsoQg==?=
=?ISO-2022-JP?B?JUYlLSU5JUgbKEI=?=
bool(true)
line length=43
string(168) From: =?ISO-2022-JP?B?GyRCJTUlcxsoQg==?=
=?ISO-2022-JP?B?JVcla0o4O3pOcyU1JXMbKEI=?=
=?ISO-2022-JP?B?JVcla0o4O3pOc0Z8S1wbKEI=?=
[PHP-CVS] cvs: php4 / NEWS
moriyoshi Sat Jan 4 08:45:04 2003 EDT Modified files: /php4 NEWS Log: NEWS update for new iconv functions Index: php4/NEWS diff -u php4/NEWS:1.1299 php4/NEWS:1.1300 --- php4/NEWS:1.1299Fri Jan 3 20:34:30 2003 +++ php4/NEWS Sat Jan 4 08:45:03 2003 @@ -1,6 +1,11 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 4.4.0 +- Added iconv related functions (Moriyoshi) + . iconv_strlen() + . iconv_substr() + . iconv_mime_decode() + . iconv_mime_encode() - Removed support for libmcrypt 2.2.x to allow cleaner code. Another reason to upgrade libmcrypt to a 2.5.x series as the older ones have too much bugs to be safely used with PHP. (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/iconv iconv.c
moriyoshi Sat Jan 4 08:52:54 2003 EDT Modified files: /php4/ext/iconv iconv.c Log: Fixed cut'n'paste failure Index: php4/ext/iconv/iconv.c diff -u php4/ext/iconv/iconv.c:1.76 php4/ext/iconv/iconv.c:1.77 --- php4/ext/iconv/iconv.c:1.76 Fri Jan 3 15:01:13 2003 +++ php4/ext/iconv/iconv.c Sat Jan 4 08:52:54 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: iconv.c,v 1.76 2003/01/03 20:01:13 moriyoshi Exp $ */ +/* $Id: iconv.c,v 1.77 2003/01/04 13:52:54 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1221,7 +1221,7 @@ goto out; } - } break; /* case PHP_ICONV_ENC_SCHEME_BASE64: */ + } break; /* case PHP_ICONV_ENC_SCHEME_QPRINT: */ } } while (in_left 0); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /sapi/apache libpre.c
On Fri, Jan 03, 2003 at 03:39:44PM -, Anantha Kesari H Y wrote: hyanantha Fri Jan 3 10:39:44 2003 EDT Modified files: /php4/sapi/apache libpre.c Log: New file added for NetWare. No new file was added. Did you forget to add one, or is the commit message incorrect? -- Jon Parise ([EMAIL PROTECTED]) :: The PHP Project (http://www.php.net/) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/standard http_fopen_wrapper.c
On Fri, Jan 03, 2003 at 05:12:36PM -, Ilia Alshanetsky wrote: iliaa Fri Jan 3 12:12:36 2003 EDT Modified files: /php4/ext/standardhttp_fopen_wrapper.c Log: Fixed a memory leak that occurs if the location specified by redirect header cannot be opened. Please avoid mixing style-related commits with behavioral changes. Your fix adds two new lines, but one needs to read through about ten lines of changes to find those two lines. -- Jon Parise ([EMAIL PROTECTED]) :: The PHP Project (http://www.php.net/) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) / acinclude.m4
On Fri, Jan 03, 2003 at 10:07:06PM -, Alex Waugh wrote: alexwaugh Fri Jan 3 17:07:06 2003 EDT Modified files: (Branch: PHP_4_3) /php4 acinclude.m4 Log: MFH When merging code between branches, please include a revision number and an abbreviated commit message for reference. For example: MFH 1.224: cross-compiling fix -- Jon Parise ([EMAIL PROTECTED]) :: The PHP Project (http://www.php.net/) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
derick Sat Jan 4 13:35:38 2003 EDT Modified files: /php4 NEWS Log: - Fix typo Index: php4/NEWS diff -u php4/NEWS:1.1300 php4/NEWS:1.1301 --- php4/NEWS:1.1300Sat Jan 4 08:45:03 2003 +++ php4/NEWS Sat Jan 4 13:35:37 2003 @@ -7,7 +7,7 @@ . iconv_mime_decode() . iconv_mime_encode() - Removed support for libmcrypt 2.2.x to allow cleaner code. Another reason - to upgrade libmcrypt to a 2.5.x series as the older ones have too much bugs + to upgrade libmcrypt to a 2.5.x series as the older ones have too many bugs to be safely used with PHP. (Derick) - Fixed bug #17098 (make Apache2 aware that PHP scripts represent dynamic data and should not be cached). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
moriyoshi Sat Jan 4 13:49:48 2003 EDT Modified files: /php4 NEWS Log: Forgot to include these functions in the list Index: php4/NEWS diff -u php4/NEWS:1.1301 php4/NEWS:1.1302 --- php4/NEWS:1.1301Sat Jan 4 13:35:37 2003 +++ php4/NEWS Sat Jan 4 13:49:48 2003 @@ -4,6 +4,8 @@ - Added iconv related functions (Moriyoshi) . iconv_strlen() . iconv_substr() + . iconv_strpos() + . iconv_strrpos() . iconv_mime_decode() . iconv_mime_encode() - Removed support for libmcrypt 2.2.x to allow cleaner code. Another reason -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dbx dbx.c
helly Sat Jan 4 14:18:43 2003 EDT
Modified files:
/php4/ext/dbx dbx.c
Log:
Fix ZTS-ZE2 build
Index: php4/ext/dbx/dbx.c
diff -u php4/ext/dbx/dbx.c:1.43 php4/ext/dbx/dbx.c:1.44
--- php4/ext/dbx/dbx.c:1.43 Tue Dec 31 11:06:27 2002
+++ php4/ext/dbx/dbx.c Sat Jan 4 14:18:43 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: dbx.c,v 1.43 2002/12/31 16:06:27 sebastian Exp $ */
+/* $Id: dbx.c,v 1.44 2003/01/04 19:18:43 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -85,7 +85,7 @@
return DBX_UNKNOWN;
}
-int split_dbx_handle_object(zval **dbx_object, zval ***pdbx_handle, zval
***pdbx_module, zval ***pdbx_database)
+int split_dbx_handle_object(zval **dbx_object, zval ***pdbx_handle, zval
+***pdbx_module, zval ***pdbx_database TSRMLS_DC)
{
convert_to_object_ex(dbx_object);
if (zend_hash_find(Z_OBJPROP_PP(dbx_object), handle, 7, (void **)
pdbx_handle)==FAILURE
@@ -334,7 +334,7 @@
if (ZEND_NUM_ARGS() !=number_of_arguments ||
zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
+dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, dbx_close: not a valid dbx_handle-object...);
RETURN_LONG(0);
}
@@ -386,7 +386,7 @@
if (ZEND_NUM_ARGS()min_number_of_arguments ||
ZEND_NUM_ARGS()number_of_arguments || zend_get_parameters_array_ex(ZEND_NUM_ARGS(),
arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
+dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, dbx_query: not a valid dbx_handle-object...);
RETURN_LONG(0);
}
@@ -560,7 +560,7 @@
if (ZEND_NUM_ARGS() !=number_of_arguments ||
zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
+dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, dbx_error: not a valid dbx_handle-object...);
RETURN_LONG(0);
}
@@ -593,7 +593,7 @@
if (ZEND_NUM_ARGS() !=number_of_arguments ||
zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
+dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, dbx_esc: not a valid dbx_handle-object...);
RETURN_NULL();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/exif/tests exif003.phpt exif004.phpt
helly Sat Jan 4 14:20:00 2003 EDT
Modified files:
/php4/ext/exif/testsexif003.phpt exif004.phpt
Log:
better to check for existance first
Index: php4/ext/exif/tests/exif003.phpt
diff -u php4/ext/exif/tests/exif003.phpt:1.4 php4/ext/exif/tests/exif003.phpt:1.5
--- php4/ext/exif/tests/exif003.phpt:1.4Mon Dec 16 09:54:35 2002
+++ php4/ext/exif/tests/exif003.phptSat Jan 4 14:19:58 2003
@@ -4,7 +4,7 @@
?php
if (!extension_loaded('exif')) die('skip exif extension not available');
if (!extension_loaded('mbstring')) die('skip mbstring extension not
available');
- if (!EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
+ if (!defined(EXIF_USE_MBSTRING) || !EXIF_USE_MBSTRING) die ('skip mbstring
+loaded by dl');
?
--INI--
output_handler=
Index: php4/ext/exif/tests/exif004.phpt
diff -u php4/ext/exif/tests/exif004.phpt:1.4 php4/ext/exif/tests/exif004.phpt:1.5
--- php4/ext/exif/tests/exif004.phpt:1.4Mon Dec 16 09:54:35 2002
+++ php4/ext/exif/tests/exif004.phptSat Jan 4 14:19:59 2003
@@ -4,7 +4,7 @@
?php
if (!extension_loaded('exif')) die('skip exif extension not available');
if (!extension_loaded('mbstring')) die('skip mbstring extension not
available');
- if (!EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
+ if (!defined(EXIF_USE_MBSTRING) || !EXIF_USE_MBSTRING) die ('skip mbstring
+loaded by dl');
?
--INI--
output_handler=
--
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/dbx dbx.c
helly Sat Jan 4 14:21:22 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/dbx dbx.c
Log:
MFH: Fix ZTS-ZE2 build
Index: php4/ext/dbx/dbx.c
diff -u php4/ext/dbx/dbx.c:1.42.2.1 php4/ext/dbx/dbx.c:1.42.2.2
--- php4/ext/dbx/dbx.c:1.42.2.1 Tue Dec 31 11:34:21 2002
+++ php4/ext/dbx/dbx.c Sat Jan 4 14:21:22 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: dbx.c,v 1.42.2.1 2002/12/31 16:34:21 sebastian Exp $ */
+/* $Id: dbx.c,v 1.42.2.2 2003/01/04 19:21:22 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -85,7 +85,7 @@
return DBX_UNKNOWN;
}
-int split_dbx_handle_object(zval **dbx_object, zval ***pdbx_handle, zval
***pdbx_module, zval ***pdbx_database)
+int split_dbx_handle_object(zval **dbx_object, zval ***pdbx_handle, zval
+***pdbx_module, zval ***pdbx_database TSRMLS_DC)
{
convert_to_object_ex(dbx_object);
if (zend_hash_find(Z_OBJPROP_PP(dbx_object), handle, 7, (void **)
pdbx_handle)==FAILURE
@@ -334,7 +334,7 @@
if (ZEND_NUM_ARGS() !=number_of_arguments ||
zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
+dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, dbx_close: not a valid dbx_handle-object...);
RETURN_LONG(0);
}
@@ -386,7 +386,7 @@
if (ZEND_NUM_ARGS()min_number_of_arguments ||
ZEND_NUM_ARGS()number_of_arguments || zend_get_parameters_array_ex(ZEND_NUM_ARGS(),
arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
+dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, dbx_query: not a valid dbx_handle-object...);
RETURN_LONG(0);
}
@@ -560,7 +560,7 @@
if (ZEND_NUM_ARGS() !=number_of_arguments ||
zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
+dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, dbx_error: not a valid dbx_handle-object...);
RETURN_LONG(0);
}
@@ -593,7 +593,7 @@
if (ZEND_NUM_ARGS() !=number_of_arguments ||
zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) {
WRONG_PARAM_COUNT;
}
- if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
dbx_database)) {
+ if (!split_dbx_handle_object(arguments[0], dbx_handle, dbx_module,
+dbx_database TSRMLS_CC)) {
zend_error(E_WARNING, dbx_esc: not a valid dbx_handle-object...);
RETURN_NULL();
}
--
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/standard incomplete_class.c php_incomplete_class.h var_unserializer.c /ext/wddx wddx.c
helly Sat Jan 4 14:42:37 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard incomplete_class.c php_incomplete_class.h
var_unserializer.c
/php4/ext/wddx wddx.c
Log:
Fix ZTS-ZE2 build
Index: php4/ext/standard/incomplete_class.c
diff -u php4/ext/standard/incomplete_class.c:1.14.4.2
php4/ext/standard/incomplete_class.c:1.14.4.3
--- php4/ext/standard/incomplete_class.c:1.14.4.2 Tue Dec 31 11:35:29 2002
+++ php4/ext/standard/incomplete_class.cSat Jan 4 14:42:37 2003
@@ -17,7 +17,7 @@
*/
-/* $Id: incomplete_class.c,v 1.14.4.2 2002/12/31 16:35:29 sebastian Exp $ */
+/* $Id: incomplete_class.c,v 1.14.4.3 2003/01/04 19:42:37 helly Exp $ */
#include php.h
#include basic_functions.h
@@ -39,7 +39,7 @@
char *class_name;
TSRMLS_FETCH();
- class_name = php_lookup_class_name(ref-object, NULL, 0);
+ class_name = php_lookup_class_name(ref-object, NULL, 0 TSRMLS_CC);
if (!class_name)
class_name = estrdup(unknown);
@@ -102,7 +102,7 @@
/* {{{ php_lookup_class_name
*/
-char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del)
+char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del TSRMLS_DC)
{
zval **val;
char *retval = NULL;
@@ -126,7 +126,7 @@
/* {{{ php_store_class_name
*/
-void php_store_class_name(zval *object, const char *name, size_t len)
+void php_store_class_name(zval *object, const char *name, size_t len TSRMLS_DC)
{
zval *val;
Index: php4/ext/standard/php_incomplete_class.h
diff -u php4/ext/standard/php_incomplete_class.h:1.9.4.1
php4/ext/standard/php_incomplete_class.h:1.9.4.2
--- php4/ext/standard/php_incomplete_class.h:1.9.4.1Tue Dec 31 11:35:33 2002
+++ php4/ext/standard/php_incomplete_class.hSat Jan 4 14:42:37 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_incomplete_class.h,v 1.9.4.1 2002/12/31 16:35:33 sebastian Exp $ */
+/* $Id: php_incomplete_class.h,v 1.9.4.2 2003/01/04 19:42:37 helly Exp $ */
#ifndef PHP_INCOMPLETE_CLASS_H
#define PHP_INCOMPLETE_CLASS_H
@@ -53,8 +53,8 @@
zend_class_entry *php_create_incomplete_class(TSRMLS_D);
-char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del);
-void php_store_class_name(zval *object, const char *name, size_t len);
+char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del TSRMLS_DC);
+void php_store_class_name(zval *object, const char *name, size_t len TSRMLS_DC);
#ifdef __cplusplus
};
Index: php4/ext/standard/var_unserializer.c
diff -u php4/ext/standard/var_unserializer.c:1.18
php4/ext/standard/var_unserializer.c:1.18.4.1
--- php4/ext/standard/var_unserializer.c:1.18 Mon Aug 19 16:02:59 2002
+++ php4/ext/standard/var_unserializer.cSat Jan 4 14:42:37 2003
@@ -446,7 +446,7 @@
elements = object_common1(UNSERIALIZE_PASSTHRU, ce);
if (incomplete_class) {
- php_store_class_name(*rval, class_name, len2);
+ php_store_class_name(*rval, class_name, len2 TSRMLS_CC);
efree(class_name);
}
Index: php4/ext/wddx/wddx.c
diff -u php4/ext/wddx/wddx.c:1.96.2.1 php4/ext/wddx/wddx.c:1.96.2.2
--- php4/ext/wddx/wddx.c:1.96.2.1 Tue Dec 31 11:35:42 2002
+++ php4/ext/wddx/wddx.cSat Jan 4 14:42:37 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: wddx.c,v 1.96.2.1 2002/12/31 16:35:42 sebastian Exp $ */
+/* $Id: wddx.c,v 1.96.2.2 2003/01/04 19:42:37 helly Exp $ */
#include php.h
#include php_wddx.h
@@ -956,7 +956,7 @@
(void
*) tmp, sizeof(zval *), 0);
if (incomplete_class) {
- php_store_class_name(obj,
Z_STRVAL_P(ent1-data), Z_STRLEN_P(ent1-data));
+ php_store_class_name(obj,
+Z_STRVAL_P(ent1-data), Z_STRLEN_P(ent1-data), TSRMLS_CC);
}
/* Clean up old array entry */
--
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/standard browscap.c
helly Sat Jan 4 14:51:13 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard browscap.c
Log:
Fix ZTS-ZE2 (After Cygwin now for the rest)
Index: php4/ext/standard/browscap.c
diff -u php4/ext/standard/browscap.c:1.60.2.4 php4/ext/standard/browscap.c:1.60.2.5
--- php4/ext/standard/browscap.c:1.60.2.4 Sat Jan 4 14:42:24 2003
+++ php4/ext/standard/browscap.cSat Jan 4 14:51:13 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: browscap.c,v 1.60.2.4 2003/01/04 19:42:24 helly Exp $ */
+/* $Id: browscap.c,v 1.60.2.5 2003/01/04 19:51:13 helly Exp $ */
#include php.h
#include php_regex.h
@@ -189,12 +189,12 @@
*/
static int browser_reg_compare(zval **browser, int num_args, va_list args,
zend_hash_key *key)
{
- TSRMLS_FETCH();
-
zval **browser_name;
regex_t r;
char *lookup_browser_name = va_arg(args, char *);
zval **found_browser_entry = va_arg(args, zval **);
+
+ TSRMLS_FETCH();
if (*found_browser_entry) { /* already found */
return 0;
--
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/cpdf config.m4
helly Sat Jan 4 14:53:54 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/cpdf config.m4 Log: MFH Index: php4/ext/cpdf/config.m4 diff -u php4/ext/cpdf/config.m4:1.10 php4/ext/cpdf/config.m4:1.10.4.1 --- php4/ext/cpdf/config.m4:1.10Wed Mar 13 04:18:53 2002 +++ php4/ext/cpdf/config.m4 Sat Jan 4 14:53:53 2003 @@ -1,70 +1,96 @@ -dnl $Id: config.m4,v 1.10 2002/03/13 09:18:53 sas Exp $ +dnl $Id: config.m4,v 1.10.4.1 2003/01/04 19:53:53 helly Exp $ -AC_MSG_CHECKING(for cpdflib support) -AC_ARG_WITH(cpdflib, -[ --with-cpdflib[=DIR]Include cpdflib support (requires cpdflib = 2).], -[ - case $withval in -no) - AC_MSG_RESULT(no) ;; -yes) - AC_MSG_RESULT(yes) - PHP_NEW_EXTENSION(cpdf, cpdf.c) - AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])], -[AC_MSG_ERROR([Cpdf module requires cpdflib = 2.])]) - PHP_ADD_LIBRARY(cpdf) - PHP_ADD_LIBRARY(tiff) - PHP_ADD_LIBRARY(jpeg) - ;; -*) - test -f $withval/include/cpdflib.h CPDFLIB_INCLUDE=$withval/include - if test -n $CPDFLIB_INCLUDE ; then -AC_MSG_RESULT(yes) -PHP_NEW_EXTENSION(cpdf, cpdf.c) -old_LIBS=$LIBS -old_withval=$withval +AC_DEFUN(CPDF_TEMP_SUBST,[ + old_LIBS=$LIBS + $1 + LIBS=$old_LIBS +]) +AC_DEFUN(CPDF_JPEG_TEST,[ + CPDF_TEMP_SUBST([ +AC_ARG_WITH(jpeg-dir, +[ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ + for i in $withval /usr/local /usr; do +if test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a; then + CPDF_JPEG_DIR=$i + break; +fi + done + if test -z $CPDF_JPEG_DIR; then AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)]) -AC_ARG_WITH(jpeg-dir, -[ --with-jpeg-dir[=DIR] jpeg dir for cpdflib 2.x],[ - AC_MSG_RESULT(yes) - if test -z $withval; then -withval=/usr/local - fi - LIBS=$LIBS -L$withval/lib - AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no)],) - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) -],[ - AC_MSG_RESULT(no) - AC_MSG_WARN(If configure fails try --with-jpeg-dir=DIR) -]) +AC_MSG_ERROR([libjpeg.(a|so) not found.]) + fi + LIBS=$LIBS -L$CPDF_JPEG_DIR/lib +],) +AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_ERROR(Problem with libjpeg.(a|so). +Please check config.log for more information.)],) +if test -z $CPDF_JPEG_DIR; then + PHP_ADD_LIBRARY(jpeg) +else + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib) +fi + ]) +]) +AC_DEFUN(CPDF_TIFF_TEST,[ + CPDF_TEMP_SUBST([ +AC_ARG_WITH(tiff-dir, +[ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ + for i in $withval /usr/local /usr; do +if test -f $i/lib/libtiff.$SHLIB_SUFFIX_NAME -o -f $i/lib/libtiff.a; then + CPDF_TIFF_DIR=$i + break; +fi + done + if test -z $CPDF_TIFF_DIR; then AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)]) -AC_ARG_WITH(tiff-dir, -[ --with-tiff-dir[=DIR] tiff dir for cpdflib 2.x],[ - AC_MSG_RESULT(yes) - if test -z $withval; then -withval=/usr/local - fi - LIBS=$LIBS -L$withval/lib - AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no)],) - PHP_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib) -],[ - AC_MSG_RESULT(no) - AC_MSG_WARN(If configure fails try --with-tiff-dir=DIR) -]) -withval=$old_withval +AC_MSG_ERROR([libtiff.(a|so) not found.]) + fi + LIBS=$LIBS -L$CPDF_TIFF_DIR/lib +],) +AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_ERROR(Problem with libtiff.(a|so). Please +check config.log for more information.)],) +if test -z $CPDF_TIFF_DIR; then + PHP_ADD_LIBRARY(tiff) +else + PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib) +fi + ]) +]) - LIBS=$LIBS -L$withval/lib -AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])], - [AC_MSG_ERROR([Cpdflib module requires cpdflib = 2.])]) -LIBS=$old_LIBS -PHP_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib) -PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) - else -AC_MSG_RESULT(no) - fi ;; - esac +AC_MSG_CHECKING(for cpdflib support) +AC_ARG_WITH(cpdflib, +[ --with-cpdflib[=DIR]Include cpdflib support (requires cpdflib = 2).], +[ + if test $withval = no; then +AC_MSG_RESULT(no) + else +AC_MSG_RESULT(yes) +PHP_NEW_EXTENSION(cpdf, cpdf.c) +CPDF_JPEG_TEST +CPDF_TIFF_TEST +for i in $withval /usr /usr/local; do + if test -f $i/include/cpdflib.h; then +CPDFLIB_INCLUDE=$i/include +AC_MSG_CHECKING(for cpdflib.h) +AC_MSG_RESULT([in $i/include]) +
Re: [PHP-CVS] cvs: php4(PHP_4_3) / acinclude.m4
In message [EMAIL PROTECTED] Jon Parise [EMAIL PROTECTED] wrote: On Fri, Jan 03, 2003 at 10:07:06PM -, Alex Waugh wrote: alexwaugh Fri Jan 3 17:07:06 2003 EDT Modified files: (Branch: PHP_4_3) /php4 acinclude.m4 Log: MFH When merging code between branches, please include a revision number and an abbreviated commit message for reference. For example: MFH 1.224: cross-compiling fix OK, I'll try and remember next time. Alex -- Alex Waugh [EMAIL PROTECTED] RISC OS software from http://www.alexwaugh.com/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/openssl openssl.c
iliaa Sat Jan 4 18:31:54 2003 EDT
Modified files:
/php4/ext/openssl openssl.c
Log:
CS fixes.
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.61 php4/ext/openssl/openssl.c:1.62
--- php4/ext/openssl/openssl.c:1.61 Thu Jan 2 16:18:58 2003
+++ php4/ext/openssl/openssl.c Sat Jan 4 18:31:54 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.61 2003/01/02 21:18:58 iliaa Exp $ */
+/* $Id: openssl.c,v 1.62 2003/01/04 23:31:54 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -218,15 +218,14 @@
array_init(subitem);
for (i = 0; i X509_NAME_entry_count(name); i++) {
- ne = X509_NAME_get_entry(name, i);
+ ne = X509_NAME_get_entry(name, i);
obj = X509_NAME_ENTRY_get_object(ne);
str = X509_NAME_ENTRY_get_data(ne);
nid = OBJ_obj2nid(obj);
if (shortname) {
sn = (char*)OBJ_nid2sn(nid);
add_assoc_stringl(subitem, sn, str-data, str-length, 1);
- }
- else{
+ } else {
ln = (char*)OBJ_nid2ln(nid);
add_assoc_stringl(subitem, ln, str-data, str-length, 1);
}
@@ -261,7 +260,6 @@
strbuf = estrdup(timestr-data);
-
memset(thetime, 0, sizeof(thetime));
/* we work backwards so that we can use atoi more easily */
@@ -336,9 +334,9 @@
int i;
str = CONF_get_string(req-req_config, NULL, oid_section);
- if (str == NULL)
+ if (str == NULL) {
return SUCCESS;
-
+ }
sktmp = CONF_get_section(req-req_config, str);
if (sktmp == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, problem loading oid
section %s, str);
@@ -347,8 +345,7 @@
for (i = 0; i sk_CONF_VALUE_num(sktmp); i++) {
cnf = sk_CONF_VALUE_value(sktmp, i);
if (OBJ_create(cnf-value, cnf-name, cnf-name) == NID_undef) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, problem creating
object %s=%s,
- cnf-name, cnf-value);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, problem creating
+object %s=%s, cnf-name, cnf-value);
return FAILURE;
}
}
@@ -390,9 +387,9 @@
req-global_config = CONF_load(NULL, default_ssl_conf_filename, NULL);
req-req_config = CONF_load(NULL, req-config_filename, NULL);
- if (req-req_config == NULL)
+ if (req-req_config == NULL) {
return FAILURE;
-
+ }
/* read in the oids */
str = CONF_get_string(req-req_config, NULL, oid_file);
@@ -403,9 +400,9 @@
BIO_free(oid_bio);
}
}
- if (add_oid_section(req TSRMLS_CC) == FAILURE)
+ if (add_oid_section(req TSRMLS_CC) == FAILURE) {
return FAILURE;
-
+ }
SET_OPTIONAL_STRING_ARG(digest_alg, req-digest_name,
CONF_get_string(req-req_config, req-section_name,
default_md));
SET_OPTIONAL_STRING_ARG(x509_extensions, req-extensions_section,
@@ -419,25 +416,28 @@
if (optional_args zend_hash_find(Z_ARRVAL_P(optional_args), encrypt_key,
sizeof(encrypt_key), (void**)item) == SUCCESS) {
req-priv_key_encrypt = Z_BVAL_PP(item);
- }
- else{
+ } else {
str = CONF_get_string(req-req_config, req-section_name,
encrypt_rsa_key);
- if (str == NULL)
+ if (str == NULL) {
str = CONF_get_string(req-req_config, req-section_name,
encrypt_key);
- if (str strcmp(str, no) == 0)
+ }
+ if (str strcmp(str, no) == 0) {
req-priv_key_encrypt = 0;
- else
+ } else {
req-priv_key_encrypt = 1;
+ }
}
-
/* digest alg */
- if (req-digest_name == NULL)
+ if (req-digest_name == NULL) {
req-digest_name = CONF_get_string(req-req_config, req-section_name,
default_md);
- if (req-digest_name)
+ }
+ if (req-digest_name) {
req-digest = req-md_alg = EVP_get_digestbyname(req-digest_name);
- if (req-md_alg == NULL)
+ }
+ if (req-md_alg == NULL) {
req-md_alg = req-digest = EVP_md5();
+ }
PHP_SSL_CONFIG_SYNTAX_CHECK(extensions_section);
@@ -448,9 +448,9 @@
return FAILURE;
}
- if (req-request_extensions_section == NULL)
+ if (req-request_extensions_section == NULL) {
req-request_extensions_section =
[PHP-CVS] cvs: php4 /ext/standard filestat.c
derick Sat Jan 4 19:56:17 2003 EDT
Modified files:
/php4/ext/standard filestat.c
Log:
- Fix some of the netware crap
Index: php4/ext/standard/filestat.c
diff -u php4/ext/standard/filestat.c:1.116 php4/ext/standard/filestat.c:1.117
--- php4/ext/standard/filestat.c:1.116 Sat Jan 4 18:55:57 2003
+++ php4/ext/standard/filestat.cSat Jan 4 19:56:17 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.116 2003/01/04 23:55:57 derick Exp $ */
+/* $Id: filestat.c,v 1.117 2003/01/05 00:56:17 derick Exp $ */
#include php.h
#include safe_mode.h
@@ -710,25 +710,25 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unknown file type (%d),
BG(sb).st_modeS_IFMT);
RETURN_STRING(unknown, 1);
case FS_IS_W:
- #ifndef NETWARE /* getuid is not available on NetWare */
+#ifndef NETWARE/* getuid is not available on NetWare */
if (getuid()==0) {
RETURN_TRUE; /* root */
}
- #endif /* NETWARE */
+#endif /* NETWARE */
RETURN_BOOL((BG(sb).st_mode wmask) != 0);
case FS_IS_R:
- #ifndef NETWARE /* getuid is not available on NetWare */
+#ifndef NETWARE/* getuid is not available on NetWare */
if (getuid()==0) {
RETURN_TRUE; /* root */
}
- #endif /* NETWARE */
+#endif /* NETWARE */
RETURN_BOOL((BG(sb).st_modermask)!=0);
case FS_IS_X:
- #ifndef NETWARE /* getuid is not available on NetWare */
+#ifndef NETWARE/* getuid is not available on NetWare */
if (getuid()==0) {
xmask = S_IXROOT; /* root */
}
- #endif /* NETWARE */
+#endif /* NETWARE */
RETURN_BOOL((BG(sb).st_modexmask)!=0 !S_ISDIR(BG(sb).st_mode));
case FS_IS_FILE:
RETURN_BOOL(S_ISREG(BG(sb).st_mode));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c basic_functions.h user_filters.c
pollita Sat Jan 4 22:24:38 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c basic_functions.h
user_filters.c
Log:
Added stream_get_filters(); to list registered filters
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.553
php4/ext/standard/basic_functions.c:1.554
--- php4/ext/standard/basic_functions.c:1.553 Fri Jan 3 03:02:36 2003
+++ php4/ext/standard/basic_functions.c Sat Jan 4 22:24:38 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.553 2003/01/03 08:02:36 pollita Exp $ */
+/* $Id: basic_functions.c,v 1.554 2003/01/05 03:24:38 pollita Exp $ */
#include php.h
#include php_streams.h
@@ -863,6 +863,7 @@
#endif
PHP_FE(str_rot13, NULL)
+ PHP_FE(stream_get_filters, NULL)
PHP_FE(stream_register_filter, NULL)
/* functions from aggregate.c */
Index: php4/ext/standard/basic_functions.h
diff -u php4/ext/standard/basic_functions.h:1.111
php4/ext/standard/basic_functions.h:1.112
--- php4/ext/standard/basic_functions.h:1.111 Tue Dec 31 13:39:34 2002
+++ php4/ext/standard/basic_functions.h Sat Jan 4 22:24:38 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.111 2002/12/31 18:39:34 wez Exp $ */
+/* $Id: basic_functions.h,v 1.112 2003/01/05 03:24:38 pollita Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -105,6 +105,7 @@
PHP_FUNCTION(parse_ini_file);
PHP_FUNCTION(str_rot13);
+PHP_FUNCTION(stream_get_filters);
PHP_FUNCTION(stream_register_filter);
PHP_MINIT_FUNCTION(user_filters);
Index: php4/ext/standard/user_filters.c
diff -u php4/ext/standard/user_filters.c:1.3 php4/ext/standard/user_filters.c:1.4
--- php4/ext/standard/user_filters.c:1.3Wed Jan 1 07:36:06 2003
+++ php4/ext/standard/user_filters.cSat Jan 4 22:24:38 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: user_filters.c,v 1.3 2003/01/01 12:36:06 sebastian Exp $ */
+/* $Id: user_filters.c,v 1.4 2003/01/05 03:24:38 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -410,6 +410,24 @@
static void filter_item_dtor(struct php_user_filter_data *fdat)
{
}
+
+/* {{{ proto array stream_get_filters()
+ Returns a list of registered filters */
+PHP_FUNCTION(stream_get_filters)
+{
+ char *filter_name;
+ int filter_name_len = 0;
+
+ array_init(return_value);
+
+ if (BG(user_filter_map)) {
+ for(zend_hash_internal_pointer_reset(BG(user_filter_map));
+ zend_hash_get_current_key_ex(BG(user_filter_map),
+filter_name, filter_name_len, NULL, 0, NULL) == HASH_KEY_IS_STRING;
+ zend_hash_move_forward(BG(user_filter_map)))
+ add_next_index_string(return_value, filter_name, 1);
+ }
+}
+/* }}} */
/* {{{ proto bool stream_register_filter(string filtername, string classname)
Registers a custom filter handler class */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/standard basic_functions.c basic_functions.h user_filters.c
pollita Sat Jan 4 22:24:38 2003 EDT Modified files: /php4/ext/standardbasic_functions.c basic_functions.h user_filters.c Log: Added stream_get_filters(); to list registered filters How about returning the entire stream structure? -Sterling -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard string.c
iliaa Sat Jan 4 23:29:14 2003 EDT
Modified files:
/php4/ext/standard string.c
Log:
Fixed a memory leak in setlocale() localeconv().
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.341 php4/ext/standard/string.c:1.342
--- php4/ext/standard/string.c:1.341Wed Jan 1 06:04:44 2003
+++ php4/ext/standard/string.c Sat Jan 4 23:29:14 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.341 2003/01/01 11:04:44 wez Exp $ */
+/* $Id: string.c,v 1.342 2003/01/05 04:29:14 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3199,6 +3199,7 @@
cat = LC_TIME;
else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid locale
category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
LC_NUMERIC, or LC_TIME., category);
+ efree(args);
RETURN_FALSE;
}
}
@@ -3742,13 +3743,13 @@
zval *grouping, *mon_grouping;
int len, i;
- MAKE_STD_ZVAL(grouping);
- MAKE_STD_ZVAL(mon_grouping);
-
/* We don't need no stinkin' parameters... */
if (ZEND_NUM_ARGS() 0) {
WRONG_PARAM_COUNT;
}
+
+ MAKE_STD_ZVAL(grouping);
+ MAKE_STD_ZVAL(mon_grouping);
array_init(return_value);
array_init(grouping);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
