[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt trunk/ext/standard/tests/file
pajoye Tue, 13 Dec 2011 13:46:27 + Revision: http://svn.php.net/viewvc?view=revision&revision=320939 Log: - ignore notices here, not what we test (array to string conversion) Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt 2011-12-13 13:36:26 UTC (rev 320938) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt 2011-12-13 13:46:27 UTC (rev 320939) @@ -36,6 +36,9 @@ ); +/* disable notice so we don't get the array to string conversion notice for "$name" where $name = array() */ +error_reporting(E_ALL ^ E_NOTICE); + echo "*** Testing rename() with obscure files ***\n"; $file_path = dirname(__FILE__)."/renameVar13"; $aFile = $file_path.'/afile.tmp'; Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt 2011-12-13 13:36:26 UTC (rev 320938) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt 2011-12-13 13:46:27 UTC (rev 320939) @@ -36,6 +36,9 @@ ); +/* disable notice so we don't get the array to string conversion notice for "$name" where $name = array() */ +error_reporting(E_ALL ^ E_NOTICE); + echo "*** Testing rename() with obscure files ***\n"; $file_path = dirname(__FILE__)."/renameVar13"; $aFile = $file_path.'/afile.tmp'; Modified: php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt === --- php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt 2011-12-13 13:36:26 UTC (rev 320938) +++ php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt 2011-12-13 13:46:27 UTC (rev 320939) @@ -36,6 +36,9 @@ ); +/* disable notice so we don't get the array to string conversion notice for "$name" where $name = array() */ +error_reporting(E_ALL ^ E_NOTICE); + echo "*** Testing rename() with obscure files ***\n"; $file_path = dirname(__FILE__)."/renameVar13"; $aFile = $file_path.'/afile.tmp'; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
philip Tue, 13 Dec 2011 19:04:15 + Revision: http://svn.php.net/viewvc?view=revision&revision=320958 Log: phpdoc karma for Levi Morrison (levim) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2011-12-13 19:01:05 UTC (rev 320957) +++ SVNROOT/global_avail 2011-12-13 19:04:15 UTC (rev 320958) @@ -47,7 +47,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,danbeck,sli,jmcastagnetto,mohrt,samesch,soneca,ronabop,glace,latoserver,rafael,jcmeloni,chrullrich,mk,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zimt,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,tessus,gavinfo,rant,ramsey,arkadius,erinet,omar,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,asbjornit,philippe,sezer,rmlr,hradtke,alan,danielc,danbrown,alexxed,psalehpoor,loudi,abedford,morgue,nilgun,saltybeagle,dedemorton,eniac2008,jawed,ch,mgdm,ericstewart,mager,keito,juxecl,chx,vito,beverloo,joris,mumumu,brandon,santiago,ajcollison,rbowen,ruslany,satoruyoshida,seld,degeberg,yago,seros,dtajchreber,jwage,ambrish,shein,frozenfire,x1v4nx,carlos,nikola,baijh,nullw0rm,danielb,thijs,orientalcoder,sh_mashaqi,dominis,irfan,dre,marionunes,ditto,mirry,superb,moacir,itanea,vitali,duodraco,craigkitterman,mfonda,nbpoole,ircmaxell,nikic,kassner,lyma,gmsecrieru,cyberline,avb,chunsong,jguerin,honestqiao,cweiske,bradley,till,gooh|phpdoc,phd,web/do
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pdo_firebird/ firebird_driver.c
2011/12/13 Johannes Schlüter : > Hi. > > Is there a test? I will add one to the tree > > And btw. Usually we commit to all branches at once, which makes it > simpler to see if a patch is applied to all branches. I will try to do that in the future , any tip ? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pdo_firebird/ firebird_driver.c
do a sparse checkout and commit all branches at once from php-src, see https://wiki.php.net/vcs/svnfaq :) 2011/12/13 marius adrian popa : > 2011/12/13 Johannes Schlüter : >> Hi. >> >> Is there a test? > I will add one to the tree >> >> And btw. Usually we commit to all branches at once, which makes it >> simpler to see if a patch is applied to all branches. > I will try to do that in the future , any tip ? > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/array/asort_variation5.phpt branches/PHP_5_4/ext/standard/tests/array/asort_variation5.phpt trunk/ext/standard/tests/array/asort_variat
pajoye Tue, 13 Dec 2011 23:04:01 + Revision: http://svn.php.net/viewvc?view=revision&revision=320994 Log: - skip on win Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/array/asort_variation5.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/array/asort_variation5.phpt U php/php-src/trunk/ext/standard/tests/array/asort_variation5.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/array/asort_variation5.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/array/asort_variation5.phpt 2011-12-13 23:01:00 UTC (rev 320993) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/array/asort_variation5.phpt 2011-12-13 23:04:01 UTC (rev 320994) @@ -1,5 +1,10 @@ --TEST-- -Test asort() function : usage variations - sort strings +Test asort() function : usage variations - sort strings +--SKIPIF-- +-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/bug52624.phpt branches/PHP_5_4/ext/standard/tests/file/bug52624.phpt trunk/ext/standard/tests/file/bug52624.phpt
pajoye Tue, 13 Dec 2011 23:18:12 + Revision: http://svn.php.net/viewvc?view=revision&revision=320995 Log: - tmp dir is system depedent Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52624.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug52624.phpt U php/php-src/trunk/ext/standard/tests/file/bug52624.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52624.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52624.phpt 2011-12-13 23:04:01 UTC (rev 320994) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52624.phpt 2011-12-13 23:18:12 UTC (rev 320995) @@ -9,4 +9,4 @@ ?> --EXPECTF-- -Warning: tempnam(): open_basedir restriction in effect. File(/tmp) is not within the allowed path(s): (%s) in %s on line %d +Warning: tempnam(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s) in %s on line %d Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug52624.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug52624.phpt 2011-12-13 23:04:01 UTC (rev 320994) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug52624.phpt 2011-12-13 23:18:12 UTC (rev 320995) @@ -9,4 +9,4 @@ ?> --EXPECTF-- -Warning: tempnam(): open_basedir restriction in effect. File(/tmp) is not within the allowed path(s): (%s) in %s on line %d +Warning: tempnam(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s) in %s on line %d Modified: php/php-src/trunk/ext/standard/tests/file/bug52624.phpt === --- php/php-src/trunk/ext/standard/tests/file/bug52624.phpt 2011-12-13 23:04:01 UTC (rev 320994) +++ php/php-src/trunk/ext/standard/tests/file/bug52624.phpt 2011-12-13 23:18:12 UTC (rev 320995) @@ -9,4 +9,4 @@ ?> --EXPECTF-- -Warning: tempnam(): open_basedir restriction in effect. File(/tmp) is not within the allowed path(s): (%s) in %s on line %d +Warning: tempnam(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s) in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/curl/ config.m4 config.w32 interface.c
pierrick Wed, 14 Dec 2011 03:45:44 +
Revision: http://svn.php.net/viewvc?view=revision&revision=321001
Log:
Remove dead code
# curl_version_info was introduced in 7.10 and the PHP requirement is 7.10.5
Changed paths:
U php/php-src/trunk/ext/curl/config.m4
U php/php-src/trunk/ext/curl/config.w32
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/trunk/ext/curl/config.m4
===
--- php/php-src/trunk/ext/curl/config.m42011-12-14 03:31:55 UTC (rev
321000)
+++ php/php-src/trunk/ext/curl/config.m42011-12-14 03:45:44 UTC (rev
321001)
@@ -131,13 +131,6 @@
$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
])
- PHP_CHECK_LIBRARY(curl,curl_version_info,
- [
-AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ])
- ],[],[
-$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
- ])
-
PHP_CHECK_LIBRARY(curl,curl_easy_strerror,
[
AC_DEFINE(HAVE_CURL_EASY_STRERROR,1,[ ])
Modified: php/php-src/trunk/ext/curl/config.w32
===
--- php/php-src/trunk/ext/curl/config.w32 2011-12-14 03:31:55 UTC (rev
321000)
+++ php/php-src/trunk/ext/curl/config.w32 2011-12-14 03:45:44 UTC (rev
321001)
@@ -18,7 +18,6 @@
AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
AC_DEFINE('HAVE_CURL_EASY_STRERROR', 1, 'Have
curl_easy_strerror in cURL');
AC_DEFINE('HAVE_CURL_MULTI_STRERROR', 1, 'Have
curl_multi_strerror in cURL');
- AC_DEFINE('HAVE_CURL_VERSION_INFO', 1, 'Have curl_version_info
in cURL');
ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");
// TODO: check for curl_version_info
// AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL
wrappers [experimental]');
Modified: php/php-src/trunk/ext/curl/interface.c
===
--- php/php-src/trunk/ext/curl/interface.c 2011-12-14 03:31:55 UTC (rev
321000)
+++ php/php-src/trunk/ext/curl/interface.c 2011-12-14 03:45:44 UTC (rev
321001)
@@ -1141,7 +1141,6 @@
}
#ifdef PHP_CURL_URL_WRAPPERS
-# if HAVE_CURL_VERSION_INFO
{
curl_version_info_data *info =
curl_version_info(CURLVERSION_NOW);
char **p = (char **)info->protocols;
@@ -1155,18 +1154,6 @@
(void) *p++;
}
}
-# else
- php_unregister_url_stream_wrapper("http");
- php_register_url_stream_wrapper("http", &php_curl_wrapper TSRMLS_CC);
- php_unregister_url_stream_wrapper("https");
- php_register_url_stream_wrapper("https", &php_curl_wrapper TSRMLS_CC);
- php_unregister_url_stream_wrapper("ftp");
- php_register_url_stream_wrapper("ftp", &php_curl_wrapper TSRMLS_CC);
- php_unregister_url_stream_wrapper("ftps");
- php_register_url_stream_wrapper("ftps", &php_curl_wrapper TSRMLS_CC);
- php_unregister_url_stream_wrapper("ldap");
- php_register_url_stream_wrapper("ldap", &php_curl_wrapper TSRMLS_CC);
-# endif
#endif
return SUCCESS;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/curl/ interface.c
pierrick Wed, 14 Dec 2011 04:02:56 +
Revision: http://svn.php.net/viewvc?view=revision&revision=321002
Log:
Unregister appropriate curl wrappers
Changed paths:
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/trunk/ext/curl/interface.c
===
--- php/php-src/trunk/ext/curl/interface.c 2011-12-14 03:45:44 UTC (rev
321001)
+++ php/php-src/trunk/ext/curl/interface.c 2011-12-14 04:02:56 UTC (rev
321002)
@@ -1165,10 +1165,18 @@
PHP_MSHUTDOWN_FUNCTION(curl)
{
#ifdef PHP_CURL_URL_WRAPPERS
- php_unregister_url_stream_wrapper("http" TSRMLS_CC);
- php_unregister_url_stream_wrapper("https" TSRMLS_CC);
- php_unregister_url_stream_wrapper("ftp" TSRMLS_CC);
- php_unregister_url_stream_wrapper("ldap" TSRMLS_CC);
+ {
+ curl_version_info_data *info =
curl_version_info(CURLVERSION_NOW);
+ char **p = (char **)info->protocols;
+
+ while (*p != NULL) {
+ /* Do not enable cURL "file" protocol and make sure
cURL is always used when --with-curlwrappers is enabled */
+ if (strncasecmp(*p, "file", sizeof("file")-1) != 0) {
+ php_unregister_url_stream_wrapper(*p TSRMLS_CC);
+ }
+ (void) *p++;
+ }
+ }
#endif
curl_global_cleanup();
#ifdef PHP_CURL_NEED_OPENSSL_TSL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
