[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Jan 7 01:32:29 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3280r2=1.3281diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3280 php-src/ChangeLog:1.3281 --- php-src/ChangeLog:1.3280Tue Jan 6 01:32:27 2009 +++ php-src/ChangeLog Wed Jan 7 01:32:28 2009 @@ -1,3 +1,215 @@ +2009-01-06 Pierre-Alain Joye pierre@gmail.com + +* ext/standard/dns.c: + - MFB: fix build for win + +* ext/standard/dns_win32.c: + - [DOC] MFB: VC6 does not have NAPTR + +2009-01-06 Ilia Alshanetsky i...@prohost.org + +* ext/tidy/tidy.c: + + MFB: Arg parsing cleanup + +* (PHP_5_3) + ext/tidy/tidy.c: + Param parsing cleanup + +2009-01-06 Pierre-Alain Joye pierre@gmail.com + +* (PHP_5_3) + ext/standard/dns.c: + - these ifdefs are a mess, fix build on win + +* (PHP_5_3) + ext/standard/dns_win32.c: + - [DOC] VC6 does not have NAPTR + +* ext/standard/dns.c: + - MFB: fix build + +* (PHP_5_3) + ext/standard/dns.c: + - fix build + +* win32/build/config.w32: + - MFB: add multi threaded build support (automatic detection of the number + of cpus, add a custom number if you prefer to use only a few of your + available cores) + +* (PHP_5_3) + win32/build/config.w32: + - add multi threaded build support (automatic detection of the number of + cpus, add a custom number if you prefer to use only a few of your + available cores) + +* (PHP_5_3) + ext/standard/basic_functions.c + ext/standard/config.w32 + ext/standard/dns.c + ext/standard/dns.h + ext/standard/dns_win32.c: + - [MFH] + - [DOC] add support for all DNS function on Windows +- dns_check_record (and its alias checkdnsrr) +- dns_get_record + - IPV6 specific info not available yet: + . info is available only on vista/2k8 for now + . A6 info is not available +- dns_get_mx (and its alias getmxrr) + +* win32/build/config.w32 + win32/build/config.w32: + - add DNSApi for the DNS functions + +* ext/standard/basic_functions.c + ext/standard/config.w32 + ext/standard/dns.c + ext/standard/dns.h + ext/standard/dns_win32.c + ext/standard/dns_win32.c: + - [DOC] add support for all DNS function on Windows +- dns_check_record (and its alias checkdnsrr) +- dns_get_record + - IPV6 specific info not available yet: + . info is available only on vista/2k8 for now + . A6 info is not available +- dns_get_mx (and its alias getmxrr) + +2009-01-06 Uwe Schindler u...@thetaphi.de + +* (PHP_5_2) + sapi/nsapi/nsapi.c + sapi/nsapi/nsapi.c: + MFH: the #ifdef was never working. If Sun extends its NSAPI to support + subrequests, much of this code must be rewritten. Because of that it is + better to have a clean start. This commit does not change behaviour. + +* sapi/nsapi/nsapi.c: + the #ifdef was never working. If Sun extends its NSAPI to support + subrequests, much of this code must be rewritten. Because of that it is + better to have a clean start. This commit does not change behaviour. + +2009-01-06 Felipe Pena felipe...@gmail.com + +* (PHP_5_2) + NEWS: + - BFN #46701 + +* (PHP_5_3) + NEWS: + - Fix for #46701 merged into 5_2 + +* (PHP_5_2) + ZendEngine2/zend_execute.c + ZendEngine2/zend_operators.c + ZendEngine2/zend_operators.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/tests/bug46701.phpt: + MFH: + - Fixed bug #46701 (Creating associative array with long values in the key + fails on 32bit linux) + Patch by Shire + +* ext/mysqli/tests/002.phpt + ext/mysqli/tests/003.phpt + ext/mysqli/tests/004.phpt + ext/mysqli/tests/005.phpt + ext/mysqli/tests/009.phpt + ext/mysqli/tests/011.phpt + ext/mysqli/tests/012.phpt + ext/mysqli/tests/014.phpt + ext/mysqli/tests/015.phpt + ext/mysqli/tests/016.phpt + ext/mysqli/tests/017.phpt + ext/mysqli/tests/019.phpt + ext/mysqli/tests/021.phpt + ext/mysqli/tests/022.phpt + ext/mysqli/tests/026.phpt + ext/mysqli/tests/028.phpt + ext/mysqli/tests/031.phpt + ext/mysqli/tests/032.phpt + ext/mysqli/tests/033.phpt + ext/mysqli/tests/042.phpt + ext/mysqli/tests/045.phpt + ext/mysqli/tests/047.phpt + ext/mysqli/tests/048.phpt + ext/mysqli/tests/049.phpt + ext/mysqli/tests/057.phpt + ext/mysqli/tests/058.phpt + ext/mysqli/tests/059.phpt + ext/mysqli/tests/060.phpt + ext/mysqli/tests/061.phpt + ext/mysqli/tests/062.phpt + ext/mysqli/tests/063.phpt + ext/mysqli/tests/068.phpt +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Jan 7 01:32:34 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1423r2=1.1424diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1423 ZendEngine2/ChangeLog:1.1424 --- ZendEngine2/ChangeLog:1.1423Tue Jan 6 01:32:32 2009 +++ ZendEngine2/ChangeLog Wed Jan 7 01:32:34 2009 @@ -1,3 +1,17 @@ +2009-01-06 Felipe Pena felipe...@gmail.com + +* (PHP_5_2) + zend_execute.c + zend_operators.c + zend_operators.h + zend_vm_def.h + zend_vm_execute.h + tests/bug46701.phpt: + MFH: + - Fixed bug #46701 (Creating associative array with long values in the key + fails on 32bit linux) + Patch by Shire + 2009-01-05 Felipe Pena felipe...@gmail.com * (PHP_5_3) @@ -27387,7 +27401,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1423 2009/01/06 01:32:32 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1424 2009/01/07 01:32:34 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -29111,7 +29125,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1423 2009/01/06 01:32:32 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1424 2009/01/07 01:32:34 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
[PHP-CVS] cvs: CVSROOT / avail
johannesTue Jan 6 10:52:44 2009 UTC Modified files: /CVSROOTavail Log: upgrade Christian Hammers (ch) with phpdoc karma as suggested by Hannes http://news.php.net/php.doc/969379958 http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1484r2=1.1485diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1484 CVSROOT/avail:1.1485 --- CVSROOT/avail:1.1484Wed Dec 31 07:25:00 2008 +++ CVSROOT/avail Tue Jan 6 10:52:43 2009 @@ -41,7 +41,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,cos! tra,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,jingf! s,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,um ut,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|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-f! a,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-i t,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,phd,docweb
[PHP-CVS] cvs: php-src /sapi/nsapi nsapi.c
thetaphiTue Jan 6 13:45:30 2009 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
the #ifdef was never working. If Sun extends its NSAPI to support
subrequests, much of this code must be rewritten. Because of that it is better
to have a clean start. This commit does not change behaviour.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.100r2=1.101diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.100 php-src/sapi/nsapi/nsapi.c:1.101
--- php-src/sapi/nsapi/nsapi.c:1.100Wed Dec 31 11:12:40 2008
+++ php-src/sapi/nsapi/nsapi.c Tue Jan 6 13:45:30 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.100 2008/12/31 11:12:40 sebastian Exp $ */
+/* $Id: nsapi.c,v 1.101 2009/01/06 13:45:30 thetaphi Exp $ */
/*
* PHP includes
@@ -238,13 +238,6 @@
*/
static void php_nsapi_init_dynamic_symbols(void)
{
-#if defined(servact_uri2path) defined(servact_pathchecks)
defined(servact_fileinfo) defined(servact_service)
- /* use functions from nsapi.h if available */
- nsapi_servact_uri2path = servact_uri2path;
- nsapi_servact_pathchecks = servact_pathchecks;
- nsapi_servact_fileinfo = servact_fileinfo;
- nsapi_servact_service = servact_service;
-#else
/* find address of internal NSAPI functions */
#ifdef PHP_WIN32
register int i;
@@ -278,7 +271,6 @@
nsapi_servact_fileinfo = NULL;
nsapi_servact_service = NULL;
}
-#endif
}
/* }}} */
@@ -315,7 +307,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.100
$);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision: 1.101
$);
php_info_print_table_row(2, Server Software, system_version());
php_info_print_table_row(2, Sub-requests with nsapi_virtual(),
(nsapi_servact_service)?((zend_ini_long(zlib.output_compression,
sizeof(zlib.output_compression), 0))?not supported with
zlib.output_compression:enabled):not supported on this platform );
--
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) /sapi/nsapi nsapi.c
thetaphiTue Jan 6 13:46:20 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: the #ifdef was never working. If Sun extends its NSAPI to support
subrequests, much of this code must be rewritten. Because of that it is better
to have a clean start. This commit does not change behaviour.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.15r2=1.69.2.3.2.6.2.16diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.15
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.16
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.15Wed Dec 31 11:15:49 2008
+++ php-src/sapi/nsapi/nsapi.c Tue Jan 6 13:46:20 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.15 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.16 2009/01/06 13:46:20 thetaphi Exp $ */
/*
* PHP includes
@@ -238,13 +238,6 @@
*/
static void php_nsapi_init_dynamic_symbols(void)
{
-#if defined(servact_uri2path) defined(servact_pathchecks)
defined(servact_fileinfo) defined(servact_service)
- /* use functions from nsapi.h if available */
- nsapi_servact_uri2path = servact_uri2path;
- nsapi_servact_pathchecks = servact_pathchecks;
- nsapi_servact_fileinfo = servact_fileinfo;
- nsapi_servact_service = servact_service;
-#else
/* find address of internal NSAPI functions */
#ifdef PHP_WIN32
register int i;
@@ -278,7 +271,6 @@
nsapi_servact_fileinfo = NULL;
nsapi_servact_service = NULL;
}
-#endif
}
/* }}} */
@@ -315,7 +307,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.15 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.6.2.16 $);
php_info_print_table_row(2, Server Software, system_version());
php_info_print_table_row(2, Sub-requests with nsapi_virtual(),
(nsapi_servact_service)?((zend_ini_long(zlib.output_compression,
sizeof(zlib.output_compression), 0))?not supported with
zlib.output_compression:enabled):not supported on this platform );
--
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) /sapi/nsapi nsapi.c
thetaphiTue Jan 6 13:46:49 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
MFH: the #ifdef was never working. If Sun extends its NSAPI to support
subrequests, much of this code must be rewritten. Because of that it is better
to have a clean start. This commit does not change behaviour.
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.15r2=1.69.2.3.2.16diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.15
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.16
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.15Wed Dec 31 11:17:49 2008
+++ php-src/sapi/nsapi/nsapi.c Tue Jan 6 13:46:49 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.15 2008/12/31 11:17:49 sebastian Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.16 2009/01/06 13:46:49 thetaphi Exp $ */
/*
* PHP includes
@@ -225,13 +225,6 @@
*/
static void php_nsapi_init_dynamic_symbols(void)
{
-#if defined(servact_uri2path) defined(servact_pathchecks)
defined(servact_fileinfo) defined(servact_service)
- /* use functions from nsapi.h if available */
- nsapi_servact_uri2path = servact_uri2path;
- nsapi_servact_pathchecks = servact_pathchecks;
- nsapi_servact_fileinfo = servact_fileinfo;
- nsapi_servact_service = servact_service;
-#else
/* find address of internal NSAPI functions */
#ifdef PHP_WIN32
register int i;
@@ -265,7 +258,6 @@
nsapi_servact_fileinfo = NULL;
nsapi_servact_service = NULL;
}
-#endif
}
/* }}} */
@@ -302,7 +294,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.15 $);
+ php_info_print_table_row(2, NSAPI Module Revision, $Revision:
1.69.2.3.2.16 $);
php_info_print_table_row(2, Server Software, system_version());
php_info_print_table_row(2, Sub-requests with nsapi_virtual(),
(nsapi_servact_service)?((zend_ini_long(zlib.output_compression,
sizeof(zlib.output_compression), 0))?not supported with
zlib.output_compression:enabled):not supported on this platform );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c config.w32 dns.c dns.h dns_win32.c
pajoye Tue Jan 6 20:44:56 2009 UTC
Added files:
/php-src/ext/standard dns_win32.c
Modified files:
/php-src/ext/standard basic_functions.c config.w32 dns.c dns.h
Log:
- [DOC] add support for all DNS function on Windows
- dns_check_record (and its alias checkdnsrr)
- dns_get_record
- IPV6 specific info not available yet:
. info is available only on vista/2k8 for now
. A6 info is not available
- dns_get_mx (and its alias getmxrr)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.945r2=1.946diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.945
php-src/ext/standard/basic_functions.c:1.946
--- php-src/ext/standard/basic_functions.c:1.945Wed Dec 31 14:33:41 2008
+++ php-src/ext/standard/basic_functions.c Tue Jan 6 20:44:56 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.945 2008/12/31 14:33:41 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.946 2009/01/06 20:44:56 pajoye Exp $ */
#include php.h
#include php_streams.h
@@ -985,13 +985,13 @@
ZEND_END_ARG_INFO()
#endif
-#if HAVE_RES_SEARCH !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1)
ZEND_ARG_INFO(0, host)
ZEND_ARG_INFO(0, type)
ZEND_END_ARG_INFO()
-# if HAVE_DNS_FUNCS
+# if defined(PHP_WIN32) || HAVE_DNS_FUNCS
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_record, 1, 0, 1)
ZEND_ARG_INFO(0, hostname)
ZEND_ARG_INFO(0, type)
@@ -1000,14 +1000,15 @@
ZEND_END_ARG_INFO()
# endif
-# if HAVE_DN_SKIPNAME HAVE_DN_EXPAND
+# if defined(PHP_WIN32) || (HAVE_DN_SKIPNAME HAVE_DN_EXPAND)
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_mx, 0, 0, 2)
ZEND_ARG_INFO(0, hostname)
ZEND_ARG_INFO(1, mxhosts) /* ARRAY_INFO(1, mxhosts, 1) */
ZEND_ARG_INFO(1, weight) /* ARRAY_INFO(1, weight, 1) */
ZEND_END_ARG_INFO()
# endif
-#endif /* HAVE_RES_SEARCH !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE)) */
+
+#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE))) */
/* }}} */
/* {{{ exec.c */
ZEND_BEGIN_ARG_INFO_EX(arginfo_exec, 0, 0, 1)
@@ -3015,14 +3016,17 @@
PHP_FE(gethostname,
arginfo_gethostname)
#endif
-#if HAVE_RES_SEARCH !(defined(__BEOS__) || defined(PHP_WIN32) ||
defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+
PHP_FE(dns_check_record,
arginfo_dns_check_record)
PHP_FALIAS(checkdnsrr, dns_check_record,
arginfo_dns_check_record)
-# if HAVE_DN_SKIPNAME HAVE_DN_EXPAND
+
+# if defined(PHP_WIN32) || (HAVE_DN_SKIPNAME HAVE_DN_EXPAND)
PHP_FE(dns_get_mx,
arginfo_dns_get_mx)
- PHP_FALIAS(getmxrr, dns_get_mx,
arginfo_dns_get_mx)
+ PHP_FALIAS(getmxrr, dns_get_mx,
arginfo_dns_get_mx)
# endif
-# if HAVE_DNS_FUNCS
+
+# if defined(PHP_WIN32) || HAVE_DNS_FUNCS
PHP_FE(dns_get_record,
arginfo_dns_get_record)
# endif
#endif
@@ -3619,8 +3623,8 @@
php_register_url_stream_wrapper(ftp, php_stream_ftp_wrapper
TSRMLS_CC);
#endif
-#if HAVE_RES_SEARCH !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE))
-# if HAVE_DNS_FUNCS
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+# if defined(PHP_WIN32) || HAVE_DNS_FUNCS
PHP_MINIT(dns)(INIT_FUNC_ARGS_PASSTHRU);
# endif
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.w32?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/standard/config.w32
diff -u php-src/ext/standard/config.w32:1.10
php-src/ext/standard/config.w32:1.11
--- php-src/ext/standard/config.w32:1.10Mon Jul 28 11:34:53 2008
+++ php-src/ext/standard/config.w32 Tue Jan 6 20:44:56 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.10 2008/07/28 11:34:53 pajoye Exp $
+// $Id: config.w32,v 1.11 2009/01/06 20:44:56 pajoye Exp $
ARG_WITH(config-file-scan-dir, Dir to check for additional php ini files,
);
@@ -14,7 +14,7 @@
EXTENSION(standard, array.c base64.c basic_functions.c browscap.c \
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32
pajoye Tue Jan 6 20:46:36 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32
Log:
- add DNSApi for the DNS functions
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.39r2=1.40.2.8.2.10.2.40diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.39
php-src/win32/build/config.w32:1.40.2.8.2.10.2.40
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.39 Fri Dec 26 14:11:44 2008
+++ php-src/win32/build/config.w32 Tue Jan 6 20:46:36 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.39 2008/12/26 14:11:44 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.40 2009/01/06 20:46:36 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -157,7 +157,7 @@
// General libs
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib
comdlg32.lib
-DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib);
+DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib Dnsapi.lib);
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Tue Jan 6 20:47:06 2009 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- add DNSApi for the DNS functions
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.93r2=1.94diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.93 php-src/win32/build/config.w32:1.94
--- php-src/win32/build/config.w32:1.93 Fri Dec 26 14:10:26 2008
+++ php-src/win32/build/config.w32 Tue Jan 6 20:47:06 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.93 2008/12/26 14:10:26 pajoye Exp $
+// $Id: config.w32,v 1.94 2009/01/06 20:47:06 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -157,7 +157,7 @@
// General libs
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib
comdlg32.lib
-DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib);
+DEFINE(LIBS, kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib Dnsapi.lib );
// Set some debug/release specific options
if (PHP_DEBUG == yes) {
--
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 basic_functions.c config.w32 dns.c dns.h dns_win32.c
pajoye Tue Jan 6 20:48:21 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard dns_win32.c
Modified files:
/php-src/ext/standard basic_functions.c config.w32 dns.c dns.h
Log:
- [MFH]
- [DOC] add support for all DNS function on Windows
- dns_check_record (and its alias checkdnsrr)
- dns_get_record
- IPV6 specific info not available yet:
. info is available only on vista/2k8 for now
. A6 info is not available
- dns_get_mx (and its alias getmxrr)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.81r2=1.725.2.31.2.64.2.82diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.81
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.82
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.81 Wed Dec 31
14:30:37 2008
+++ php-src/ext/standard/basic_functions.c Tue Jan 6 20:48:20 2009
@@ -3,7 +3,7 @@
+--+
| PHP Version 5|
+--+
- | Copyright (c) 1997-2009 The PHP Group|
+ | Copyright (c) 1997-2008 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.81 2008/12/31 14:30:37 iliaa Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.82 2009/01/06 20:48:20 pajoye
Exp $ */
#include php.h
#include php_streams.h
@@ -996,13 +996,13 @@
ZEND_END_ARG_INFO()
#endif
-#if HAVE_RES_SEARCH !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1)
ZEND_ARG_INFO(0, host)
ZEND_ARG_INFO(0, type)
ZEND_END_ARG_INFO()
-# if HAVE_DNS_FUNCS
+# if defined(PHP_WIN32) || HAVE_DNS_FUNCS
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_record, 1, 0, 1)
ZEND_ARG_INFO(0, hostname)
ZEND_ARG_INFO(0, type)
@@ -1011,15 +1011,17 @@
ZEND_END_ARG_INFO()
# endif
-# if HAVE_DN_SKIPNAME HAVE_DN_EXPAND
+# if defined(PHP_WIN32) || (HAVE_DN_SKIPNAME HAVE_DN_EXPAND)
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_mx, 0, 0, 2)
ZEND_ARG_INFO(0, hostname)
ZEND_ARG_INFO(1, mxhosts) /* ARRAY_INFO(1, mxhosts, 1) */
ZEND_ARG_INFO(1, weight) /* ARRAY_INFO(1, weight, 1) */
ZEND_END_ARG_INFO()
# endif
-#endif /* HAVE_RES_SEARCH !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE)) */
+
+#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE))) */
/* }}} */
+
/* {{{ exec.c */
ZEND_BEGIN_ARG_INFO_EX(arginfo_exec, 0, 0, 1)
ZEND_ARG_INFO(0, command)
@@ -2999,14 +3001,17 @@
PHP_FE(gethostname,
arginfo_gethostname)
#endif
-#if HAVE_RES_SEARCH !(defined(__BEOS__) || defined(PHP_WIN32) ||
defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+
PHP_FE(dns_check_record,
arginfo_dns_check_record)
PHP_FALIAS(checkdnsrr, dns_check_record,
arginfo_dns_check_record)
-# if HAVE_DN_SKIPNAME HAVE_DN_EXPAND
+
+# if defined(PHP_WIN32) || (HAVE_DN_SKIPNAME HAVE_DN_EXPAND)
PHP_FE(dns_get_mx,
arginfo_dns_get_mx)
- PHP_FALIAS(getmxrr, dns_get_mx,
arginfo_dns_get_mx)
+ PHP_FALIAS(getmxrr, dns_get_mx,
arginfo_dns_get_mx)
# endif
-# if HAVE_DNS_FUNCS
+
+# if defined(PHP_WIN32) || HAVE_DNS_FUNCS
PHP_FE(dns_get_record,
arginfo_dns_get_record)
# endif
#endif
@@ -3034,6 +3039,9 @@
PHP_FE(is_scalar,
arginfo_is_scalar)
PHP_FE(is_callable,
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Tue Jan 6 20:51:37 2009 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- MFB: add multi threaded build support (automatic detection of the number of
cpus, add a custom number if you prefer to use only a few of your available
cores)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.94r2=1.95diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.94 php-src/win32/build/config.w32:1.95
--- php-src/win32/build/config.w32:1.94 Tue Jan 6 20:47:06 2009
+++ php-src/win32/build/config.w32 Tue Jan 6 20:51:37 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.94 2009/01/06 20:47:06 pajoye Exp $
+// $Id: config.w32,v 1.95 2009/01/06 20:51:37 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -145,6 +145,10 @@
}
}
+if (VCVERS = 1500) {
+ ADD_FLAG('CFLAGS', ' /MP ');
+}
+
// General link flags
DEFINE(LDFLAGS, /nologo /version: +
PHP_VERSION + . + PHP_MINOR_VERSION + . + PHP_RELEASE_VERSION);
--
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) /win32/build config.w32
pajoye Tue Jan 6 20:50:57 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32
Log:
- add multi threaded build support (automatic detection of the number of
cpus, add a custom number if you prefer to use only a few of your available
cores)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.40r2=1.40.2.8.2.10.2.41diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.40
php-src/win32/build/config.w32:1.40.2.8.2.10.2.41
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.40 Tue Jan 6 20:46:36 2009
+++ php-src/win32/build/config.w32 Tue Jan 6 20:50:57 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.40 2009/01/06 20:46:36 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.41 2009/01/06 20:50:57 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -145,6 +145,10 @@
}
}
+if (VCVERS = 1500) {
+ ADD_FLAG('CFLAGS', ' /MP ');
+}
+
// General link flags
DEFINE(LDFLAGS, /nologo /version: +
PHP_VERSION + . + PHP_MINOR_VERSION + . + PHP_RELEASE_VERSION);
--
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 dns.c
pajoye Tue Jan 6 21:47:13 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c
Log:
- fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.12r2=1.70.2.7.2.5.2.13diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.12
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.13
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.12Tue Jan 6 20:48:20 2009
+++ php-src/ext/standard/dns.c Tue Jan 6 21:47:13 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.12 2009/01/06 20:48:20 pajoye Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.13 2009/01/06 21:47:13 pajoye Exp $ */
/* {{{ includes */
#include php.h
@@ -310,6 +310,27 @@
}
/* }}} */
+#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
+# define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP
currently */
+
+# define PHP_DNS_A 0x0001
+# define PHP_DNS_NS 0x0002
+# define PHP_DNS_CNAME 0x0010
+# define PHP_DNS_SOA0x0020
+# define PHP_DNS_PTR0x0800
+# define PHP_DNS_HINFO 0x1000
+# define PHP_DNS_MX 0x4000
+# define PHP_DNS_TXT0x8000
+# define PHP_DNS_A6 0x0100
+# define PHP_DNS_SRV0x0200
+# define PHP_DNS_NAPTR 0x0400
+# define PHP_DNS_ 0x0800
+# define PHP_DNS_ANY0x1000
+# define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
+#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
+
+
+
#if HAVE_DNS_FUNCS
#ifndef HFIXEDSZ
@@ -889,22 +910,6 @@
#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
-#define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP
currently */
-
-#define PHP_DNS_A 0x0001
-#define PHP_DNS_NS 0x0002
-#define PHP_DNS_CNAME 0x0010
-#define PHP_DNS_SOA0x0020
-#define PHP_DNS_PTR0x0800
-#define PHP_DNS_HINFO 0x1000
-#define PHP_DNS_MX 0x4000
-#define PHP_DNS_TXT0x8000
-#define PHP_DNS_A6 0x0100
-#define PHP_DNS_SRV0x0200
-#define PHP_DNS_NAPTR 0x0400
-#define PHP_DNS_ 0x0800
-#define PHP_DNS_ANY0x1000
-#define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
PHP_MINIT_FUNCTION(dns) {
REGISTER_LONG_CONSTANT(DNS_A, PHP_DNS_A, CONST_CS |
CONST_PERSISTENT);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dns.c
pajoye Tue Jan 6 22:00:23 2009 UTC
Modified files:
/php-src/ext/standard dns.c
Log:
- MFB: fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.99r2=1.100diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.99 php-src/ext/standard/dns.c:1.100
--- php-src/ext/standard/dns.c:1.99 Tue Jan 6 20:44:56 2009
+++ php-src/ext/standard/dns.c Tue Jan 6 22:00:23 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.99 2009/01/06 20:44:56 pajoye Exp $ */
+/* $Id: dns.c,v 1.100 2009/01/06 22:00:23 pajoye Exp $ */
/* {{{ includes */
#include php.h
@@ -310,6 +310,24 @@
RETURN_TRUE;
}
/* }}} */
+#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
+#define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP
currently */
+
+#define PHP_DNS_A 0x0001
+#define PHP_DNS_NS 0x0002
+#define PHP_DNS_CNAME 0x0010
+#define PHP_DNS_SOA0x0020
+#define PHP_DNS_PTR0x0800
+#define PHP_DNS_HINFO 0x1000
+#define PHP_DNS_MX 0x4000
+#define PHP_DNS_TXT0x8000
+#define PHP_DNS_A6 0x0100
+#define PHP_DNS_SRV0x0200
+#define PHP_DNS_NAPTR 0x0400
+#define PHP_DNS_ 0x0800
+#define PHP_DNS_ANY0x1000
+#define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
+#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
#if HAVE_DNS_FUNCS
@@ -890,23 +908,6 @@
#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
-#define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP
currently */
-
-#define PHP_DNS_A 0x0001
-#define PHP_DNS_NS 0x0002
-#define PHP_DNS_CNAME 0x0010
-#define PHP_DNS_SOA0x0020
-#define PHP_DNS_PTR0x0800
-#define PHP_DNS_HINFO 0x1000
-#define PHP_DNS_MX 0x4000
-#define PHP_DNS_TXT0x8000
-#define PHP_DNS_A6 0x0100
-#define PHP_DNS_SRV0x0200
-#define PHP_DNS_NAPTR 0x0400
-#define PHP_DNS_ 0x0800
-#define PHP_DNS_ANY0x1000
-#define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
-
PHP_MINIT_FUNCTION(dns) {
REGISTER_LONG_CONSTANT(DNS_A, PHP_DNS_A, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(DNS_NS,PHP_DNS_NS,CONST_CS |
CONST_PERSISTENT);
--
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 dns_win32.c
pajoye Tue Jan 6 23:23:28 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns_win32.c
Log:
- [DOC] VC6 does not have NAPTR
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.1.2.2
php-src/ext/standard/dns_win32.c:1.1.2.3
--- php-src/ext/standard/dns_win32.c:1.1.2.2Tue Jan 6 20:48:21 2009
+++ php-src/ext/standard/dns_win32.cTue Jan 6 23:23:28 2009
@@ -93,7 +93,7 @@
int type = DNS_TYPE_MX;
DNS_STATUS status; /* Return value of DnsQuery_A()
function */
- PDNS_RECORD pResult, pRec; /* Pointer to DNS_RECORD
structure */
+ PDNS_RECORD pResult; /* Pointer to DNS_RECORD structure */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, hostname,
hostname_len, rectype, rectype_len) == FAILURE) {
return;
@@ -260,7 +260,9 @@
case DNS_TYPE_NAPTR:
{
+#ifdef DNS_NAPTR_DATA
DNS_NAPTR_DATA * data_naptr = pRec-Data.Naptr;
+
add_assoc_string(*subarray, type, NAPTR, 1);
add_assoc_long(*subarray, order,
data_naptr-wOrder);
add_assoc_long(*subarray, pref,
data_naptr-wPreference);
@@ -268,6 +270,7 @@
add_assoc_string(*subarray, services,
data_naptr-pService, 1);
add_assoc_string(*subarray, regex,
data_naptr-pRegularExpression, 1);
add_assoc_string(*subarray, replacement,
data_naptr-pReplacement, 1);
+#endif
}
break;
--
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 dns.c
pajoye Tue Jan 6 23:37:28 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c
Log:
- these ifdefs are a mess, fix build on win
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.13r2=1.70.2.7.2.5.2.14diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.13
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.14
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.13Tue Jan 6 21:47:13 2009
+++ php-src/ext/standard/dns.c Tue Jan 6 23:37:28 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.13 2009/01/06 21:47:13 pajoye Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.14 2009/01/06 23:37:28 pajoye Exp $ */
/* {{{ includes */
#include php.h
@@ -258,6 +258,25 @@
}
/* }}} */
+#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
+# define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP
currently */
+
+# define PHP_DNS_A 0x0001
+# define PHP_DNS_NS 0x0002
+# define PHP_DNS_CNAME 0x0010
+# define PHP_DNS_SOA0x0020
+# define PHP_DNS_PTR0x0800
+# define PHP_DNS_HINFO 0x1000
+# define PHP_DNS_MX 0x4000
+# define PHP_DNS_TXT0x8000
+# define PHP_DNS_A6 0x0100
+# define PHP_DNS_SRV0x0200
+# define PHP_DNS_NAPTR 0x0400
+# define PHP_DNS_ 0x0800
+# define PHP_DNS_ANY0x1000
+# define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
+#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
+
#if HAVE_RES_SEARCH !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE))
/* {{{ proto bool dns_check_record(string host [, string type])
@@ -282,7 +301,7 @@
}
if (rectype) {
-if (!strcasecmp(A, rectype)) type = T_A;
+ if (!strcasecmp(A, rectype)) type = T_A;
else if (!strcasecmp(NS,rectype)) type = DNS_T_NS;
else if (!strcasecmp(MX,rectype)) type = DNS_T_MX;
else if (!strcasecmp(PTR, rectype)) type = DNS_T_PTR;
@@ -310,27 +329,6 @@
}
/* }}} */
-#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
-# define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP
currently */
-
-# define PHP_DNS_A 0x0001
-# define PHP_DNS_NS 0x0002
-# define PHP_DNS_CNAME 0x0010
-# define PHP_DNS_SOA0x0020
-# define PHP_DNS_PTR0x0800
-# define PHP_DNS_HINFO 0x1000
-# define PHP_DNS_MX 0x4000
-# define PHP_DNS_TXT0x8000
-# define PHP_DNS_A6 0x0100
-# define PHP_DNS_SRV0x0200
-# define PHP_DNS_NAPTR 0x0400
-# define PHP_DNS_ 0x0800
-# define PHP_DNS_ANY0x1000
-# define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
-#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
-
-
-
#if HAVE_DNS_FUNCS
#ifndef HFIXEDSZ
--
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/tidy tidy.c
iliaa Tue Jan 6 23:45:17 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/tidy tidy.c
Log:
Param parsing cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.24.2.13r2=1.66.2.8.2.24.2.14diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.13
php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.14
--- php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.13 Wed Dec 31 11:15:46 2008
+++ php-src/ext/tidy/tidy.c Tue Jan 6 23:45:16 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.66.2.8.2.24.2.13 2008/12/31 11:15:46 sebastian Exp $ */
+/* $Id: tidy.c,v 1.66.2.8.2.24.2.14 2009/01/06 23:45:16 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -560,7 +560,7 @@
zend_bool use_include_path = 0;
TidyDoc doc;
TidyBuffer *errbuf;
- zval **config;
+ zval **config = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|Zsb, arg1,
arg1_len, config, enc, enc_len, use_include_path) == FAILURE) {
RETURN_FALSE;
@@ -591,7 +591,7 @@
TIDY_SET_DEFAULT_CONFIG(doc);
- if (ZEND_NUM_ARGS() 1) {
+ if (config) {
TIDY_APPLY_CONFIG_ZVAL(doc, config);
}
@@ -1098,7 +1098,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Tidy support, enabled);
php_info_print_table_row(2, libTidy Release, (char
*)tidyReleaseDate());
- php_info_print_table_row(2, Extension Version,
PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.66.2.8.2.24.2.13 2008/12/31 11:15:46
sebastian Exp $));
+ php_info_print_table_row(2, Extension Version,
PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.66.2.8.2.24.2.14 2009/01/06 23:45:16
iliaa Exp $));
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy tidy.c
iliaa Tue Jan 6 23:46:22 2009 UTC
Modified files:
/php-src/ext/tidy tidy.c
Log:
MFB: Arg parsing cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.129r2=1.130diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.129 php-src/ext/tidy/tidy.c:1.130
--- php-src/ext/tidy/tidy.c:1.129 Wed Dec 31 11:12:37 2008
+++ php-src/ext/tidy/tidy.c Tue Jan 6 23:46:22 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.129 2008/12/31 11:12:37 sebastian Exp $ */
+/* $Id: tidy.c,v 1.130 2009/01/06 23:46:22 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -562,7 +562,7 @@
zend_bool use_include_path = 0;
TidyDoc doc;
TidyBuffer *errbuf;
- zval **config;
+ zval **config = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|Zsb, arg1,
arg1_len, config, enc, enc_len, use_include_path) == FAILURE) {
RETURN_FALSE;
@@ -593,7 +593,7 @@
TIDY_SET_DEFAULT_CONFIG(doc);
- if (ZEND_NUM_ARGS() 1) {
+ if (config) {
TIDY_APPLY_CONFIG_ZVAL(doc, config);
}
@@ -1156,7 +1156,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Tidy support, enabled);
php_info_print_table_row(2, libTidy Release, (char
*)tidyReleaseDate());
- php_info_print_table_row(2, Extension Version,
PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.129 2008/12/31 11:12:37 sebastian
Exp $));
+ php_info_print_table_row(2, Extension Version,
PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.130 2009/01/06 23:46:22 iliaa Exp
$));
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dns_win32.c
pajoye Tue Jan 6 23:50:30 2009 UTC
Modified files:
/php-src/ext/standard dns_win32.c
Log:
- [DOC] MFB: VC6 does not have NAPTR
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.1
php-src/ext/standard/dns_win32.c:1.2
--- php-src/ext/standard/dns_win32.c:1.1Tue Jan 6 20:44:56 2009
+++ php-src/ext/standard/dns_win32.cTue Jan 6 23:50:30 2009
@@ -260,6 +260,7 @@
case DNS_TYPE_NAPTR:
{
+#ifdef DNS_NAPTR_DATA
DNS_NAPTR_DATA * data_naptr = pRec-Data.Naptr;
add_assoc_string(*subarray, type, NAPTR, 1);
add_assoc_long(*subarray, order,
data_naptr-wOrder);
@@ -268,6 +269,7 @@
add_assoc_string(*subarray, services,
data_naptr-pService, 1);
add_assoc_string(*subarray, regex,
data_naptr-pRegularExpression, 1);
add_assoc_string(*subarray, replacement,
data_naptr-pReplacement, 1);
+#endif
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dns.c
pajoye Tue Jan 6 23:51:03 2009 UTC
Modified files:
/php-src/ext/standard dns.c
Log:
- MFB: fix build for win
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.100r2=1.101diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.100 php-src/ext/standard/dns.c:1.101
--- php-src/ext/standard/dns.c:1.100Tue Jan 6 22:00:23 2009
+++ php-src/ext/standard/dns.c Tue Jan 6 23:51:03 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.100 2009/01/06 22:00:23 pajoye Exp $ */
+/* $Id: dns.c,v 1.101 2009/01/06 23:51:03 pajoye Exp $ */
/* {{{ includes */
#include php.h
@@ -259,6 +259,25 @@
}
/* }}} */
+#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
+#define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP
currently */
+
+#define PHP_DNS_A 0x0001
+#define PHP_DNS_NS 0x0002
+#define PHP_DNS_CNAME 0x0010
+#define PHP_DNS_SOA0x0020
+#define PHP_DNS_PTR0x0800
+#define PHP_DNS_HINFO 0x1000
+#define PHP_DNS_MX 0x4000
+#define PHP_DNS_TXT0x8000
+#define PHP_DNS_A6 0x0100
+#define PHP_DNS_SRV0x0200
+#define PHP_DNS_NAPTR 0x0400
+#define PHP_DNS_ 0x0800
+#define PHP_DNS_ANY0x1000
+#define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
+#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
+
#if HAVE_RES_SEARCH !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE))
/* {{{ proto bool dns_check_record(string host [, string type]) U
@@ -310,24 +329,6 @@
RETURN_TRUE;
}
/* }}} */
-#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
-#define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP
currently */
-
-#define PHP_DNS_A 0x0001
-#define PHP_DNS_NS 0x0002
-#define PHP_DNS_CNAME 0x0010
-#define PHP_DNS_SOA0x0020
-#define PHP_DNS_PTR0x0800
-#define PHP_DNS_HINFO 0x1000
-#define PHP_DNS_MX 0x4000
-#define PHP_DNS_TXT0x8000
-#define PHP_DNS_A6 0x0100
-#define PHP_DNS_SRV0x0200
-#define PHP_DNS_NAPTR 0x0400
-#define PHP_DNS_ 0x0800
-#define PHP_DNS_ANY0x1000
-#define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
-#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
#if HAVE_DNS_FUNCS
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / run-tests.php
Antony Dovgal kirjoitti: On 05.01.2009 15:37, Jani Taskinen wrote: That didn't answer the obvious question: does the run-tests.php from PHP_5_3 work in PHP_5_2? :) Yes, it does. So why not sync it then and keep it same in all branches..? -- 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 dns_win32.c
pajoye Wed Jan 7 01:35:36 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns_win32.c
Log:
- sanity check if we got an A as well (valid too but not desired)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.1.2.3
php-src/ext/standard/dns_win32.c:1.1.2.4
--- php-src/ext/standard/dns_win32.c:1.1.2.3Tue Jan 6 23:23:28 2009
+++ php-src/ext/standard/dns_win32.cWed Jan 7 01:35:36 2009
@@ -71,6 +71,10 @@
for (pRec = pResult; pRec; pRec = pRec-pNext) {
DNS_SRV_DATA *srv = pRec-Data.Srv;
+ if (pRec-wType != DNS_TYPE_MX) {
+ continue;
+ }
+
add_next_index_string(mx_list, pRec-Data.MX.pNameExchange, 1);
if (weight_list) {
add_next_index_long(weight_list, srv-wPriority);
@@ -296,7 +300,7 @@
int addtl_recs = 0;
IN_ADDR ipaddr;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|lz!z!,
hostname, hostname_len, type_param, authns, addtl) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|lzz,
hostname, hostname_len, type_param, authns, addtl) == FAILURE) {
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dns_win32.c
pajoye Wed Jan 7 01:37:01 2009 UTC
Modified files:
/php-src/ext/standard dns_win32.c
Log:
- MFB: sanity check if we got an A as well (valid too but not desired)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.2
php-src/ext/standard/dns_win32.c:1.3
--- php-src/ext/standard/dns_win32.c:1.2Tue Jan 6 23:50:30 2009
+++ php-src/ext/standard/dns_win32.cWed Jan 7 01:37:01 2009
@@ -71,6 +71,10 @@
for (pRec = pResult; pRec; pRec = pRec-pNext) {
DNS_SRV_DATA *srv = pRec-Data.Srv;
+ if (pRec-wType != DNS_TYPE_MX) {
+ continue;
+ }
+
add_next_index_string(mx_list, pRec-Data.MX.pNameExchange, 1);
if (weight_list) {
add_next_index_long(weight_list, srv-wPriority);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard dns_win32.c
Hi Pierre 2009/1/7 Pierre-Alain Joye paj...@php.net: pajoye Tue Jan 6 23:23:28 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard dns_win32.c Log: - [DOC] VC6 does not have NAPTR How do you want this to be written? Like how does it affect the user using official builds (assuming its still gonna be VC6) ect.? -- Kalle Sommer Nielsen -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
