[PHP-CVS] svn: /SVNROOT/ global_avail

2010-04-09 Thread Rasmus Lerdorf
rasmus   Fri, 09 Apr 2010 17:46:22 +

Revision: http://svn.php.net/viewvc?view=revision&revision=297764

Log:
engine karma for Stefan as well

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2010-04-09 17:44:42 UTC (rev 297763)
+++ SVNROOT/global_avail2010-04-09 17:46:22 UTC (rev 297764)
@@ -42,7 +42,7 @@
 avail|loudi,cweiske,mrkschan,moacir|phd,web/doc,web/doc-editor

 # People who work on the Engine - not people with just tests access
-avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire|php/php-src/*/Zend,php/php-src/*/TSRM
+avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron|php/php-src/*/Zend,php/php-src/*/TSRM

 # The PHP Documentation Group maintains the documentation and its
 # translations.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /SVNROOT/ global_avail

2010-04-09 Thread Rasmus Lerdorf
rasmus   Fri, 09 Apr 2010 17:27:57 +

Revision: http://svn.php.net/viewvc?view=revision&revision=297762

Log:
Karma for Stefan Marr

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2010-04-09 17:18:14 UTC (rev 297761)
+++ SVNROOT/global_avail2010-04-09 17:27:57 UTC (rev 297762)
@@ -16,7 +16,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.

-avail|mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johann!
 
es,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj|php/php-src,pecl,phpdoc,phd,web/doc,web/doc-editor
+avail|mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johann!
 
es,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron|php/php-src,pecl,phpdoc,phd,web/doc,web/doc-editor

 # Engine karma is further restricted (this line MUST come after lines granting
 # php-src karma and before lines granting Zend/TSRM karma)

-- 
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/NEWS branches/PHP_5_3/ext/dom/php_dom.c trunk/ext/dom/php_dom.c

2010-04-09 Thread Rob Richards
rrichardsFri, 09 Apr 2010 11:34:34 +

Revision: http://svn.php.net/viewvc?view=revision&revision=297744

Log:
fix bug #50828 (DOMNotation is not subclass of DOMNode)

Bug: http://bugs.php.net/50828 (Open) DOMNotation is not subclass of DOMNode
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/dom/php_dom.c
U   php/php-src/trunk/ext/dom/php_dom.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-04-09 10:57:47 UTC (rev 297743)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-04-09 11:34:34 UTC (rev 297744)
@@ -44,6 +44,7 @@
 - Fixed bug #51023 (filter doesn't detect int overflows with GCC 4.4).
   (Raphael Geissert)
 - Fixed bug #50999 (unaligned memory access in dba_fetch()). (Felipe)
+- Fixed bug #50828 (DOMNotation is not subclass of DOMNode). (Rob)
 - Fixed bug #50810 (property_exists does not work for private). (Felipe)
 - Fixed bug #50731 (Inconsistent namespaces sent to functions registered with
   spl_autoload_register). (Felipe)

Modified: php/php-src/branches/PHP_5_3/ext/dom/php_dom.c
===
--- php/php-src/branches/PHP_5_3/ext/dom/php_dom.c  2010-04-09 10:57:47 UTC 
(rev 297743)
+++ php/php-src/branches/PHP_5_3/ext/dom/php_dom.c  2010-04-09 11:34:34 UTC 
(rev 297744)
@@ -777,15 +777,12 @@
zend_hash_merge(&dom_documenttype_prop_handlers, 
&dom_node_prop_handlers, NULL, NULL, sizeof(dom_prop_handler), 0);
zend_hash_add(&classes, ce.name, ce.name_length + 1, 
&dom_documenttype_prop_handlers, sizeof(dom_documenttype_prop_handlers), NULL);

-   REGISTER_DOM_CLASS(ce, "DOMNotation", NULL, 
php_dom_notation_class_functions, dom_notation_class_entry);
+   REGISTER_DOM_CLASS(ce, "DOMNotation", dom_node_class_entry, 
php_dom_notation_class_functions, dom_notation_class_entry);

