[PHP-CVS] cvs: CVSROOT / avail
sas Thu Jul 15 03:38:43 2004 EDT Modified files: /CVSROOTavail Log: pear karma for wenz http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.886r2=1.887ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.886 CVSROOT/avail:1.887 --- CVSROOT/avail:1.886 Sun Jul 4 07:13:41 2004 +++ CVSROOT/avail Thu Jul 15 03:38:42 2004 @@ -51,7 +51,7 @@ # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP tree, the PEAR website, and the PEAR documentation. -avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric|pear,peardoc +avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz|pear,peardoc # PEAR bits in the main php-src module avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog|php-src/pear,pear-core -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
tony2001Thu Jul 15 07:00:14 2004 EDT
Modified files:
/php-src/ext/oci8 oci8.c
Log:
fix #29012 (Potential race during first connection) thanks to cjbj at hotmail dot com
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.256r2=1.257ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.256 php-src/ext/oci8/oci8.c:1.257
--- php-src/ext/oci8/oci8.c:1.256 Mon Jul 12 03:40:05 2004
+++ php-src/ext/oci8/oci8.c Thu Jul 15 07:00:14 2004
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.256 2004/07/12 07:40:05 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.257 2004/07/15 11:00:14 tony2001 Exp $ */
/* TODO list:
*
@@ -786,7 +786,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.256 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.257 $);
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -2673,13 +2673,13 @@
smart_str_0(hashed_details);
if (!exclusive) {
+ mutex_lock(mx_lock);
if (zend_ts_hash_find(persistent_sessions, hashed_details.c,
hashed_details.len+1, (void **) session_list) != SUCCESS) {
zend_llist tmp;
/* first session, set up a session list */
zend_llist_init(tmp, sizeof(oci_session), (llist_dtor_func_t)
_session_pcleanup, 1);
zend_ts_hash_update(persistent_sessions, hashed_details.c,
hashed_details.len+1, tmp, sizeof(zend_llist), (void **) session_list);
} else {
- mutex_lock(mx_lock);
/* session list found, search for an idle session or an
already opened session by the current thread */
session = zend_llist_get_first(session_list);
@@ -2692,7 +2692,6 @@
session-thread = thread_id();
}
- mutex_unlock(mx_lock);
}
if (session) {
@@ -2707,6 +2706,7 @@
/* breakthru to open */
}
}
+ mutex_unlock(mx_lock);
}
session = ecalloc(1,sizeof(oci_session));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Thu Jul 15 07:30:58 2004 EDT Modified files: /CVSROOTavail Log: - Give magnus access so that he can commit his test cases and doesn't have to bother other people with it. http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.887r2=1.888ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.887 CVSROOT/avail:1.888 --- CVSROOT/avail:1.887 Thu Jul 15 03:38:42 2004 +++ CVSROOT/avail Thu Jul 15 07:30:56 2004 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh +avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh # The Livedocs developers -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes bug26737.phpt
magnus Thu Jul 15 07:52:05 2004 EDT
Added files:
/php-src/tests/classes bug26737.phpt
Log:
Test for bug 26737:
Protected and private variables are not saved on serialization
when a user defined __sleep is used.
http://cvs.php.net/co.php/php-src/tests/classes/bug26737.phpt?r=1.1p=1
Index: php-src/tests/classes/bug26737.phpt
+++ php-src/tests/classes/bug26737.phpt
--TEST--
Bug #26737 (Protected and private variables are not saved on serialization when a user
defined __sleep is used)
--FILE--
?php
class foo
{
private $private = 'private';
protected $protected = 'protected';
public $public = 'public';
public function __sleep()
{
return array('private', 'protected', 'public');
}
}
$foo = new foo();
$data = serialize($foo);
var_dump(str_replace(\0, '\0', $data));
?
--EXPECT--
string(114)
O:3:foo:3:{s:12:\0foo\0private;s:7:private;s:12:\0*\0protected;s:9:protected;s:6:public;s:6:public;}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c
kalowskyThu Jul 15 11:09:12 2004 EDT Modified files: /php-src/ext/odbc php_odbc.c Log: Bug 29058 (patch submitted by bug reporter) http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.178r2=1.179ty=u Index: php-src/ext/odbc/php_odbc.c diff -u php-src/ext/odbc/php_odbc.c:1.178 php-src/ext/odbc/php_odbc.c:1.179 --- php-src/ext/odbc/php_odbc.c:1.178 Thu Jun 17 20:44:35 2004 +++ php-src/ext/odbc/php_odbc.c Thu Jul 15 11:09:12 2004 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_odbc.c,v 1.178 2004/06/18 00:44:35 iliaa Exp $ */ +/* $Id: php_odbc.c,v 1.179 2004/07/15 15:09:12 kalowsky Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -3038,7 +3038,7 @@ fschema = Z_STRVAL_PP(pv_fschema); convert_to_string_ex(pv_ftable); ftable = Z_STRVAL_PP(pv_ftable); -#ifdef HAVE_DBMAKER +#if defined(HAVE_DBMAKER) || defined (HAVE_IBMDB2) #define EMPTY_TO_NULL(xstr) \ if ((int)strlen((xstr)) == 0) (xstr) = NULL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
helly Thu Jul 15 18:22:06 2004 EDT
Modified files:
/php-src/main main.c
Log:
- Use ErrorException instead of Exception
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.604r2=1.605ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.604 php-src/main/main.c:1.605
--- php-src/main/main.c:1.604 Fri May 28 10:14:26 2004
+++ php-src/main/main.c Thu Jul 15 18:22:06 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.604 2004/05/28 14:14:26 iliaa Exp $ */
+/* $Id: main.c,v 1.605 2004/07/15 22:22:06 helly Exp $ */
/* {{{ includes
*/
@@ -667,7 +667,7 @@
* but DO NOT overwrite a pending excepption
*/
if (PG(error_handling) == EH_THROW !EG(exception)) {
- zend_throw_exception(PG(exception_class),
buffer, 0 TSRMLS_CC);
+
zend_throw_error_exception(PG(exception_class), buffer, 0, type TSRMLS_CC);
}
efree(buffer);
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /tests/lang bug28800.phpt ZendEngine2 zend_operators.h
iliaa Thu Jul 15 22:02:09 2004 EDT
Added files: (Branch: PHP_5_0)
/php-src/tests/lang bug28800.phpt
Modified files:
/ZendEngine2zend_operators.h
Log:
Fixed bug #28800 (strings beginning with inf improperly converted).
http://cvs.php.net/diff.php/ZendEngine2/zend_operators.h?r1=1.88r2=1.88.2.1ty=u
Index: ZendEngine2/zend_operators.h
diff -u ZendEngine2/zend_operators.h:1.88 ZendEngine2/zend_operators.h:1.88.2.1
--- ZendEngine2/zend_operators.h:1.88 Sat Apr 3 06:09:39 2004
+++ ZendEngine2/zend_operators.hThu Jul 15 22:02:09 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_operators.h,v 1.88 2004/04/03 11:09:39 andi Exp $ */
+/* $Id: zend_operators.h,v 1.88.2.1 2004/07/16 02:02:09 iliaa Exp $ */
#ifndef ZEND_OPERATORS_H
#define ZEND_OPERATORS_H
@@ -87,6 +87,8 @@
*lval = local_lval;
}
return IS_LONG;
+ } else if (end_ptr_long == str *end_ptr_long != '\0') { /* ignore
partial string matches */
+ return 0;
}
} else {
end_ptr_long=NULL;
http://cvs.php.net/co.php/php-src/tests/lang/bug28800.phpt?r=1.1p=1
Index: php-src/tests/lang/bug28800.phpt
+++ php-src/tests/lang/bug28800.phpt
--
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 filestat.c
pollita Fri Jul 16 01:08:16 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard filestat.c
/php-srcNEWS
Log:
Bugfix# 29114 Potential double free in php_stat
http://cvs.php.net/diff.php/php-src/ext/standard/filestat.c?r1=1.112.2.9r2=1.112.2.10ty=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.112.2.9
php-src/ext/standard/filestat.c:1.112.2.10
--- php-src/ext/standard/filestat.c:1.112.2.9 Mon Sep 1 21:23:21 2003
+++ php-src/ext/standard/filestat.c Fri Jul 16 01:08:15 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.112.2.9 2003/09/02 01:23:21 sniper Exp $ */
+/* $Id: filestat.c,v 1.112.2.10 2004/07/16 05:08:15 pollita Exp $ */
#include php.h
#include safe_mode.h
@@ -613,8 +613,11 @@
if (!IS_LINK_OPERATION(type) (!IS_EXISTS_CHECK(type) ||
(errno != ENOENT errno != ENOTDIR))) { /* fileexists() test must print no error */
php_error_docref(NULL TSRMLS_CC, E_WARNING, Stat
failed for %s (errno=%d - %s), BG(CurrentStatFile), errno, strerror(errno));
}
- efree(BG(CurrentStatFile));
- BG(CurrentStatFile) = NULL;
+ /* This could be null if a failed stat leads to a user error
handler which calls a failed stat */
+ if (BG(CurrentStatFile)) {
+ efree(BG(CurrentStatFile));
+ BG(CurrentStatFile) = NULL;
+ }
#if HAVE_SYMLINK
if (!IS_LINK_OPERATION(type)) /* Don't require success for
link operation */
#endif
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.702r2=1.1247.2.703ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.702 php-src/NEWS:1.1247.2.703
--- php-src/NEWS:1.1247.2.702 Thu Jul 15 22:24:45 2004
+++ php-src/NEWSFri Jul 16 01:08:15 2004
@@ -6,7 +6,8 @@
for doing performance stats without warnings in server-log. (Uwe Schindler)
- Fixed bug #29116 (Zend constant warning uses memory after free). (Marcus,
jdolecek at NetBSD dot org)
-- Fixed Bug #29075 (strnatcmp() incorrectly handles whitespace). (Curt, Ilia)
+- Fixed bug #29114 (Potential double free in php_stat). (Sara)
+- Fixed bug #29075 (strnatcmp() incorrectly handles whitespace). (Curt, Ilia)
- Fixed bug #29049 (array sorting via user function/method does not validate
it). (Ilia)
- Fixed bug #29038 (extract() with EXTR_PREFIX_SAME prefixes empty strings).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
