[PHP-CVS] svn: /php/php-src/trunk/ext/sybase_ct/ config.m4
thekid Wed, 08 Jun 2011 08:14:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311917
Log:
- Changed output to be more verbose as to what libraries are used
- Changed check for 64-bit vs 32-bit build environment to check sizeof(int)
instead of assuming that if libsybct64.so exists, it must be 64-bit
# Bug #53540: Correct Sybase 15.0 libraries not found by configure
Bug: http://bugs.php.net/53540 (Assigned) Correct Sybase 15.0 libraries not
found by configure
Changed paths:
U php/php-src/trunk/ext/sybase_ct/config.m4
Modified: php/php-src/trunk/ext/sybase_ct/config.m4
===
--- php/php-src/trunk/ext/sybase_ct/config.m4 2011-06-08 06:14:40 UTC (rev
311916)
+++ php/php-src/trunk/ext/sybase_ct/config.m4 2011-06-08 08:14:49 UTC (rev
311917)
@@ -15,7 +15,7 @@
AC_DEFINE(HAVE_SYBASE_CT,1,[ ])
PHP_NEW_EXTENSION(sybase_ct, php_sybase_ct.c, $ext_shared)
PHP_SUBST(SYBASE_CT_SHARED_LIBADD)
-
+
if test $PHP_SYBASE_CT = yes; then
SYBASE_CT_INCDIR=/home/sybase/include
SYBASE_CT_LIBDIR=/home/sybase/lib
@@ -24,17 +24,37 @@
SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib
fi
+ dnl Determine whether we're building 64 or 32 bit...
+ AC_CHECK_SIZEOF(long int, 4)
+ AC_MSG_CHECKING([checking if we're on a 64-bit platform])
+ if test $ac_cv_sizeof_long_int = 4; then
+AC_MSG_RESULT([no])
+PHP_SYBASE_64=no
+ else
+AC_MSG_RESULT([yes])
+PHP_SYBASE_64=yes
+ fi
+
+
+ AC_MSG_CHECKING([Checking for ctpublic.h])
if test -f $SYBASE_CT_INCDIR/ctpublic.h; then
+AC_MSG_RESULT([found in $SYBASE_CT_INCDIR])
PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
else
AC_MSG_ERROR([ctpublic.h missing!])
fi
-
+
+ AC_MSG_CHECKING([Checking Sybase libdir])
+ AC_MSG_RESULT([Have $SYBASE_CT_LIBDIR])
+
+ AC_MSG_CHECKING([Checking for Sybase platform libraries])
+
PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
if test -f $SYBASE_CT_INCDIR/tds.h || test -f
$SYBASE_CT_INCDIR/tds_sysdep_public.h; then
PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
SYBASE_CT_LIBS=-L$SYBASE_CT_LIBDIR -lct
- elif test -f $SYBASE_CT_INCDIR/libsybct64.so; then
+AC_MSG_RESULT([FreeTDS: $SYBASE_CT_LIBS])
+ elif test -f $SYBASE_CT_LIBDIR/libsybct64.so test $PHP_SYBASE_64 = yes;
then
PHP_ADD_LIBRARY(sybcs64,, SYBASE_CT_SHARED_LIBADD)
PHP_ADD_LIBRARY(sybct64,, SYBASE_CT_SHARED_LIBADD)
PHP_ADD_LIBRARY(sybcomn64,, SYBASE_CT_SHARED_LIBADD)
@@ -46,6 +66,7 @@
*) CFLAGS=${CFLAGS} -DSYB_LP64 ;; #
esac
SYBASE_CT_LIBS=-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64
-lsybintl64
+AC_MSG_RESULT([Sybase64: $SYBASE_CT_LIBS])
PHP_CHECK_LIBRARY(sybtcl64, netg_errstr, [
PHP_ADD_LIBRARY(sybtcl64,,SYBASE_CT_SHARED_LIBADD)
@@ -57,13 +78,14 @@
PHP_CHECK_LIBRARY(insck64, insck__getVdate, [PHP_ADD_LIBRARY(insck64,,
SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
PHP_CHECK_LIBRARY(insck64, bsd_tcp, [PHP_ADD_LIBRARY(insck64,,
SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
- elif test -f $SYBASE_CT_INCDIR/libsybct.so; then
+ elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then
PHP_ADD_LIBRARY(sybcs,, SYBASE_CT_SHARED_LIBADD)
PHP_ADD_LIBRARY(sybct,, SYBASE_CT_SHARED_LIBADD)
PHP_ADD_LIBRARY(sybcomn,, SYBASE_CT_SHARED_LIBADD)
PHP_ADD_LIBRARY(sybintl,, SYBASE_CT_SHARED_LIBADD)
SYBASE_CT_LIBS=-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl
+AC_MSG_RESULT([Sybase32 syb-prefix: $SYBASE_CT_LIBS])
PHP_CHECK_LIBRARY(sybtcl, netg_errstr, [
PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
@@ -82,6 +104,7 @@
PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
SYBASE_CT_LIBS=-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl
+AC_MSG_RESULT([Sybase32 default: $SYBASE_CT_LIBS])
PHP_CHECK_LIBRARY(tcl, netg_errstr, [
PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
--
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/sapi/litespeed/ lsapilib.c
gwangWed, 08 Jun 2011 16:51:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311935
Log:
fix socket address parsing code
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/litespeed/lsapilib.c
Modified: php/php-src/branches/PHP_5_3/sapi/litespeed/lsapilib.c
===
--- php/php-src/branches/PHP_5_3/sapi/litespeed/lsapilib.c 2011-06-08
16:46:31 UTC (rev 311934)
+++ php/php-src/branches/PHP_5_3/sapi/litespeed/lsapilib.c 2011-06-08
16:51:59 UTC (rev 311935)
@@ -1453,7 +1453,7 @@
return -1;
}
-while( isspace( *p ) ) {
+while( isspace( *pBind ) ) {
++pBind;
}
@@ -1509,7 +1509,7 @@
}
port = atoi( pEnd );
-if (( port = 0 )||( port 655535 )) {
+if (( port = 0 )||( port 65535 )) {
return -1;
}
if ( doAddrInfo ) {
--
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/sapi/litespeed/ lsapilib.c
Hi 2011/6/8 George Wang gw...@php.net: gwang Wed, 08 Jun 2011 16:51:59 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311935 Log: fix socket address parsing code Merge to PHP_5_4 and trunk? -- regards, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
rasmus Wed, 08 Jun 2011 21:27:07 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311949 Log: 2 new phpdoc accounts Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2011-06-08 21:24:51 UTC (rev 311948) +++ SVNROOT/global_avail 2011-06-08 21:27:07 UTC (rev 311949) @@ -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|phpdoc,phd,web/doc,web/doc-editor
[PHP-CVS] svn: /SVNROOT/ global_avail
rasmus Wed, 08 Jun 2011 21:31:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311950 Log: Another contributor Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2011-06-08 21:27:07 UTC (rev 311949) +++ SVNROOT/global_avail 2011-06-08 21:31:13 UTC (rev 311950) @@ -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|phpdoc,phd,web/doc,web/doc-editor
Re: [PHP-CVS] svn: /php/php-src/trunk/ext/sybase_ct/ config.m4
Hi,
5.3 and 5.4 branches also needs this fix.
New report about such build failure: http://bugs.php.net/55009
Thanks.
2011/6/8 Timm Friebe the...@php.net
thekid Wed, 08 Jun 2011 08:14:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311917
Log:
- Changed output to be more verbose as to what libraries are used
- Changed check for 64-bit vs 32-bit build environment to check sizeof(int)
instead of assuming that if libsybct64.so exists, it must be 64-bit
# Bug #53540: Correct Sybase 15.0 libraries not found by configure
Bug: http://bugs.php.net/53540 (Assigned) Correct Sybase 15.0 libraries
not found by configure
Changed paths:
U php/php-src/trunk/ext/sybase_ct/config.m4
Modified: php/php-src/trunk/ext/sybase_ct/config.m4
===
--- php/php-src/trunk/ext/sybase_ct/config.m4 2011-06-08 06:14:40 UTC
(rev 311916)
+++ php/php-src/trunk/ext/sybase_ct/config.m4 2011-06-08 08:14:49 UTC
(rev 311917)
@@ -15,7 +15,7 @@
AC_DEFINE(HAVE_SYBASE_CT,1,[ ])
PHP_NEW_EXTENSION(sybase_ct, php_sybase_ct.c, $ext_shared)
PHP_SUBST(SYBASE_CT_SHARED_LIBADD)
-
+
if test $PHP_SYBASE_CT = yes; then
SYBASE_CT_INCDIR=/home/sybase/include
SYBASE_CT_LIBDIR=/home/sybase/lib
@@ -24,17 +24,37 @@
SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib
fi
+ dnl Determine whether we're building 64 or 32 bit...
+ AC_CHECK_SIZEOF(long int, 4)
+ AC_MSG_CHECKING([checking if we're on a 64-bit platform])
+ if test $ac_cv_sizeof_long_int = 4; then
+AC_MSG_RESULT([no])
+PHP_SYBASE_64=no
+ else
+AC_MSG_RESULT([yes])
+PHP_SYBASE_64=yes
+ fi
+
+
+ AC_MSG_CHECKING([Checking for ctpublic.h])
if test -f $SYBASE_CT_INCDIR/ctpublic.h; then
+AC_MSG_RESULT([found in $SYBASE_CT_INCDIR])
PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
else
AC_MSG_ERROR([ctpublic.h missing!])
fi
-
+
+ AC_MSG_CHECKING([Checking Sybase libdir])
+ AC_MSG_RESULT([Have $SYBASE_CT_LIBDIR])
+
+ AC_MSG_CHECKING([Checking for Sybase platform libraries])
+
PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
if test -f $SYBASE_CT_INCDIR/tds.h || test -f
$SYBASE_CT_INCDIR/tds_sysdep_public.h; then
PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
SYBASE_CT_LIBS=-L$SYBASE_CT_LIBDIR -lct
- elif test -f $SYBASE_CT_INCDIR/libsybct64.so; then
+AC_MSG_RESULT([FreeTDS: $SYBASE_CT_LIBS])
+ elif test -f $SYBASE_CT_LIBDIR/libsybct64.so test $PHP_SYBASE_64 =
yes; then
PHP_ADD_LIBRARY(sybcs64,, SYBASE_CT_SHARED_LIBADD)
PHP_ADD_LIBRARY(sybct64,, SYBASE_CT_SHARED_LIBADD)
PHP_ADD_LIBRARY(sybcomn64,, SYBASE_CT_SHARED_LIBADD)
@@ -46,6 +66,7 @@
*) CFLAGS=${CFLAGS} -DSYB_LP64 ;; #
esac
SYBASE_CT_LIBS=-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64
-lsybintl64
+AC_MSG_RESULT([Sybase64: $SYBASE_CT_LIBS])
PHP_CHECK_LIBRARY(sybtcl64, netg_errstr, [
PHP_ADD_LIBRARY(sybtcl64,,SYBASE_CT_SHARED_LIBADD)
@@ -57,13 +78,14 @@
PHP_CHECK_LIBRARY(insck64, insck__getVdate, [PHP_ADD_LIBRARY(insck64,,
SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
PHP_CHECK_LIBRARY(insck64, bsd_tcp, [PHP_ADD_LIBRARY(insck64,,
SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
- elif test -f $SYBASE_CT_INCDIR/libsybct.so; then
+ elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then
PHP_ADD_LIBRARY(sybcs,, SYBASE_CT_SHARED_LIBADD)
PHP_ADD_LIBRARY(sybct,, SYBASE_CT_SHARED_LIBADD)
PHP_ADD_LIBRARY(sybcomn,, SYBASE_CT_SHARED_LIBADD)
PHP_ADD_LIBRARY(sybintl,, SYBASE_CT_SHARED_LIBADD)
SYBASE_CT_LIBS=-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn
-lsybintl
+AC_MSG_RESULT([Sybase32 syb-prefix: $SYBASE_CT_LIBS])
PHP_CHECK_LIBRARY(sybtcl, netg_errstr, [
PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
@@ -82,6 +104,7 @@
PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
SYBASE_CT_LIBS=-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl
+AC_MSG_RESULT([Sybase32 default: $SYBASE_CT_LIBS])
PHP_CHECK_LIBRARY(tcl, netg_errstr, [
PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Regards,
Felipe Pena
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt trunk/ext/dom/tests
iliaaWed, 08 Jun 2011 23:30:02 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311955 Log: Fixed test Changed paths: U php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt U php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt U php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt Modified: php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt === --- php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt 2011-06-08 22:20:38 UTC (rev 311954) +++ php/php-src/branches/PHP_5_3/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt 2011-06-08 23:30:02 UTC (rev 311955) @@ -42,6 +42,10 @@ No Error Report Above validateOnParse set to TRUE: +Warning: DOMDocument::loadXML(): Entity 'nbsp' not defined in Entity, line: %d in %s on line %d + +Warning: DOMDocument::loadXML(): Entity 'copy' not defined in Entity, line: %d in %s on line %d + Warning: DOMDocument::loadXML(): No declaration for element NYPHP in Entity, line: %d in %s on line %d Warning: DOMDocument::loadXML(): Element body content does not follow the DTD, expecting (p | h1 | h2 | h3 | h4 | h5 | h6 | div | ul | ol | dl | pre | hr | blockquote | address | fieldset | table | form | noscript | ins | del | script)*, got (div div div div div NYPHP) in Entity, line: %d in %s on line %d Modified: php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt === --- php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt 2011-06-08 22:20:38 UTC (rev 311954) +++ php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt 2011-06-08 23:30:02 UTC (rev 311955) @@ -39,6 +39,10 @@ No Error Report Above validateOnParse set to TRUE: +Warning: DOMDocument::loadXML(): Entity 'nbsp' not defined in Entity, line: %d in %s on line %d + +Warning: DOMDocument::loadXML(): Entity 'copy' not defined in Entity, line: %d in %s on line %d + Warning: DOMDocument::loadXML(): No declaration for element NYPHP in Entity, line: %d in %s on line %d Warning: DOMDocument::loadXML(): Element from was declared #PCDATA but contains non text nodes in Entity, line: %d in %s on line %d Modified: php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt === --- php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt 2011-06-08 22:20:38 UTC (rev 311954) +++ php/php-src/trunk/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt 2011-06-08 23:30:02 UTC (rev 311955) @@ -39,6 +39,10 @@ No Error Report Above validateOnParse set to TRUE: +Warning: DOMDocument::loadXML(): Entity 'nbsp' not defined in Entity, line: %d in %s on line %d + +Warning: DOMDocument::loadXML(): Entity 'copy' not defined in Entity, line: %d in %s on line %d + Warning: DOMDocument::loadXML(): No declaration for element NYPHP in Entity, line: %d in %s on line %d Warning: DOMDocument::loadXML(): Element from was declared #PCDATA but contains non text nodes in Entity, line: %d 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/ branches/PHP_5_4/Zend/zend_API.c branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt branches/PHP_5_4/ext/phar/tests/opendir_edgecases.phpt branches/PHP_5_4/ext/standard
felipe Thu, 09 Jun 2011 00:23:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=311956 Log: - Missing fixes for grammar fix 's/valid path/a valid path/' Changed paths: U php/php-src/branches/PHP_5_4/Zend/zend_API.c U php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt U php/php-src/branches/PHP_5_4/ext/phar/tests/opendir_edgecases.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/dir/chdir_variation1.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/dir/scandir_variation1.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/007_error.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/chmod_variation3.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation2.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation2.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation2.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation2.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation3.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_executable_variation3.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_error.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation3.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation3.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation3.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/lchown_error.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/lstat_stat_error.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/file/parse_ini_file_variation4.phpt U php/php-src/trunk/Zend/zend_API.c U php/php-src/trunk/ext/phar/tests/fopen_edgecases2.phpt U php/php-src/trunk/ext/phar/tests/opendir_edgecases.phpt U php/php-src/trunk/ext/standard/tests/dir/chdir_variation1.phpt U php/php-src/trunk/ext/standard/tests/dir/scandir_variation1.phpt U php/php-src/trunk/ext/standard/tests/file/007_error.phpt U php/php-src/trunk/ext/standard/tests/file/chmod_variation3.phpt U php/php-src/trunk/ext/standard/tests/file/filegroup_variation2.phpt U php/php-src/trunk/ext/standard/tests/file/fileinode_variation2.phpt U php/php-src/trunk/ext/standard/tests/file/fileowner_variation2.phpt U php/php-src/trunk/ext/standard/tests/file/fileperms_variation2.phpt U php/php-src/trunk/ext/standard/tests/file/is_dir_variation3.phpt U php/php-src/trunk/ext/standard/tests/file/is_executable_variation3.phpt U php/php-src/trunk/ext/standard/tests/file/is_file_error.phpt U php/php-src/trunk/ext/standard/tests/file/is_file_variation3.phpt U php/php-src/trunk/ext/standard/tests/file/is_readable_variation3.phpt U php/php-src/trunk/ext/standard/tests/file/is_writable_variation3.phpt U php/php-src/trunk/ext/standard/tests/file/lchown_error.phpt U php/php-src/trunk/ext/standard/tests/file/lstat_stat_error.phpt U php/php-src/trunk/ext/standard/tests/file/parse_ini_file_variation4.phpt Modified: php/php-src/branches/PHP_5_4/Zend/zend_API.c === --- php/php-src/branches/PHP_5_4/Zend/zend_API.c 2011-06-08 23:30:02 UTC (rev 311955) +++ php/php-src/branches/PHP_5_4/Zend/zend_API.c 2011-06-09 00:23:43 UTC (rev 311956) @@ -449,7 +449,7 @@ case IS_ARRAY: case IS_RESOURCE: default: - return c == 's' ? string : valid path; + return c == 's' ? string : a valid path; } } break; Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt === --- php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt 2011-06-08 23:30:02 UTC (rev 311955) +++ php/php-src/branches/PHP_5_4/ext/phar/tests/fopen_edgecases2.phpt 2011-06-09 00:23:43 UTC (rev 311956) @@ -36,7 +36,7 @@ ?php rmdir(dirname(__FILE__) . '/poo'); ? ?php unlink(dirname(__FILE__) . '/foob'); ? --EXPECTF-- -Warning: fopen() expects parameter 1 to be string, array given in %sfopen_edgecases2.php on line %d +Warning: fopen() expects parameter 1 to be a valid path, array given in %sfopen_edgecases2.php on line %d blah test Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/opendir_edgecases.phpt === --- php/php-src/branches/PHP_5_4/ext/phar/tests/opendir_edgecases.phpt 2011-06-08 23:30:02 UTC (rev 311955) +++ php/php-src/branches/PHP_5_4/ext/phar/tests/opendir_edgecases.phpt 2011-06-09 00:23:43 UTC (rev 311956) @@ -52,10 +52,10 @@ ?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ? ?php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/simplexml/simplexml.c branches/PHP_5_4/ext/simplexml/simplexml.c trunk/ext/simplexml/simplexml.c
Hi,
2011/6/7 Christopher Jones christopher.jo...@oracle.com
Ilia,
Since this is a user visible behavior change, should it be added to NEWS?
Chris
On 06/06/2011 06:40 PM, Ilia Alshanetsky wrote:
iliaaTue, 07 Jun 2011 01:40:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311874
Log:
Fixed test 008
Changed paths:
U php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c
U php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c
U php/php-src/trunk/ext/simplexml/simplexml.c
Modified: php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c
===
--- php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c 2011-06-07
01:27:29 UTC (rev 311873)
+++ php/php-src/branches/PHP_5_3/ext/simplexml/simplexml.c 2011-06-07
01:40:54 UTC (rev 311874)
@@ -1264,9 +1264,8 @@
result = retval-nodesetval;
- array_init(return_value);
-
if (result != NULL) {
+ array_init(return_value);
for (i = 0; i result-nodeNr; ++i) {
nodeptr = result-nodeTab[i];
if (nodeptr-type == XML_TEXT_NODE || nodeptr-type
== XML_ELEMENT_NODE || nodeptr-type == XML_ATTRIBUTE_NODE) {
@@ -1287,6 +1286,8 @@
add_next_index_zval(return_value, value);
}
}
+ } else {
+ RETVAL_FALSE;
}
xmlXPathFreeObject(retval);
Modified: php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c
===
--- php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c 2011-06-07
01:27:29 UTC (rev 311873)
+++ php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c 2011-06-07
01:40:54 UTC (rev 311874)
@@ -1294,9 +1294,8 @@
result = retval-nodesetval;
- array_init(return_value);
-
if (result != NULL) {
+ array_init(return_value);
for (i = 0; i result-nodeNr; ++i) {
nodeptr = result-nodeTab[i];
if (nodeptr-type == XML_TEXT_NODE || nodeptr-type
== XML_ELEMENT_NODE || nodeptr-type == XML_ATTRIBUTE_NODE) {
@@ -1317,6 +1316,8 @@
add_next_index_zval(return_value, value);
}
}
+ } else {
+ RETVAL_FALSE;
}
xmlXPathFreeObject(retval);
Modified: php/php-src/trunk/ext/simplexml/simplexml.c
===
--- php/php-src/trunk/ext/simplexml/simplexml.c 2011-06-07 01:27:29 UTC
(rev 311873)
+++ php/php-src/trunk/ext/simplexml/simplexml.c 2011-06-07 01:40:54 UTC
(rev 311874)
@@ -1294,9 +1294,8 @@
result = retval-nodesetval;
- array_init(return_value);
-
if (result != NULL) {
+ array_init(return_value);
for (i = 0; i result-nodeNr; ++i) {
nodeptr = result-nodeTab[i];
if (nodeptr-type == XML_TEXT_NODE || nodeptr-type
== XML_ELEMENT_NODE || nodeptr-type == XML_ATTRIBUTE_NODE) {
@@ -1317,6 +1316,8 @@
add_next_index_zval(return_value, value);
}
}
+ } else {
+ RETVAL_FALSE;
}
xmlXPathFreeObject(retval);
This breaks the fix for bug #48601 (ext/simplexml/tests/bug48601.phpt)
--
Regards,
Felipe Pena
