[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Dec 30 01:31:24 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2911r2=1.2912diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2911 php-src/ChangeLog:1.2912 --- php-src/ChangeLog:1.2911Sat Dec 29 01:31:27 2007 +++ php-src/ChangeLog Sun Dec 30 01:31:24 2007 @@ -1,3 +1,52 @@ +2007-12-29 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/ftp_fopen_wrapper.c + ext/standard/ftp_fopen_wrapper.c: + MFH:- This makes no sense with non-ipv6 builds. (and fixes lot of issues + with misconfigured servers) + +* ext/standard/ftp_fopen_wrapper.c: + - This makes no sense with non-ipv6 builds. (and fixes lot of issues with + misconfigured servers) + +2007-12-29 Hannes Magnusson [EMAIL PROTECTED] + +* ext/standard/tests/general_functions/phpinfo.phpt + ext/standard/tests/general_functions/phpinfo.phpt: + MFB5.2: Fix test + +* (PHP_5_2) + ext/standard/tests/general_functions/phpinfo.phpt: + Fix test when additional ini files are used (patch by confins_de_l_univers + at yahoo dot fr) + +2007-12-29 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + main/streams/streams.c + main/streams/streams.c: + correct fix for bug #43522 + +* main/streams/streams.c: + apply correct fix for bug #43522 + fix Unicode streams too this time + +* ext/standard/tests/network/http-stream.phpt + ext/standard/tests/network/http-stream.phpt: + fix test + +2007-12-29 Hannes Magnusson [EMAIL PROTECTED] + +* (PHP_5_2) + main/main.c + main/main.c: + MFH: Update the class method documentation links + +* main/main.c: + Update the class method documentation links + 2007-12-28 Ulf Wendel [EMAIL PROTECTED] * ext/mysqli/tests/bug35517.phpt:
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file bug43522.phpt /main/streams streams.c
On 13.12.2007 09:57, Antony Dovgal wrote: On 13.12.2007 03:17, Ilia Alshanetsky wrote: I tested with valgrind 3.2.3 and I see no memory errors, what valgrind are you using? Could it be a bug in 3.3.0 valgrind? Both 3.2.3 and 3.3.0 report this error. See ext/standard/tests/file/stream_get_line.phpt and ext/standard/tests/file/bug30362.phpt. bug43522.phpt doesn't show up this problem, sorry. The issue is still there. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/network http-stream.phpt
tony2001Sat Dec 29 10:32:39 2007 UTC Modified files: /php-src/ext/standard/tests/network http-stream.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/http-stream.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/network/http-stream.phpt diff -u php-src/ext/standard/tests/network/http-stream.phpt:1.1 php-src/ext/standard/tests/network/http-stream.phpt:1.2 --- php-src/ext/standard/tests/network/http-stream.phpt:1.1 Thu Nov 29 12:27:49 2007 +++ php-src/ext/standard/tests/network/http-stream.phpt Sat Dec 29 10:32:39 2007 @@ -1,5 +1,7 @@ --TEST-- http-stream test +--SKIPIF-- +?php if (!extension_loaded(dom)) die(skip dom extension is not present); ? --FILE-- ?php $d = new DomDocument; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/network http-stream.phpt
tony2001Sat Dec 29 10:32:53 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/network http-stream.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/http-stream.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/network/http-stream.phpt diff -u php-src/ext/standard/tests/network/http-stream.phpt:1.1.2.2 php-src/ext/standard/tests/network/http-stream.phpt:1.1.2.3 --- php-src/ext/standard/tests/network/http-stream.phpt:1.1.2.2 Thu Nov 29 12:28:15 2007 +++ php-src/ext/standard/tests/network/http-stream.phpt Sat Dec 29 10:32:52 2007 @@ -1,5 +1,7 @@ --TEST-- http-stream test +--SKIPIF-- +?php if (!extension_loaded(dom)) die(skip dom extension is not present); ? --FILE-- ?php $d = new DomDocument; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams streams.c
tony2001Sat Dec 29 10:50:12 2007 UTC
Modified files:
/php-src/main/streams streams.c
Log:
apply correct fix for bug #43522
fix Unicode streams too this time
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.155r2=1.156diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.155
php-src/main/streams/streams.c:1.156
--- php-src/main/streams/streams.c:1.155Mon Dec 10 14:19:20 2007
+++ php-src/main/streams/streams.c Sat Dec 29 10:50:12 2007
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.155 2007/12/10 14:19:20 iliaa Exp $ */
+/* $Id: streams.c,v 1.156 2007/12/29 10:50:12 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1104,10 +1104,17 @@
if (delim_len == 0 || !delim) {
toread = maxlen;
} else {
+ size_t seek_len;
+
+ seek_len = stream-writepos - stream-readpos;
+ if (seek_len maxlen) {
+ seek_len = maxlen;
+ }
+
if (delim_len == 1) {
- e = memchr(stream-readbuf.s + stream-readpos, *delim,
maxlen);
+ e = memchr(stream-readbuf.s + stream-readpos, *delim,
seek_len);
} else {
- e = php_memnstr(stream-readbuf.s + stream-readpos,
delim, delim_len, (stream-readbuf.s + stream-readpos + maxlen));
+ e = php_memnstr(stream-readbuf.s + stream-readpos,
delim, delim_len, (stream-readbuf.s + stream-readpos + seek_len));
}
if (!e) {
@@ -1153,10 +1160,17 @@
if (delim_len == 0 || !delim) {
toread = maxlen;
} else {
+ size_t seek_len;
+
+ seek_len = stream-writepos - stream-readpos;
+ if (seek_len maxlen) {
+ seek_len = maxlen;
+ }
+
if (delim_len == 1) {
- e = u_memchr(stream-readbuf.u + stream-readpos,
*delim, stream-writepos - stream-readpos);
+ e = u_memchr(stream-readbuf.u + stream-readpos,
*delim, seek_len);
} else {
- e = u_strFindFirst(stream-readbuf.u + stream-readpos,
stream-writepos - stream-readpos, delim, delim_len);
+ e = u_strFindFirst(stream-readbuf.u + stream-readpos,
stream-readbuf.u + stream-readpos + seek_len, delim, delim_len);
}
if (!e) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /main/streams streams.c
tony2001Sat Dec 29 10:52:24 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main/streams streams.c
Log:
correct fix for bug #43522
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.2r2=1.82.2.6.2.18.2.3diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.2
php-src/main/streams/streams.c:1.82.2.6.2.18.2.3
--- php-src/main/streams/streams.c:1.82.2.6.2.18.2.2Mon Dec 10 14:16:57 2007
+++ php-src/main/streams/streams.c Sat Dec 29 10:52:24 2007
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.18.2.2 2007/12/10 14:16:57 iliaa Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18.2.3 2007/12/29 10:52:24 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -859,10 +859,17 @@
if (delim_len == 0 || !delim) {
toread = maxlen;
} else {
+ size_t seek_len;
+
+ seek_len = stream-writepos - stream-readpos;
+ if (seek_len maxlen) {
+ seek_len = maxlen;
+ }
+
if (delim_len == 1) {
- e = memchr(stream-readbuf + stream-readpos, *delim,
maxlen);
+ e = memchr(stream-readbuf + stream-readpos, *delim,
seek_len);
} else {
- e = php_memnstr(stream-readbuf + stream-readpos,
delim, delim_len, (stream-readbuf + stream-readpos + maxlen));
+ e = php_memnstr(stream-readbuf + stream-readpos,
delim, delim_len, (stream-readbuf + stream-readpos + seek_len));
}
if (!e) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams streams.c
tony2001Sat Dec 29 10:52:51 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main/streams streams.c
Log:
correct fix for bug #43522
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1042r2=1.2027.2.547.2.1043diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1042 php-src/NEWS:1.2027.2.547.2.1043
--- php-src/NEWS:1.2027.2.547.2.1042Fri Dec 28 13:38:19 2007
+++ php-src/NEWSSat Dec 29 10:52:51 2007
@@ -14,7 +14,7 @@
function). (Ilia)
- Fixed bug #43533 (escapeshellarg('') returns null). (Ilia)
- Fixed bug #43522 (stream_get_line() eats additional characters). (Felipe,
- Ilia)
+ Ilia, Tony)
- Fixed bug #43495 (array_merge_recursive() crashes with recursive arrays).
(Ilia)
- Fixed bug #43493 (pdo_pgsql does not send username on connect when password
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.19r2=1.82.2.6.2.20diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.19
php-src/main/streams/streams.c:1.82.2.6.2.20
--- php-src/main/streams/streams.c:1.82.2.6.2.19Mon Dec 10 14:18:02 2007
+++ php-src/main/streams/streams.c Sat Dec 29 10:52:51 2007
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.19 2007/12/10 14:18:02 iliaa Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.20 2007/12/29 10:52:51 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -855,10 +855,17 @@
if (delim_len == 0 || !delim) {
toread = maxlen;
} else {
+ size_t seek_len;
+
+ seek_len = stream-writepos - stream-readpos;
+ if (seek_len maxlen) {
+ seek_len = maxlen;
+ }
+
if (delim_len == 1) {
- e = memchr(stream-readbuf + stream-readpos, *delim,
maxlen);
+ e = memchr(stream-readbuf + stream-readpos, *delim,
seek_len);
} else {
- e = php_memnstr(stream-readbuf + stream-readpos,
delim, delim_len, (stream-readbuf + stream-readpos + maxlen));
+ e = php_memnstr(stream-readbuf + stream-readpos,
delim, delim_len, (stream-readbuf + stream-readpos + seek_len));
}
if (!e) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions phpinfo.phpt
bjori Sat Dec 29 11:38:06 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions phpinfo.phpt Log: Fix test when additional ini files are used (patch by confins_de_l_univers at yahoo dot fr) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.3 --- php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2 Fri Sep 14 15:28:03 2007 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Sat Dec 29 11:38:06 2007 @@ -24,7 +24,7 @@ Server API = Command Line Interface Virtual Directory Support = %s Configuration File (php.ini) Path = %s -Loaded Configuration File = %s +Loaded Configuration File = %a PHP API = %d PHP Extension = %d Zend Extension = %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions phpinfo.phpt
bjori Sat Dec 29 11:38:24 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/general_functions phpinfo.phpt Log: MFB5.2: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2 Fri Sep 14 15:28:03 2007 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Sat Dec 29 11:38:24 2007 @@ -24,7 +24,7 @@ Server API = Command Line Interface Virtual Directory Support = %s Configuration File (php.ini) Path = %s -Loaded Configuration File = %s +Loaded Configuration File = %a PHP API = %d PHP Extension = %d Zend Extension = %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions phpinfo.phpt
bjori Sat Dec 29 11:39:06 2007 UTC Modified files: /php-src/ext/standard/tests/general_functions phpinfo.phpt Log: MFB5.2: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.4 php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.5 --- php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.4 Fri Sep 28 22:40:23 2007 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Sat Dec 29 11:39:06 2007 @@ -24,7 +24,7 @@ Server API = Command Line Interface Virtual Directory Support = %s Configuration File (php.ini) Path = %s -Loaded Configuration File = %s +Loaded Configuration File = %a PHP API = %d PHP Extension = %d Zend Extension = %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
philip Sat Dec 29 23:32:23 2007 UTC Modified files: /CVSROOTavail Log: phpdoc karma for Philippe Tjon - A - Hen (philippe) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1340r2=1.1341diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1340 CVSROOT/avail:1.1341 --- CVSROOT/avail:1.1340Sat Dec 22 20:33:13 2007 +++ CVSROOT/avail Sat Dec 29 23:32:23 2007 @@ -44,7 +44,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,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,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,c! hief977,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,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,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,h win,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,ohill,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,nlopess,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,lsmith,tessus,gavinfo,rant,ramsey,arkadius,bjori,erinet,omar,sixd,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,gwynne,mkoppanen,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,felipe,asbjornit|phpdoc,php! doc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,php doc-fa_IR,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,phpdoc-ca,phpdoc-no
[PHP-CVS] cvs: php-src /ext/standard ftp_fopen_wrapper.c
janiSat Dec 29 18:46:10 2007 UTC
Modified files:
/php-src/ext/standard ftp_fopen_wrapper.c
Log:
- This makes no sense with non-ipv6 builds. (and fixes lot of issues with
misconfigured servers)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.99r2=1.100diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.99
php-src/ext/standard/ftp_fopen_wrapper.c:1.100
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.99 Sun Sep 30 05:43:28 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.cSat Dec 29 18:46:10 2007
@@ -18,7 +18,7 @@
| Sara Golemon [EMAIL PROTECTED] |
+--+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.99 2007/09/30 05:43:28 jani Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.100 2007/12/29 18:46:10 jani Exp $ */
#include php.h
#include php_globals.h
@@ -300,19 +300,21 @@
/* {{{ php_fopen_do_pasv
*/
-static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, int
ip_size, char **phoststart TSRMLS_DC)
+static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, size_t
ip_size, char **phoststart TSRMLS_DC)
{
char tmp_line[512];
int result, i;
unsigned short portno;
char *tpath, *ttpath, *hoststart=NULL;
+#ifdef HAVE_IPV6
/* We try EPSV first, needed for IPv6 and works on some IPv4 servers */
php_stream_write_string(stream, EPSV\r\n);
result = GET_FTP_RESULT(stream);
/* check if we got a 229 response */
if (result != 229) {
+#endif
/* EPSV failed, let's try PASV */
php_stream_write_string(stream, PASV\r\n);
result = GET_FTP_RESULT(stream);
@@ -357,6 +359,7 @@
tpath++;
/* pull out the LSB of the port */
portno += (unsigned short) strtoul(tpath, ttpath, 10);
+#ifdef HAVE_IPV6
} else {
/* parse epsv command (|||6446|) */
for (i = 0, tpath = tmp_line + 4; *tpath; tpath++) {
@@ -372,6 +375,7 @@
/* pull out the port */
portno = (unsigned short) strtoul(tpath + 1, ttpath, 10);
}
+#endif
if (ttpath == NULL) {
/* didn't get correct response from EPSV/PASV */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard ftp_fopen_wrapper.c
janiSat Dec 29 18:46:37 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard ftp_fopen_wrapper.c
Log:
MFH:- This makes no sense with non-ipv6 builds. (and fixes lot of issues with
misconfigured servers)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.4.2.6r2=1.85.2.4.2.7diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.6
php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.7
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.6 Thu Oct 4
13:31:11 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.cSat Dec 29 18:46:37 2007
@@ -18,7 +18,7 @@
| Sara Golemon [EMAIL PROTECTED] |
+--+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.6 2007/10/04 13:31:11 jani Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.7 2007/12/29 18:46:37 jani Exp $ */
#include php.h
#include php_globals.h
@@ -300,19 +300,21 @@
/* {{{ php_fopen_do_pasv
*/
-static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, int
ip_size, char **phoststart TSRMLS_DC)
+static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, size_t
ip_size, char **phoststart TSRMLS_DC)
{
char tmp_line[512];
int result, i;
unsigned short portno;
char *tpath, *ttpath, *hoststart=NULL;
+#ifdef HAVE_IPV6
/* We try EPSV first, needed for IPv6 and works on some IPv4 servers */
php_stream_write_string(stream, EPSV\r\n);
result = GET_FTP_RESULT(stream);
/* check if we got a 229 response */
if (result != 229) {
+#endif
/* EPSV failed, let's try PASV */
php_stream_write_string(stream, PASV\r\n);
result = GET_FTP_RESULT(stream);
@@ -357,6 +359,8 @@
tpath++;
/* pull out the LSB of the port */
portno += (unsigned short) strtoul(tpath, ttpath, 10);
+
+#ifdef HAVE_IPV6
} else {
/* parse epsv command (|||6446|) */
for (i = 0, tpath = tmp_line + 4; *tpath; tpath++) {
@@ -372,7 +376,8 @@
/* pull out the port */
portno = (unsigned short) strtoul(tpath + 1, ttpath, 10);
}
-
+#endif
+
if (ttpath == NULL) {
/* didn't get correct response from EPSV/PASV */
return 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard ftp_fopen_wrapper.c
janiSat Dec 29 18:46:28 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard ftp_fopen_wrapper.c
Log:
MFH:- This makes no sense with non-ipv6 builds. (and fixes lot of issues with
misconfigured servers)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.4.2.4.2.2r2=1.85.2.4.2.4.2.3diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.4.2.2
php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.4.2.3
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.4.2.2 Sun Sep 30
05:49:44 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.cSat Dec 29 18:46:27 2007
@@ -18,7 +18,7 @@
| Sara Golemon [EMAIL PROTECTED] |
+--+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.4.2.2 2007/09/30 05:49:44 jani Exp $
*/
+/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.4.2.3 2007/12/29 18:46:27 jani Exp $
*/
#include php.h
#include php_globals.h
@@ -300,19 +300,21 @@
/* {{{ php_fopen_do_pasv
*/
-static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, int
ip_size, char **phoststart TSRMLS_DC)
+static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, size_t
ip_size, char **phoststart TSRMLS_DC)
{
char tmp_line[512];
int result, i;
unsigned short portno;
char *tpath, *ttpath, *hoststart=NULL;
+#ifdef HAVE_IPV6
/* We try EPSV first, needed for IPv6 and works on some IPv4 servers */
php_stream_write_string(stream, EPSV\r\n);
result = GET_FTP_RESULT(stream);
/* check if we got a 229 response */
if (result != 229) {
+#endif
/* EPSV failed, let's try PASV */
php_stream_write_string(stream, PASV\r\n);
result = GET_FTP_RESULT(stream);
@@ -357,6 +359,7 @@
tpath++;
/* pull out the LSB of the port */
portno += (unsigned short) strtoul(tpath, ttpath, 10);
+#ifdef HAVE_IPV6
} else {
/* parse epsv command (|||6446|) */
for (i = 0, tpath = tmp_line + 4; *tpath; tpath++) {
@@ -372,7 +375,7 @@
/* pull out the port */
portno = (unsigned short) strtoul(tpath + 1, ttpath, 10);
}
-
+#endif
if (ttpath == NULL) {
/* didn't get correct response from EPSV/PASV */
return 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