zend_hash_init(&dom_notation_prop_handlers, 0, NULL, NULL, 1);
dom_register_prop_handler(&dom_notation_prop_handlers, "publicId", 
dom_notation_public_id_read, NULL TSRMLS_CC);
dom_register_prop_handler(&dom_notation_prop_handlers, "systemId", 
dom_notation_system_id_read, NULL TSRMLS_CC);
-   /* Notation nodes are special */
-   dom_register_prop_handler(&dom_notation_prop_handlers, "nodeName", 
dom_node_node_name_read, NULL TSRMLS_CC);
-   dom_register_prop_handler(&dom_notation_prop_handlers, "nodeValue", 
dom_node_node_value_read, dom_node_node_value_write TSRMLS_CC);
-   dom_register_prop_handler(&dom_notation_prop_handlers, "attributes", 
dom_node_attributes_read, NULL TSRMLS_CC);
+   zend_hash_merge(&dom_notation_prop_handlers, &dom_node_prop_handlers, 
NULL, NULL, sizeof(dom_prop_handler), 0);
zend_hash_add(&classes, ce.name, ce.name_length + 1, 
&dom_notation_prop_handlers, sizeof(dom_notation_prop_handlers), NULL);

REGISTER_DOM_CLASS(ce, "DOMEntity", dom_node_class_entry, 
php_dom_entity_class_functions, dom_entity_class_entry);

Modified: php/php-src/trunk/ext/dom/php_dom.c
===
--- php/php-src/trunk/ext/dom/php_dom.c 2010-04-09 10:57:47 UTC (rev 297743)
+++ php/php-src/trunk/ext/dom/php_dom.c 2010-04-09 11:34:34 UTC (rev 297744)
@@ -777,15 +777,12 @@
zend_hash_merge(&dom_documenttype_prop_handlers, 
&dom_node_prop_handlers, NULL, NULL, sizeof(dom_prop_handler), 0);
zend_hash_add(&classes, ce.name, ce.name_length + 1, 
&dom_documenttype_prop_handlers, sizeof(dom_documenttype_prop_handlers), NULL);

-   REGISTER_DOM_CLASS(ce, "DOMNotation", NULL, 
php_dom_notation_class_functions, dom_notation_class_entry);
+   REGISTER_DOM_CLASS(ce, "DOMNotation", dom_node_class_entry, 
php_dom_notation_class_functions, dom_notation_class_entry);

zend_hash_init(&dom_notation_prop_handlers, 0, NULL, NULL, 1);
dom_register_prop_handler(&dom_notation_prop_handlers, "publicId", 
dom_notation_public_id_read, NULL TSRMLS_CC);
dom_register_prop_handler(&dom_notation_prop_handlers, "systemId", 
dom_notation_system_id_read, NULL TSRMLS_CC);
-   /* Notation nodes are special */
-   dom_register_prop_handler(&dom_notation_prop_handlers, "nodeName", 
dom_node_node_name_read, NULL TSRMLS_CC);
-   dom_register_prop_handler(&dom_notation_prop_handlers, "nodeValue", 
dom_node_node_value_read, dom_node_node_value_write TSRMLS_CC);
-   dom_register_prop_handler(&dom_notation_prop_handlers, "attributes", 
dom_node_attributes_read, NULL TSRMLS_CC);
+   zend_hash_merge(&dom_notation_prop_handlers, &dom_node_prop_handlers, 
NULL, NULL, sizeof(dom_prop_handler), 0);
zend_hash_add(&classes, ce.name, ce.name_length + 1, 
&dom_notation_prop_handlers, sizeof(dom_notation_prop_handlers), NULL);

REGISTER_DOM_CLASS(ce, "DOMEntity", dom_node_class_entry, 
php_dom_entity_class_