[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue May 18 20:34:12 2004 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1631r2=1.1632ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1631 php-src/ChangeLog:1.1632 --- php-src/ChangeLog:1.1631Mon May 17 20:35:44 2004 +++ php-src/ChangeLog Tue May 18 20:34:11 2004 @@ -1,3 +1,63 @@ +2004-05-18 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/ingres_ii/ii.c: + Fixed possible memory leak. + +2004-05-18 Marcus Boerger [EMAIL PROTECTED] + +* tests/strings/002.phpt: + Fix test + +* ZendEngine2/zend_API.c: + - Need to operate on module pointer in hash table + +2004-05-18 Wez Furlong [EMAIL PROTECTED] + +* ZendEngine2/zend_execute_API.c: + Fix bug #28438: win32 build fails in non-zts mode + +2004-05-18 Stanislav Malyshev [EMAIL PROTECTED] + +* ZendEngine2/zend_API.c + ext/standard/dl.c: + Z_TYPE_P is for zvals + +2004-05-18 Wez Furlong [EMAIL PROTECTED] + +* ext/standard/dl.c: + Fix dl() and extension= + +* ZendEngine2/zend_API.c: + Register according to the type specified by the module. + (Helps to fix dl() bug) + +2004-05-18 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS + ext/standard/exec.c: + MFH: Fixed command line escaping routines for win32. + +* ext/standard/exec.c: + Fixed command line escaping routines for win32. + +2004-05-18 Edin Kadribasic [EMAIL PROTECTED] + +* ext/pspell/pspell.c: + Move declarations to the begining of function. + This allows it to actually compile on windows. + +* ext/sybase_ct/php_sybase_ct.c: + TSRM fix + +* ext/sockets/sockets.c: + No length parameter - estrdup() + +2004-05-18 Sara Golemon [EMAIL PROTECTED] + +* ZendEngine2/zend_execute.c: + Bugfix#28404 When type is double we need to access dval, not lval + 2004-05-17 Ilia Alshanetsky [EMAIL PROTECTED] * ext/standard/tests/strings/bug26973.phpt @@ -3385,7 +3445,7 @@ 2004-03-18 Pierre-Alain Joye [EMAIL PROTECTED] * ext/gd/tests/bug27582_2.phpt: - - Fix the test description and $Id: ChangeLog,v 1.1631 2004/05/18 00:35:44 changelog Exp $ + - Fix the test description and $Id: ChangeLog,v 1.1632 2004/05/19 00:34:11 changelog Exp $ 2004-03-18 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Tue May 18 05:58:45 2004 EDT Modified files: /php-src/win32/buildconfutils.js Log: Primitive support for probing headers for functions using a regexp http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.40r2=1.41ty=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.40 php-src/win32/build/confutils.js:1.41 --- php-src/win32/build/confutils.js:1.40 Wed Apr 28 20:17:09 2004 +++ php-src/win32/build/confutils.jsTue May 18 05:58:45 2004 @@ -17,7 +17,7 @@ +--+ */ -// $Id: confutils.js,v 1.40 2004/04/29 00:17:09 wez Exp $ +// $Id: confutils.js,v 1.41 2004/05/18 09:58:45 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -708,6 +708,64 @@ } +function CHECK_FUNC_IN_HEADER(header_name, func_name, path_to_check) +{ + var c = false; + var sym; + + STDOUT.Write(Checking for + func_name + in + header_name + ... ); + + c = GREP_HEADER(header_name, func_name, path_to_check); + + sym = func_name.toUpperCase(); + sym = sym.replace(new RegExp([/\.-], g), _); + + AC_DEFINE(HAVE_ + sym, c ? 1 : 0); + + if (c) { + STDOUT.WriteLine(OK); + return c; + } + STDOUT.WriteLine(No); + return false; +} + +function GREP_HEADER(header_name, regex, path_to_check) +{ + var c = false; + + if (FSO.FileExists(path_to_check + \\ + header_name)) { + c = file_get_contents(path_to_check + \\ + header_name); + } + + if (!c) { + /* look in the include path */ + + var p = search_paths(header_name, path_to_check, INCLUDE); + if (typeof(p) == string) { + c = file_get_contents(p); + } else if (p == false) { + p = search_paths(header_name, PHP_EXTRA_INCLUDES, null); + if (typeof(p) == string) { + c = file_get_contents(p); + } + } + if (!c) { + return false; + } + } + + if (typeof(regex) == string) { + regex = new RegExp(regex); + } + + if (c.match(regex)) { + /* caller can now use RegExp.$1 etc. to get at patterns */ + return true; + } + return false; +} + function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env, add_dir_part) { var dir_part_to_add = ; @@ -853,10 +911,15 @@ function file_get_contents(filename) { var f, c; - f = FSO.OpenTextFile(filename, 1); - c = f.ReadAll(); - f.Close(); - return c; + try { + f = FSO.OpenTextFile(filename, 1); + c = f.ReadAll(); + f.Close(); + return c; + } catch (e) { + STDOUT.WriteLine(Problem reading + filename); + return false; + } } // Add a dependency on another extension, so that -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sockets sockets.c
edink Tue May 18 06:49:06 2004 EDT Modified files: /php-src/ext/socketssockets.c Log: No length parameter - estrdup() http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.162r2=1.163ty=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.162 php-src/ext/sockets/sockets.c:1.163 --- php-src/ext/sockets/sockets.c:1.162 Sun May 16 11:34:53 2004 +++ php-src/ext/sockets/sockets.c Tue May 18 06:49:06 2004 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: sockets.c,v 1.162 2004/05/16 15:34:53 iliaa Exp $ */ +/* $Id: sockets.c,v 1.163 2004/05/18 10:49:06 edink Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -336,7 +336,7 @@ if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) tmp, 0, NULL)) { - SOCKETS_G(strerror_buf) = estrndup(tmp); + SOCKETS_G(strerror_buf) = estrdup(tmp); LocalFree(tmp); buf = SOCKETS_G(strerror_buf); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sockets sockets.c
edink Tue May 18 08:17:40 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/socketssockets.c Log: MFH http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.125.2.21r2=1.125.2.22ty=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.125.2.21 php-src/ext/sockets/sockets.c:1.125.2.22 --- php-src/ext/sockets/sockets.c:1.125.2.21Sun May 16 11:34:56 2004 +++ php-src/ext/sockets/sockets.c Tue May 18 08:17:40 2004 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: sockets.c,v 1.125.2.21 2004/05/16 15:34:56 iliaa Exp $ */ +/* $Id: sockets.c,v 1.125.2.22 2004/05/18 12:17:40 edink Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -364,7 +364,7 @@ if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) tmp, 0, NULL)) { - SOCKETS_G(strerror_buf) = estrndup(tmp); + SOCKETS_G(strerror_buf) = estrdup(tmp); LocalFree(tmp); buf = SOCKETS_G(strerror_buf); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pspell pspell.c
edink Tue May 18 08:32:05 2004 EDT Modified files: /php-src/ext/pspell pspell.c Log: Move declarations to the begining of function. This allows it to actually compile on windows. http://cvs.php.net/diff.php/php-src/ext/pspell/pspell.c?r1=1.43r2=1.44ty=u Index: php-src/ext/pspell/pspell.c diff -u php-src/ext/pspell/pspell.c:1.43 php-src/ext/pspell/pspell.c:1.44 --- php-src/ext/pspell/pspell.c:1.43Thu Feb 12 21:20:20 2004 +++ php-src/ext/pspell/pspell.c Tue May 18 08:32:05 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pspell.c,v 1.43 2004/02/13 02:20:20 iliaa Exp $ */ +/* $Id: pspell.c,v 1.44 2004/05/18 12:32:05 edink Exp $ */ #define IS_EXT_MODULE @@ -623,20 +623,20 @@ int ind; PspellConfig *config; + +#ifdef PHP_WIN32 + TCHAR aspell_dir[200]; + TCHAR data_dir[220]; + TCHAR dict_dir[220]; + HKEY hkey; + DWORD dwType,dwLen; +#endif argc = ZEND_NUM_ARGS(); if (argc 1 || argc 4 || zend_get_parameters_ex(argc,language,spelling,jargon,encoding) == FAILURE) { WRONG_PARAM_COUNT; } -#ifdef PHP_WIN32 -TCHAR aspell_dir[200]; -TCHAR data_dir[220]; -TCHAR dict_dir[220]; -HKEY hkey; -DWORD dwType,dwLen; -#endif - config = new_pspell_config(); #ifdef PHP_WIN32 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard exec.c
iliaa Tue May 18 09:43:25 2004 EDT Modified files: /php-src/ext/standard exec.c Log: Fixed command line escaping routines for win32. http://cvs.php.net/diff.php/php-src/ext/standard/exec.c?r1=1.109r2=1.110ty=u Index: php-src/ext/standard/exec.c diff -u php-src/ext/standard/exec.c:1.109 php-src/ext/standard/exec.c:1.110 --- php-src/ext/standard/exec.c:1.109 Wed Jan 21 11:57:13 2004 +++ php-src/ext/standard/exec.c Tue May 18 09:43:24 2004 @@ -16,7 +16,7 @@ | Ilia Alshanetsky [EMAIL PROTECTED] | +--+ */ -/* $Id: exec.c,v 1.109 2004/01/21 16:57:13 iliaa Exp $ */ +/* $Id: exec.c,v 1.110 2004/05/18 13:43:24 iliaa Exp $ */ #include stdio.h #include php.h @@ -269,6 +269,7 @@ switch (str[x]) { case '': case '\'': +#ifndef PHP_WIN32 if (!p (p = memchr(str + x + 1, str[x], l - x - 1))) { /* noop */ } else if (p *p == str[x]) { @@ -278,6 +279,7 @@ } cmd[y++] = str[x]; break; +#endif case '#': /* This is character-set independent */ case '': case ';': @@ -299,6 +301,12 @@ case '\\': case '\x0A': /* excluding these two */ case '\xFF': +#ifdef PHP_WIN32 + /* since Windows does not allow us to escape these chars, just remove them */ + case '%': + cmd[y++] = ' '; + break; +#endif cmd[y++] = '\\'; /* fall-through */ default: @@ -332,7 +340,9 @@ switch (str[x]) { #ifdef PHP_WIN32 case '': - cmd[y++] = '\\'; + case '%': + cmd[y++] = ' '; + break; #else case '\'': cmd[y++] = '\''; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard exec.c
iliaa Tue May 18 09:43:33 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/standard exec.c Log: MFH: Fixed command line escaping routines for win32. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.662r2=1.1247.2.663ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.662 php-src/NEWS:1.1247.2.663 --- php-src/NEWS:1.1247.2.662 Sun May 16 17:20:29 2004 +++ php-src/NEWSTue May 18 09:43:33 2004 @@ -2,6 +2,7 @@ ||| ?? ??? 2004, Version 4.3.7 - Upgraded bundled GD library to 2.0.23. (Ilia) +- Fixed command line escaping routines for win32. (Ilia) - Fixed problems with *printf() functions and '%f' formatting. (Marcus) - Fixed possible crash inside pg_copy_(to|from) function if delimiter is more then 1 character long. (Ilia) http://cvs.php.net/diff.php/php-src/ext/standard/exec.c?r1=1.84.2.13r2=1.84.2.14ty=u Index: php-src/ext/standard/exec.c diff -u php-src/ext/standard/exec.c:1.84.2.13 php-src/ext/standard/exec.c:1.84.2.14 --- php-src/ext/standard/exec.c:1.84.2.13 Wed Nov 19 10:34:36 2003 +++ php-src/ext/standard/exec.c Tue May 18 09:43:33 2004 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf | +--+ */ -/* $Id: exec.c,v 1.84.2.13 2003/11/19 15:34:36 iliaa Exp $ */ +/* $Id: exec.c,v 1.84.2.14 2004/05/18 13:43:33 iliaa Exp $ */ #include stdio.h #include php.h @@ -410,6 +410,7 @@ switch (str[x]) { case '': case '\'': +#ifndef PHP_WIN32 if (!p (p = memchr(str + x + 1, str[x], l - x - 1))) { /* noop */ } else if (p *p == str[x]) { @@ -419,6 +420,7 @@ } cmd[y++] = str[x]; break; +#endif case '#': /* This is character-set independent */ case '': case ';': @@ -440,6 +442,12 @@ case '\\': case '\x0A': /* excluding these two */ case '\xFF': +#ifdef PHP_WIN32 + /* since Windows does not allow us to escape these chars, just remove them */ + case '%': + cmd[y++] = ' '; + break; +#endif cmd[y++] = '\\'; /* fall-through */ default: @@ -472,7 +480,9 @@ switch (str[x]) { #ifdef PHP_WIN32 case '': - cmd[y++] = '\\'; + case '%': + cmd[y++] = ' '; + break; #else case '\'': cmd[y++] = '\''; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dl.c
wez Tue May 18 11:26:32 2004 EDT Modified files: /php-src/ext/standard dl.c Log: Fix dl() and extension= http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.89r2=1.90ty=u Index: php-src/ext/standard/dl.c diff -u php-src/ext/standard/dl.c:1.89 php-src/ext/standard/dl.c:1.90 --- php-src/ext/standard/dl.c:1.89 Sat May 1 16:34:15 2004 +++ php-src/ext/standard/dl.c Tue May 18 11:26:32 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: dl.c,v 1.89 2004/05/01 20:34:15 helly Exp $ */ +/* $Id: dl.c,v 1.90 2004/05/18 15:26:32 wez Exp $ */ #include php.h #include dl.h @@ -108,8 +108,6 @@ zend_module_entry *(*get_module)(void); int error_type; char *extension_dir; - int name_len; - char *lcname; if (type==MODULE_PERSISTENT) { /* Use the configuration hash directly, the INI mechanism is not yet initialized */ @@ -236,25 +234,9 @@ DL_UNLOAD(handle); RETURN_FALSE; } - name_len = strlen(module_entry-name); - lcname = zend_str_tolower_dup(module_entry-name, name_len); - if (zend_hash_exists(module_registry, lcname, name_len+1)) { - efree(lcname); - php_error_docref(NULL TSRMLS_CC, error_type, Module '%s' already loaded, module_entry-name); - DL_UNLOAD(handle); - RETURN_FALSE; - } - efree(lcname); Z_TYPE_P(module_entry) = type; module_entry-module_number = zend_next_free_module(); - if (module_entry-module_startup_func) { - if (module_entry-module_startup_func(type, module_entry-module_number TSRMLS_CC)==FAILURE) { - php_error_docref(NULL TSRMLS_CC, error_type, Unable to initialize module '%s', module_entry-name); - DL_UNLOAD(handle); - RETURN_FALSE; - } - } - zend_register_module(module_entry); + zend_register_module_ex(module_entry TSRMLS_CC); if ((type == MODULE_TEMPORARY) module_entry-request_startup_func) { if (module_entry-request_startup_func(type, module_entry-module_number TSRMLS_CC)) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dl.c
stasTue May 18 12:13:58 2004 EDT Modified files: /php-src/ext/standard dl.c Log: Z_TYPE_P is for zvals http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.90r2=1.91ty=u Index: php-src/ext/standard/dl.c diff -u php-src/ext/standard/dl.c:1.90 php-src/ext/standard/dl.c:1.91 --- php-src/ext/standard/dl.c:1.90 Tue May 18 11:26:32 2004 +++ php-src/ext/standard/dl.c Tue May 18 12:13:57 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: dl.c,v 1.90 2004/05/18 15:26:32 wez Exp $ */ +/* $Id: dl.c,v 1.91 2004/05/18 16:13:57 stas Exp $ */ #include php.h #include dl.h @@ -234,7 +234,7 @@ DL_UNLOAD(handle); RETURN_FALSE; } - Z_TYPE_P(module_entry) = type; + module_entry-type = type; module_entry-module_number = zend_next_free_module(); zend_register_module_ex(module_entry TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
helly Tue May 18 16:39:35 2004 EDT Modified files: /php-src/ext/splspl_iterators.c Log: - Make start and length parameter to Limititerator::__construct optional http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.35r2=1.36ty=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.35 php-src/ext/spl/spl_iterators.c:1.36 --- php-src/ext/spl/spl_iterators.c:1.35Thu May 6 05:01:31 2004 +++ php-src/ext/spl/spl_iterators.c Tue May 18 16:39:35 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.c,v 1.35 2004/05/06 09:01:31 helly Exp $ */ +/* $Id: spl_iterators.c,v 1.36 2004/05/18 20:39:35 helly Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -563,8 +563,9 @@ intern-dit_type = dit_type; switch (dit_type) { case DIT_LimitIterator: { + intern-u.limit.offset = 0; /* start at beginning */ intern-u.limit.count = -1; /* get all */ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Ol|l, zobject, ce_inner, intern-u.limit.offset, intern-u.limit.count) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, O|ll, zobject, ce_inner, intern-u.limit.offset, intern-u.limit.count) == FAILURE) { php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC); return NULL; } @@ -984,7 +985,7 @@ } } -/* {{{ proto LimitIterator:__construct(Iterator $it, int $offset [, int $count]) +/* {{{ proto LimitIterator:__construct(Iterator $it [, int $offset, int $count]) Construct a LimitIterator from an Iterator with a given starting offset and optionally a maximum count */ SPL_METHOD(LimitIterator, __construct) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build Makefile
wez Tue May 18 17:07:02 2004 EDT Modified files: /php-src/win32/buildMakefile Log: Fix #27638: not cleaning up object files in win32 build http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.21r2=1.22ty=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.21 php-src/win32/build/Makefile:1.22 --- php-src/win32/build/Makefile:1.21 Thu Feb 12 12:58:52 2004 +++ php-src/win32/build/MakefileTue May 18 17:07:01 2004 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.21 2004/02/12 17:58:52 wez Exp $ +# $Id: Makefile,v 1.22 2004/05/18 21:07:01 wez Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -72,7 +72,7 @@ clean: clean-sapi @echo Cleaning build dirs - @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist @del /F /Q %D\*.* NUL + @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* NUL [EMAIL PROTECTED] /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip NUL -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/strings 002.phpt
helly Tue May 18 17:27:08 2004 EDT Modified files: /php-src/tests/strings 002.phpt Log: Fix test http://cvs.php.net/diff.php/php-src/tests/strings/002.phpt?r1=1.8r2=1.9ty=u Index: php-src/tests/strings/002.phpt diff -u php-src/tests/strings/002.phpt:1.8 php-src/tests/strings/002.phpt:1.9 --- php-src/tests/strings/002.phpt:1.8 Mon May 17 16:58:57 2004 +++ php-src/tests/strings/002.phpt Tue May 18 17:27:08 2004 @@ -1,13 +1,12 @@ --TEST-- Formatted print functions ---POST-- ---GET-- --FILE-- ?php error_reporting(0); $fp = fopen(php://stdout, w) or die(Arrggsgg!!); -$x = fprintf($fp, fprintf test 1:%.5s\n, abcdefghij); +$x = fprintf($fp, fprintf test 1:%.5s, abcdefghij); +echo \n; var_dump($x); printf(printf test 1:%s\n, simple string); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/ingres_ii ii.c
iliaa Tue May 18 19:26:45 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/ingres_ii ii.c Log: MFH: Fixed possible memory leak. http://cvs.php.net/diff.php/php-src/ext/ingres_ii/ii.c?r1=1.31.8.3r2=1.31.8.4ty=u Index: php-src/ext/ingres_ii/ii.c diff -u php-src/ext/ingres_ii/ii.c:1.31.8.3 php-src/ext/ingres_ii/ii.c:1.31.8.4 --- php-src/ext/ingres_ii/ii.c:1.31.8.3 Fri Feb 21 01:46:27 2003 +++ php-src/ext/ingres_ii/ii.c Tue May 18 19:26:45 2004 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: ii.c,v 1.31.8.3 2003/02/21 06:46:27 sniper Exp $ */ +/* $Id: ii.c,v 1.31.8.4 2004/05/18 23:26:45 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -541,6 +541,7 @@ } else { /* already open persistent connection */ if (Z_TYPE_P(le) != le_ii_plink) { + efree(hashed_details); RETURN_FALSE; } /* here we should ensure that the link did not die */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php