This commit was manufactured by cvs2svn to create tag 'php_5_0_3RC2'.

- MFB: imagefill, always restore the alphablending mode

EXTENSIONS

@@ -220,7 +220,7 @@ COMMENT:             Using the new OCI8 driver is encouraged where possible.
 EXTENSION:           dom
 PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>, Marcus Boerger <helly@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Experimental
+STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 EXTENSION:           simplexml
@@ -247,7 +247,7 @@ STATUS:              Experimental
 EXTENSION:           xsl
 PRIMARY MAINTAINER:  Christian Stocker <chregu@php.net>, Rob Richards <rrichards@php.net>
 MAINTENANCE:         Maintained
-STATUS:              Experimental
+STATUS:              Working
 SINCE:               5.0
 -------------------------------------------------------------------------------
 

NEWS

@@ -1,15 +1,259 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-27 May 2004, PHP 5 Release Candidate 3
+09 Dec 2004, PHP 5.0.3RC2
+- Fixed bug #31034 (Problem with non-existing iconv header file). (Derick)
+- Fixed bug #28598 (Lost support for MS Symbol fonts). (Pierre)
+
+29 Nov 2004, PHP 5.0.3RC1
+- Added the %F modifier to *printf to render a non-locale-aware representation
+  of a float with the . as decimal seperator. (Derick)
+- Fixed error handling in mysqli_multi_query. (Georg)
+- Extended the functionality of is_subclass_of() to accept either a class name
+  or an object as first parameter. (Andrey) 
+- Fixed potential problems with unserializing invalid serialize data. (Marcus)
+- Fixed bug #30995 (snmp extension does not build with net-snmp 5.2). (Ilia)
+- Fixed bug #30990 (allow popen() on *NIX to accept 'b' flag). (Ilia)
+- Fixed bug #30967 (properties in extended mysqli classes don't work). (Georg)
+- Fixed bug #30928 (When Using WSDL, SoapServer doesn't handle private or
+  protected properties). (Dmitry)
+- Fixed bug #30922 (reflective functions crash PHP when interfaces extend
+  themselves). (Tony, Dmitry)
+- Fixed bug #30904 (segfault when recording soapclient into session). (Tony,
+  Dmitry)
+- Fixed bug #30890 (MySQLi testsuite)
+- Fixed bug #30856 (ReflectionClass::getStaticProperties segfaults). (Marcus)
+- Fixed bug #30832 ("!" stripped off comments in xml parser). (Rob)
+- Fixed bug #30799 (SoapServer doesn't handle private or protected properties).
+  (Dmitry)
+- Fixed bug #30783 (Apache crash when using ReflectionFunction::
+  getStaticVariables()). (Marcus)
+- Fixed bug #30750 (Meaningful error message when upload directory is not 
+  accessible). (Ilia)
+- Fixed bug #30685 (Malformed SOAPClient http header reequest). (Dmitry)
+- Fixed bug #30672 (Problem handling exif data in jpeg images at unusual 
+  places). (Marcus)
+- Fixed bug #30658 (Ensure that temporary files created by GD are removed).
+  (Ilia)
+- Fixed bug #30645 (def. multi result set support for mysql_connect). (Georg)
+- Fixed bug #30637 (compile with pear error). (Antony)
+- Fixed bug #30587 (array_multisort doesn't separate zvals before 
+  changing them). (Tony)
+- Fixed bug #30572 (crash when comparing SimpleXML attribute to a boolean).
+  (Andi)
+- Fixed bug #30566 (attribute namespace URIs are inconsistent when parsing).
+  (Rob)
+- Fixed bug #30490 (PEAR installation fails). (Antony)
+- Fixed bug #30475 (curl_getinfo() may crash in some situations). (Ilia)
+- Fixed bug #30442 (segfault when parsing ?getvariable[][ ). (Tony)
+- Fixed bug #30388 (rename across filesystems loses ownership and 
+  permission info). (Tony)
+- Fixed bug #30387 (stream_socket_client async connect was broken).
+  (vnegrier at esds dot com, Wez).
+- Fixed bug #30381 (Strange results with get_class_vars()). (Marcus)
+- Fixed bug #30375 (cal_info() does not work without a parameter). (Ilia)
+- Fixed bug #30362 (stream_get_line() not handling end string correctly).
+  (Ilia)
+- Fixed bug #30359 (SOAP client requests have no port in "Host" field).
+  (Dmitry)
+- Fixed bug #30356 (str_ireplace() does not work on all strings). (Ilia)
+- Fixed bug #30344 (Reflection::getModifierNames() returns too long strings).
+  (Marcus)
+- Fixed bug #30329 (Error Fetching http body, No Content-Length, connection
+  closed or chunked data). (Dmitry)
+- Fixed bug #30282 (segfault when using unknown/unsupported 
+  session.save_handler and/or session.serialize_handler). (Tony)
+- Fixed bug #30281 (Prevent non-wbmp images from being detected as such).
+  (Ilia)
+- Fixed bug #30276 (Possible crash in ctype_digit on large numbers). (Ilia)
+- Fixed bug #30230 (exception handler not working with objects). (Marcus)
+- Fixed bug #30224 (Sybase date strings are sometimes not null terminated).
+  (Ilia)
+- Fixed bug #30175 (SOAP results aren't parsed correctly). (Dmitry)
+- Fixed bug #30147 (OO sqlite_fetch_object did not reset error handler). (Wez)
+- Fixed bug #30133 (get_current_user() crashes on Windows). (Edin)
+- Fixed bug #30061 (xml_set_start_namespace_decl_handler not called). (Rob)
+- Fixed bug #30057 (did not detect IPV6 on FreeBSD 4.1). (Wez)
+- Fixed bug #30042 (strtotime does not use second param). (Derick)
+- Fixed bug #30027 (Possible crash inside ftp_get()).
+  (cfield at affinitysolutions dot com)
+- Fixed bug #29954 (array_reduce segfaults when initial value is array). (Tony)
+- Fixed bug #29883 (isset gives invalid values on strings). (Tony, Dmitry)
+- Fixed bug #29801 (Set limit on the size of mmapable data). (Ilia)
+- Fixed bug #29557 (strtotime error). (Derick)
+- Fixed bug #29418 (double free when openssl_csr_new fails).
+  (Kamesh Jayachandran).
+- Fixed bug #29385 (Soapserver always uses std class). (David, Dmitry)
+- Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob)
+- Fixed bug #28817 (Var problem when extending domDocument). (Georg)
+- Fixed bug #28599 (strtotime fails with zero base time). (Derick)
+- Fixed bug #28220 (mb_strwidth() returns wrong width values for some hangul
+  characters). (Moriyoshi)
+- Fixed bug #28209 (strtotime("now")). (Derick)
+- Fixed bug #27798 (private / protected variables not exposed by 
+  get_object_vars() inside class). (Marcus)
+- Fixed bug #27183 (Userland stream wrapper segfaults on stream_write). 
+  (Christian)
+
+23 Sep 2004, PHP 5.0.2
+- Added new boolean (fourth) parameter to array_slice() that turns on the
+  preservation of keys in the returned array. (Derick)
+- Added the sorting flag SORT_LOCALE_STRING to the sort() functions which makes
+  them sort based on the current locale. (Derick)
+- Added interface_exists() and make class_exists() only return true for real
+  classes. (Andrey)
+- Added PHP_EOL constant that contains the OS way of representing newlines.
+  (Paul Hudson, Derick)
+- Implemented periodic PCRE compiled regexp cache cleanup, to avoid memory
+  exhaustion. (Andrei)
+- Renamed SoapClient->__call() to SoapClinet->__soapCall(). (Dmitry)
+- Fixed bug with raw_post_data not getting set (Brian)
+- Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
+- Fixed bug #30209 (ReflectionClass::getMethod() lowercases attribute). 
+  (Marcus)
+- Fixed bug #30182 (SOAP module processing WSDL file dumps core). (Dmitry)
+- Fixed bug #30045 (Cannot pass big integers (> 2147483647) in SOAP requests).
+  (Dmitry)
+- Fixed bug #29985 (unserialize()/ __PHP_Incomplete_class does not report 
+  correctly class name). (Marcus, Tony)
+- Fixed bug #29945 (simplexml_load_file URL limitation 255 char). (Rob)
+- Fixed bug #29873 (No defines around pcntl_*priority definitions). (Derick)
+- Fixed bug #29844 (SOAP doesn't return the result of a valid SOAP request).
+  (Dmitry)
+- Fixed bug #29842 (soapclient return null value). (Dmitry)
+- Fixed bug #29839 (incorrect convert (xml:lang to lang)). (Dmitry)
+- Fixed bug #29830 (SoapServer::setClass() should not export non-public
+  methods). (Dmitry)
+- Fixed bug #29828 (Interfaces no longer work). (Marcus)
+- Fixed bug #29821 (Fixed possible crashes in convert_uudecode() on invalid
+  data). (Ilia)
+- Fixed bug #29808 (array_count_values() breaks with numeric strings). (Ilia)
+- Fixed bug #29805 (HTTP Authentication Issues). (Uwe Schindler)
+- Fixed bug #29795 (SegFault with Soap and Amazon's Web Services). (Dmitry)
+- Fixed bug #29737 (ip2long should return -1 if IP is 255.255.255.255 and FALSE
+  on error). (Tony)
+- Fixed bug #29711 (Changed ext/xml to default to UTF-8 output). (Rob)
+- Fixed bug #29678 (opendir() with ftp:// wrapper segfaults if path does not
+  have trailing slash). (Ilia)
+- Fixed bug #29657 (xml_* functions throw non descriptive error). 
+  (Christian, Rob)
+- Fixed bug #29656 (segfault on result and statement properties). (Georg)
+- Fixed bug #29566 (foreach/string handling strangeness (crash)). (Dmitry)
+- Fixed bug #29447 (Reflection API issues). (Marcus)
+- Fixed bug #29296 (Added sslv2 and sslv3 transports). (Wez)
+- Fixed bug #29283 (Invalid statement handle in mysqli on execute). (Georg)
+- Fixed bug #29913 (parse_url() is now binary safe). (Ilia)
+- Fixed bug #27994 (segfault with Soapserver when WSDL-Cache is enabled).
+  (Dmitry)
+- Fixed bug #27791 (Apache 2.0 SAPI build against Apache 2 HEAD). (Joe Orton,
+  Derick)
+- Fixed bug #26737 (private/protected properties not serialized when user
+  declared method __sleep() exists). E_NOTICE thrown when __sleep() returns
+  name of non-existing member. (Andrey, Curt)
+
+12 Aug 2004, PHP 5.0.1
+- Changed destructor mechanism so that destructors are called prior to request
+  shutdown. (Marcus)
+- Rewritten UNIX and Windows install help files. (Documentation Team)
+- Updated several libraries bundled with the windows release which now 
+  includes libxml2-2.6.11, libxslt-1.1.7 and iconv-1.9.1. (Rob, Edin)
+- Improved and moved ActiveScript SAPI to PECL.  (Wez)
+- Fixed bug #29606 (php_strip_whitespace() prints to stdout rather then
+  returning the value). (Ilia)
+- Fixed bug #29577 (MYSQLI_CLIENT_FOUND_ROWS undefined) (Georg)
+- Fixed bug #29573 (Segmentation fault, when exception thrown within
+  PHP function called from XSLT). (Christian)
+- Fixed bug #29522 (accessing properties without connection) (Georg)
+- Fixed bug #29505 (get_class_vars() severely broken when used with arrays).
+  (Marcus)
+- Fixed bug #29490 (.Net object instantiation failed). (Michael Sisolak).
+- Fixed bug #29474 (win32: usleep() doesn't work). (Wez)
+- Fixed bug #29449 (win32: feof() hangs on empty tcp stream). (Wez)
+- Fixed bug #29437 (Possible crash inside array_walk_recursive()). (Ilia)
+- Fixed bug #29431 (crash when parsing invalid address; invalid address
+  returned by stream_socket_recvfrom(), stream_socket_getname()). (Wez)
+- Fixed bug #29409 (Segfault in PHP functions called from XSLT). (Rob)
+- Fixed unloading of dynamically loaded extensions. 
+  (Marcus, kameshj at fastmail dot fm)
+- Fixed bug #29395 (sqlite_escape_string() returns bogus data on empty
+  strings). (Ilia, Tony)
+- Fixed bug #29392 (com_dotnet crashes when echo'ing an object). (Wez)
+- Fixed bug #29368 (The destructor is called when an exception is thrown from 
+  the constructor). (Marcus)
+- Fixed bug #29354 (Exception constructor marked as both public and protected).
+  (Marcus)
+- Fixed bug #29342 (strtotime() does not handle empty date string properly).
+  (Ilia)
+- Fixed bug #29340 (win32 build produces invalid php_ifx.dll). (Edin)
+- Fixed bug #29335 (fetch functions now use MYSQLI_BOTH as default) (Georg)
+- Fixed bug #29291 (get_class_vars() return names with NULLs). (Marcus)
+- Fixed bug #29264 (gettext extension not working). (Edin)
+- Fixed bug #29258 (variant_date_from_timestamp() does not honour
+  timezone).  (Wez)
+- Fixed bug #29256 (error when sending large packets on a socket). (Dmitry)
+- Fixed bug #29236 (memory error when wsdl-cache is enabled). (Dmitry)
+- Fixed bug #29147 (Compile Error in mnoGoSearch functions). (Sergey, Antony)
+- Fixed bug #29132 ($_SERVER["PHP_AUTH_USER"] isn't defined). (Stefan)
+- Fixed bug #29119 (html_entity_decode() misbehaves with UTF-8). (Moriyoshi)
+- Fixed bug #29109 (SoapFault exception: [WSDL] Out of memory). (Dmitry)
+- Fixed bug #29061 (soap extension segfaults). (Dmitry)
+- Fixed bug #28985 (__getTypes() returning nothing on complex WSDL). (Dmitry)
+- Fixed bug #28969 (Wrong data encoding of special characters). (Dmitry)
+- Fixed bug #28895 (ReflectionClass::isAbstract always returns false). (Marcus)
+- Fixed bug #28829 (Thread-unsafety in bcmath elementary values). (Sara)
+- Fixed bug #28464 (catch() does not catch exceptions by interfaces). (Marcus)
+- Fixed bug #27669 (PHP 5 didn't support all possibilities for calling static
+  methods dynamically). (Dmitry)
+- Fixed ReflectionClass::getMethod() and ReflectionClass::getProperty() to
+  raise an ReflectionException instead of returning NULL on failure.
+  (Sebastian)
+- Fixed convert.* filters to consume remaining buckets_in on flush. (Sara)
+- Fixed bug in mysqli->client_version. (Georg)
+
+13 Jul 2004, PHP 5.0.0
+- Updated PCRE to provide better error handling in certain cases. (Andrei)
+- Changed doc comments to require a single white space after '/**'. (Marcus)
+- Fixed bug #29019 (Database not closing). (Marcus)
+- Fixed bug #29008 (array_combine() does not handle non-numeric/string keys).
+  (Ilia)
+- Fixed bug #28999 (fixed behaviour of exec() to work as it did in 4.X). (Ilia)
+- Fixed bug #28868 (Internal filter registry not thread safe). (Sara)
+- Fixed bug #28851 (call_user_func_array has typo in error message). (Marcus)
+- Fixed bug #28831 (ArrayObject::offsetGet() does the work of offsetUnset()). 
+  (Marcus)
+- Fixed bug #28822 (ArrayObject::offsetExists() works inverted). (Marcus)
+- Fixed bug #28789 (ReflectionProperty getValue() fails on public static 
+  members). (Marcus)
+- Fixed bug #28771 (Segfault when using xslt and clone). (Rob)
+- Fixed bug #28751 (SoapServer does not call _autoload()). (Dmitry)
+- Fixed bug #28739 (array_*diff() and array_*intersect() not clearing the fci
+  cache before work). (Andrey)
+- Fixed bug #28721 (appendChild() and insertBefore() unset DOMText).(Rob)
+- Fixed bug #28702 (SOAP does not parse WSDL service address correctly). (Dmitry)
+- Fixed bug #28699 (Reflection api bugs). (Marcus)
+- Fixed bug #28694 (ReflectionExtension::getFunctions() crashes PHP). (Marcus)
+- Fixed bug #28512 (Allocate enough space to store MSSQL data). (Frank)
+- Fixed strip_tags() to correctly handle '\0' characters. (Stefan)
+
+7 Jun 2004, PHP 5 Release Candidate 3
 - Moved the PDFLib extension to PECL. (Wez)
+- Added MySQL 4.1.2-alpha and 4.1.3-beta support to MySQLI extension. (Georg)
 - Added support for dumping private/protected properties to var_dump().
   (Andrey)
 - Added count() support for COM arrays. (Wez)
+- Added Firebird/InterBase UDF source that allows PHP functions to be called 
+  from SQL (Ard)
+- Removed Firebird/Interbase function ibase_timefmt() (Ard)
+- Changed user error handler mechanism to relay to built-in error handler if it
+  returns false. (Andrei)
 - Changed class type hints for function parameters to not allow the passing of
   NULL values. (Andi)
 - Changed tidy_node to tidyNode and removed tidy_exception. (John)
+- Fixed ip2long() to return FALSE if an IP address passed to this function
+  is not valid. (Derick)
 - Fixed memory leak in memory manager. (Andi)
 - Fixed problem with exceptions returning from include(). (Dmitry)
+- Fixed bug #28641 (Instance of Interface). (Marcus)
+- Fixed bug #28430 (Extending mysqli class). (Georg)
 - Fixed bug #28311 (Transparency detection code is off by 1).
   (Ilia, pikeman at pikeman dot sytes dot net)
 - Fixed bug #28304 (Missing bounds check inside imagefilter()). (Ilia)
@@ -17,8 +261,10 @@ PHP                                                                        NEWS
 - Fixed bug #28287 (stream_*_register() not calling __autoload()). (Sara)
 - Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness). (Ilia)
 - Fixed bug #28239 (No results returned on SOAP call, no error given). (Dmitry)
+- Fixed bug #28205 (num_rows property for statement object). (Georg)
 - Fixed bug #28161 (COM: Array style properties could not be accessed). (Wez)
 - Fixed bug #28125 (ArrayObject leaks when accessing elements). (Marcus)
+- Fixed bug #28100 (NULL parameter support for mysqli_ssl_set). (Georg)
 - Fixed bug #28099 (ArrayObject doesn't implement ArrayAccess). (Marcus)
 - Fixed bug #27929 (SPL: change visibility of ArrayIterator::__construct).
   (Marcus)
@@ -70,7 +316,6 @@ PHP                                                                        NEWS
 - Fixed bug #27619 (filters not applied to pre-buffered stream data). (Sara)
 - Fixed bug #27519 (Reflection_Function constructor crashes with non-existant 
   function's name). (Marcus)
-- Fixed bug #27469 (serialize() objects of incomplete class). (Dmitry)
 - Fixed bug #27457 (handling of numeric indexes in strtr()). (Dmitry)
 - Fixed bug #27397 (debug_backtrace() not showing function arguments). (Zeev)
 - Fixed bug #27283 (The last catch statement was sometimes skipped). (Andi)

README.CVS-RULES

@@ -37,8 +37,11 @@ The next few rules are more of a technical nature.
       messages every day. Woe be to those who attempt to mess with it.
 
    2. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file. Also see
-      the note below about automatically updating NEWS in your commit message.
+      bug fixes, improvements, etc., should go into the NEWS file. 
+	  
+      NB! Lines, starting with @ will go automagically into NEWS file, but
+      this is NOT recommended, though. Please, add news entries directly to 
+      NEWS file and don't forget to keep them adjusted and sorted.
 
    3. Do not commit multiple file and dump all messages in one commit. If you
       modified several unrelated files, commit each group separately and
@@ -59,14 +62,10 @@ The next few rules are more of a technical nature.
 The format of the commit messages is pretty simple.
 
 If a line begins with #, it is taken to be a comment and will not appear
-in the ChangeLog.  If the line begins with @, it will be redirected to the
-NEWS file. Everything else goes into the ChangeLog.
+in the ChangeLog. Everything else goes into the ChangeLog.
 
 It is important to note that if your comment or news logline spans multiple
-lines, you have to put # or @ at the beginning of _every_ such line. Every 
-entry in NEWS has to have a name after it, so if you did it with someone's 
-help, put both your names there. Your name WILL NOT be automatically put
-at the end of the NEWS entry - so, please provide it yourself.
+lines, you have to put # at the beginning of _every_ such line. 
 
 Example. Say you modified two files, datetime.c and string.c. In datetime.c
 you added a new format option for date() function, and in string.c you fixed
@@ -78,17 +77,12 @@ For datetime.c:
 
 (PHP date) Added new 'K' format modifier for printing out number of
            days until New Year's Eve.
-@- Added new 'K' format modifier that will output the number of days
-@  until New Year's Eve. (Bob)
 
 For string.c:
 (php_trim) Fixed a memory leak resulting from improper use of zval_dtor().
 # Man, that thing was leaking all over the place!
-@- Fixed memory leak in trim(). (Bob)
 
-The lines above marked with @ will go into NEWS file automagically, and the
-# lines will be omitted from the ChangeLog. Alternatively, you might want
-to modify NEWS file directly and not use the @ lines.
+The # lines will be omitted from the ChangeLog automagically.
 
 If you fix some bugs, you should note the bug ID numbers in your
 commit message. Bug ID should be prefixed by "#" for easier access to
@@ -97,12 +91,10 @@ bug report when developers are browsing CVS via. LXR or Bonsai.
 Example:
 
 Fixed pgsql notice handler double free crash bug. Bug #14016
-@ Fixed pgsql notice handler double free crash bug. Bug #14016
 
-If you don't see your messages in ChangeLog and NEWS right away, don't worry!
+If you don't see your messages in ChangeLog right away, don't worry!
 These files are updated once a day, so your stuff will not show up until
-somewhat later. Don't go adding stuff to NEWS by hand if you already put @
-lines in the commit message.
+somewhat later. 
 
 You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
 to look at PHP CVS repository in various ways.

README.PHP4-TO-PHP5-THIN-CHANGES

@@ -77,20 +77,24 @@
 
 9. get_class() starting PHP 5 returns the name of the class as it was
    declared which may lead to problems in older scripts that rely on
-   the previous behaviour - the class name is lowercased.
+   the previous behaviour - the class name is lowercased. Expect the
+   same behaviour from get_parent_class() when applicable.
    Example :
    <?php
    class FooBar {
    }
+   class ExtFooBar extends FooBar{}
    $a = new FooBar();
-   var_dump(get_class($a));
+   var_dump(get_class($a), get_parent_class($a));
    ?>
 
    Output (PHP 4):
    string(6) "foobar"
+   string(9) "extfoobar"
 
    Output (PHP 5):
    string(6) "FooBar"
+   string(9) "ExtFooBar"
    ----------------------------------------------------------------------
    Example code that will break :
    //....
@@ -101,7 +105,51 @@
      //...
    }
    //...
-   Possible solution is to search for get_class() in all your scripts and
-   use strtolower().
+   Possible solution is to search for get_class() and get_parent_class() in
+   all your scripts and use strtolower().
+
+10. get_class_methods() returns the names of the methods of a class as they
+   declared. In PHP4 the names are all lowercased.
+   Example code :
+   <?php
+   class Foo{
+     function doFoo(){}
+     function hasFoo(){}
+   }
+   var_dump(get_class_methods("Foo")); 
+   ?>
+   Output (PHP4):
+   array(2) {
+     [0]=>
+     string(5) "dofoo"
+     [1]=>
+     string(6) "hasfoo"
+   }
+   Output (PHP5):
+   array(2) {
+     [0]=>
+     string(5) "doFoo"
+     [1]=>
+     string(6) "hasFoo"
+   }
+
+11. Assignment $this is impossible. Starting PHP 5.0.0 $this has special
+    meaning in class methods and is recognized by the PHP parser. The latter
+    will generate a parse error when assignment to $this is found
+    Example code :
+    <?php
+    class Foo {
+      function assignNew($obj) {
+        $this = $obj;
+      }
+    }
+    $a = new Foo();
+    $b = new Foo();
+    $a->assignNew($b);
+    echo "I was executed\n";
+    ?>
+    Output (PHP 4):
+    I was executed
+    Output (PHP 5):
+    PHP Fatal error:  Cannot re-assign $this in /tmp/this_ex.php on line 4
 
-   

README.input_filter

@@ -155,7 +155,7 @@ PHP_FUNCTION(my_get_raw)
     HashTable *hash_ptr;
     char *raw_var;
 
-    if(zend_parse_parameters(2 TSRMLS_CC, "ls|l", &arg, &var, &var_len) == FAILURE) {
+    if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) {
         return;
     }
 

TODO

@@ -7,13 +7,9 @@ Zend
       dimensional arrays.
     * Look at replacing c-lib call tolower().
     * Make hash API functions work with HASH_OF() to save time.
-    * Allow to set a default value for call-by-reference-parameters. 
-      eg: function hello (&$pallo = NULL) {} 
     * Add configure test to determine if dlsym() requires underscore and set
       DLSYM_NEEDS_UNDERSCORE accordingly. Perl and zsh have it in configure, 
       for example. (DONE?)
-    * Allow foreach ($array as $k => &$val) syntax. right now we cannot 
-      traverse an array without copying each element.
     * Native large number support (probably with GNU GMP)
     * Const'ify APIs. Right now, many functions leave parameters untouched,
       but don't declare those as const. This makes interaction with other

TODO-5.1

@@ -0,0 +1,17 @@
+Zend Engine
+-----------
+  - Look at making zend_constant value member be a zval* instead of zval. (Andi)
+  - Add the patch for referring to existing .ini vars in .ini files. (Andrei)
+  - Implement inheritance rules for type hints. (Marcus) 
+  - Implement true/false/NULL as keywords (apply the patch). (Andi, Marcus)
+  - Implement typehinting for arrays (apply the patch). (Andi, Marcus)
+  - Find a keyword for the if-set-or operator (apply the patch). (Marcus, all)
+  - Fix ZTS destruction (apply the patch). (Marcus)
+
+Build System
+------------
+  - Implement load order of built-in extensions (apply the patch). (Wez)
+
+Standard Library
+----------------
+  - Implement new time/date parsing and handling functions. (Derick)

TODO-PHP5

@@ -16,83 +16,6 @@ Responsibility: Andi, Stig?
 Time frame:     ?
 
 
-Component:      Introspection
-
-                get_function_definition(<is_callable> [field]) =>
-                array(
-                	file => filename
-                	line_start =>
-                	line_end =>
-                	parameters => array( name, byref, default )
-                	static_variables => array( name, value/default )
-                	scope => 'namespace' | 'class' | null
-                	namespace => classname | namespacename | 'main'
-                	protection => protection_flags
-                	phpdoc => pre-scanned-phpdoc-string
-                	type => 'internal' | 'user'
-                )
-                
-                get_class_definition(<class> [field]) =>
-                array(
-                	type => 'internal' | 'user'
-                	file => filename
-                	line_start => 
-                	line_end =>
-                	name => pretty-name
-                	parent => classname | namespace | null
-                	flags => bitfield (ABSTRACT)
-                	methods => array( array( name, phpdoc ) )
-                	default_properties => array( array( name, value, phpdoc ) )
-                	private_properties => array( array( name, value, phpdoc ) )
-                	protected_properties => array( array( name, value, phpdoc ) )
-                	public_properties => array( array( name, value, phpdoc ) )
-                	static_members => array( array( name, value, phpdoc ) )
-                	constants => array( array( name, value, phpdoc ) )
-                	classes => array( array( name, phpdoc ) )
-                	phpdoc => pre-scanned-phpdoc-string
-                )
-                
-                get_constant_definition(<constant> [field]) =>
-                array(
-                	file => filename
-                	line_start =>
-                	line_end =>
-                	name => 
-                	value =>
-                	phpdoc =>
-                )
-                
-                get_global_variable_defintion(<name> [field]) =>
-                array(
-                	file =>
-                	line_start =>
-                	line_end =>
-                	name =>
-                	phpdoc =>
-                )
-                
-                We tried to take into account the implementation of each piece of
-                information, and there are some that are problematic, especially those
-                regarding constants and global variables (where do we store the extra
-                information?)
-                
-                With "pre-scanned-phpdoc-string" we mean converting:
-                
-                /**
-                 * Blah blah blah
-                 * @param foo ...
-                 */
-                
-                to:
-                
-                Blah blah blah
-                @param foo
-                
-                The rest of the phpdoc handling should be left to an extension.
-Responsibility: Stig, Andrei, Harald
-Time frame:     ?
-
-
 Component:      Redesign of API Versioning
 Responsibility: ?
 Time frame:     1 month
@@ -172,31 +95,6 @@ Responsibility: Sterling, Harald
 Time frame:     ?
 
 
-Component:      MySQL Extension
-                Complete rewrite, leveraging the new MySQL 4 / MySQL 5
-                features.
-Responsibility: Georg Richter, Zak Greant
-Timeframe:      ?
-
-
-Component:      XML
-                - Rewrite DOMXML and incorporate all (or most of) W3C-DOM2.
-                - Use the new ZE2 features (Exceptions, setter/getter).
-                - Add SAX(2), XML Schema.
-                - XSLT, HTML, XPath, XPointer, DTD Validation will still be
-                  supported, have to find a meaningful API for it.
-                - Break BC, warn users now.
-                - Look at the libxml2 patch by lukas schröder and see if we can prevent
-                  memory leaks with it (anyway, getting rid of mem-leaks and intelligent
-                  memory management is on top prio...)
-                - In the longer term, domxml (or another name, as with todays features
-                  domxml is a little bit misleading) shall be the main xml-class, which
-                  covers most of what's needed for decent XML support in PHP ;)
-                  But there is certainly place for others like Sablotron etc.
-Responsibility: Christian Stocker
-Timeframe:      ?
-
-
 Component:      Test Suite
                 Extending the test suite with atleast a test for every
                 function in an extension that doesn't require external

TSRM/tsrm_virtual_cwd.c

@@ -308,15 +308,22 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 
 	if (path_length == 0) 
 		return (0);
+	if (path_length >= MAXPATHLEN)
+		return (1);
 
 #if !defined(TSRM_WIN32) && !defined(NETWARE)
 	/* cwd_length can be 0 when getcwd() fails.
 	 * This can happen under solaris when a dir does not have read permissions
 	 * but *does* have execute permissions */
 	if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
-		if (use_realpath && realpath(path, resolved_path)) {
-			path = resolved_path;
-			path_length = strlen(path);
+		if (use_realpath) {
+			if (realpath(path, resolved_path)) {
+				path = resolved_path;
+				path_length = strlen(path);
+			} else {
+				/* disable for now
+				return 1; */
+			}
 		}
 	} else { /* Concat current directory with relative path and then run realpath() on it */
 		char *tmp;
@@ -332,9 +339,19 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 		memcpy(ptr, path, path_length);
 		ptr += path_length;
 		*ptr = '\0';
-		if (use_realpath && realpath(tmp, resolved_path)) {
-			path = resolved_path;
-			path_length = strlen(path);
+		if (strlen(tmp) >= MAXPATHLEN) {
+			free(tmp);
+			return 1;
+		}
+		if (use_realpath) {
+			if (realpath(tmp, resolved_path)) {
+				path = resolved_path;
+				path_length = strlen(path);
+			} else {
+				/* disable for now 
+				free(tmp);
+				return 1; */
+			}
 		}
 		free(tmp);
 	}
@@ -851,13 +868,24 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 {
 	int command_length;
+	int dir_length, extra = 0;
 	char *command_line;
-	char *ptr;
+	char *ptr, *dir;
 	FILE *retval;
 
 	command_length = strlen(command);
 
-	ptr = command_line = (char *) malloc(command_length + sizeof("cd  ; ") + CWDG(cwd).cwd_length+1);
+	dir_length = CWDG(cwd).cwd_length;
+	dir = CWDG(cwd).cwd;
+	while (dir_length > 0) {
+		if (*dir == '\'') extra+=3;
+		dir++;
+		dir_length--;
+	}
+	dir_length = CWDG(cwd).cwd_length;
+	dir = CWDG(cwd).cwd;
+
+	ptr = command_line = (char *) malloc(command_length + sizeof("cd '' ; ") + dir_length +1+1);
 	if (!command_line) {
 		return NULL;
 	}
@@ -867,8 +895,21 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 	if (CWDG(cwd).cwd_length == 0) {
 		*ptr++ = DEFAULT_SLASH;
 	} else {
-		memcpy(ptr, CWDG(cwd).cwd, CWDG(cwd).cwd_length);
-		ptr += CWDG(cwd).cwd_length;
+		*ptr++ = '\'';
+		while (dir_length > 0) {
+			switch (*dir) {
+			case '\'':
+				*ptr++ = '\'';
+				*ptr++ = '\\';
+				*ptr++ = '\'';
+				/* fall-through */
+			default:
+				*ptr++ = *dir;
+			}
+			dir++;
+			dir_length--;
+		}
+		*ptr++ = '\'';
 	}
 	
 	*ptr++ = ' ';

Zend/ChangeLog

@@ -1,3 +1,236 @@
+2004-07-14  Stanislav Malyshev  <stas@zend.com>
+
+    * zend_object_handlers.c:
+      be consistent with write_dimension
+
+    * zend_object_handlers.c:
+      fix #28957
+
+2004-07-13  Andi Gutmans  <andi@zend.com>
+
+    * zend.h:
+      - 5.0.1-dev
+
+2004-07-13  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_constants.c:
+      Bugfix #29116 Zend constant warning uses memory after free (jdolecek at
+      NetBSD dot org)
+
+2004-07-13  Andi Gutmans  <andi@zend.com>
+
+    * (php_5_0_0)
+      zend.h:
+      - Roll PHP 5.0.0
+
+2004-07-12  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (php_5_0_0RC4)
+      zend_execute.c:
+      Fixed bug #29086 & #28064 (PHP crashes on extremly long scripts).
+
+2004-07-12  Andi Gutmans  <andi@zend.com>
+
+    * (php_5_0_0RC4)
+      zend.c:
+      - Convert zend_class_entry -> zend_class_entry *
+
+2004-07-10  Jon Parise  <jon+php@csh.rit.edu>
+
+    * zend.c:
+      DragonFly BSD is derived from FreeBSD and requires the same floating point
+      precision fix.
+
+2004-07-10  Andi Gutmans  <andi@zend.com>
+
+    * zend_alloc.c
+      zend_hash.c
+      zend_variables.c:
+      - Better stability during premature shutdown of request startup
+
+2004-07-05  Andi Gutmans  <andi@zend.com>
+
+    * zend_mm.h:
+      - Disable zend_mm for 5.0.0
+
+2004-07-03  Andi Gutmans  <andi@zend.com>
+
+    * zend_alloc.c:
+      - Should fix mem leak with ZEND_MM. I made this change a while ago and
+      - rolled it back but I don't remember why. Please test!
+
+2004-07-01  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * zend_constants.c:
+      Do not use alloca() where it can be easily abused by the users.
+      
+
+2004-06-25  Wez Furlong  <wez.php@thebrainroom.net>
+
+    * zend_stream.c
+      zend_stream.h:
+      export zend stream functions for zend extensions under windows
+
+2004-06-24  Sara Golemon  <php@alphaweb.net>
+
+    * zend_execute.c:
+      Ease off on severity of new error (Using Resources as array offsets)
+
+2004-06-23  Sara Golemon  <php@alphaweb.net>
+
+    * zend_execute.c:
+      BugFix #28879  Inconsistent behavior between explicit and implicit array
+      creation.
+      
+      Changes:
+      
+      Throw E_WARNING "Illegal offset type" when explicitly creating
+      array elements with objects, arrays, or resorces as indexes.
+      This matches implicit creation w/ obj/arr indices.
+      
+      Throw E_WARNING "Resource ID#%ld used as offset, casting to integer (%ld)"
+      when implicitly creating array with resource as index. (BC)
+
+2004-06-19  Sebastian Bergmann  <sb@sebastian-bergmann.de>
+
+    * zend_reflection_api.c:
+      Reflection_* -> Reflection*. Patch by Timm Friebe.
+
+2004-06-18  Sara Golemon  <php@alphaweb.net>
+
+    * zend_execute.c:
+      Another typo in converting array index doubles to long.
+
+2004-06-18  George Schlossnagle  <george@omniti.com>
+
+    * zend_builtin_functions.c:
+      fix for 28213.
+      
+      class_name and call_type should be reinitialized on every loop iter.
+
+2004-06-17  Sara Golemon  <php@alphaweb.net>
+
+    * zend_builtin_functions.c:
+      String length in parse_parameters should be int
+
+2004-06-15  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_reflection_api.c:
+      
+
+2004-06-14  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_language_scanner.l:
+      Need {} here
+
+2004-06-10  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_language_scanner.l:
+      - Require a single white-space char after /** to start a doc comment that
+        way we prevent /*** from becoming a doc comment (as requested Derick).
+
+    * zend_API.h:
+      Add missing declaration
+
+    * zend_reflection_api.c:
+      Small code layout change
+
+    * zend_language_scanner.l:
+      Do not require NEWLINE at start of doccomment
+
+    * zend_reflection_api.c:
+      Bugfix #28699: Reflection api bugs
+
+2004-06-09  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_reflection_api.c:
+      Fix Bug #28694 ReflectionExtension::getFunctions() crashes PHP
+
+2004-06-07  Andi Gutmans  <andi@zend.com>
+
+    * zend.h:
+      - Go back to -dev (Shouldn't need another RC)
+
+    * (php_5_0_0RC3)
+      zend.h:
+      - Roll RC3
+
+2004-06-06  Stefan Esser  <sesser@suspekt.org>
+
+    * zend_compile.h
+      zend_opcode.c:
+      Fixed Zend Function Destructor to use correct TSRM handle.
+
+2004-06-05  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_API.c:
+      Fix #28641: Instance of Interface
+
+2004-06-03  Andi Gutmans  <andi@zend.com>
+
+    * (php_5_0_0RC3RC2)
+      zend.h:
+      - Prepare for RC3RC2
+
+2004-06-02  Andi Gutmans  <andi@zend.com>
+
+    * zend_mm.h:
+      - Don't use ZEND_MM in Windows
+
+2004-06-02  Stanislav Malyshev  <stas@zend.com>
+
+    * zend_execute.c:
+      fix incdec - make value's refcount non-zero when passing to
+      write_property - otherwise __set caller cleanup could kill it.
+
+2004-06-01  Andi Gutmans  <andi@zend.com>
+
+    * zend.c:
+      - If user error handler returns "false" then we relay to the built in error
+        handler
+
+2004-05-31  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_reflection_api.c:
+      Refcount must not be set separatley again.
+
+    * zend_reflection_api.c
+      zend_reflection_api.c:
+      Add missing initialization
+
+    * zend_compile.c:
+      
+
+2004-05-28  Andrei Zmievski  <andreiz@gmail.com>
+
+    * zend.c:
+      Allow user-defined error handlers to indicate whether default error
+      handler should be re-invoked, by returning true or false.
+
+2004-05-28  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_execute.c:
+      Prevent possible problems with illegal properties
+
+2004-05-28  Derick Rethans  <php@derickrethans.nl>
+
+    * zend_builtin_functions.c:
+      - Make the default mask for user defined error handlers include ALL errors,
+        including E_STRICT.
+
+2004-05-27  Andi Gutmans  <andi@zend.com>
+
+    * zend.h:
+      - Back to RC3-dev until we roll final
+
+    * (php_5_0_0RC3RC1)
+      zend_execute.c:
+      - Fix problem with exceptions returning from include(). (Dmitry)
+
+    * (php_5_0_0RC3RC1)
+      zend.h:
+      - RC3RC1
+
 2004-05-26  Wez Furlong  <wez.php@thebrainroom.net>
 
     * zend_object_handlers.c:

Zend/Makefile.am

@@ -16,7 +16,8 @@ libZend_la_SOURCES=\
 	zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
 	zend_objects_API.c zend_ts_hash.c zend_stream.c zend_mm.c \
 	zend_default_classes.c zend_reflection_api.c \
-	zend_iterators.c zend_interfaces.c zend_exceptions.c
+	zend_iterators.c zend_interfaces.c zend_exceptions.c \
+	zend_strtod.c
 
 libZend_la_LDFLAGS =
 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@

Zend/ZEND_CHANGES

@@ -545,7 +545,7 @@ Changes in the Zend Engine 2.0
 
         <?php
         class Exception {
-          function __construct(string $message=NULL, int $code=0) {
+          function __construct(/*string*/ $message=NULL, /*int*/ $code=0) {
             if (func_num_args()) {
               $this->message = $message;
             }
@@ -890,6 +890,47 @@ Changes in the Zend Engine 2.0
       the use of all abstract methods declared in the interfaces Iterator
       and IteratorAggregate respectively.
 
+    * Array overloading
+    
+      Objects can be used with Array notation when they implement the 
+      interface ArrayAccess. You cannot use such objects in standard
+      array functions, however you have full control over the array
+      notation. This allows lazy initialization or read only array.
+      
+      Note that setting [] results in a call to offsetSet() with
+      index being NULL. That means that as with standard arrays you 
+      cannot store NULL keys.
+      
+      Example:
+      
+        <?php
+	        class ArrayClass implements ArrayAccess {
+				public $a = array();
+			
+				function offsetExists($index) {
+					return array_key_exists($index, $this->a);
+				}
+				function offsetGet($index) {
+					return $this->a[$index];
+				}
+				function offsetSet($index, $newval) {
+					return $this->a[$index] = $newval;
+				}
+				function offsetUnset($index) {
+					unset($this->a[$index]);
+				}
+			}
+			
+			$obj = new ArrayClass;
+			
+			$obj[0] = 'bla';     // calls offsetSet(0,'bla')
+			$obj[] = 42;         // calls offsetSet(NULL, 42)
+			$x = $obj[0];        // calls offsetGet(0)
+			$b = isset($obj[0]); // calls offsetExists(0)
+			unset($obj[0]);      // calls offsetUnset(0)
+		?>
+ 
+
     * __METHOD__
 
       The pseudo constant __METHOD__ shows the current class and method

Zend/Zend.dsp

@@ -7,20 +7,20 @@
 CFG=Zend - Win32 Release_inline
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "Zend.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")
-!MESSAGE
+!MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -95,7 +95,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ENDIF
+!ENDIF 
 
 # Begin Target
 
@@ -135,10 +135,6 @@ SOURCE=.\zend_default_classes.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_interfaces.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_dynamic_array.c
 # End Source File
 # Begin Source File
@@ -179,6 +175,10 @@ SOURCE=.\zend_ini_scanner.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_interfaces.c
+# End Source File
+# Begin Source File
+
 SOURCE=".\zend_language_parser.c"
 # End Source File
 # Begin Source File
@@ -243,6 +243,10 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_strtod.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_ts_hash.c
 # End Source File
 # Begin Source File
@@ -291,10 +295,6 @@ SOURCE=.\zend_default_classes.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\zend_interfaces.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\zend_dynamic_array.h
 # End Source File
 # Begin Source File
@@ -351,6 +351,10 @@ SOURCE=.\zend_ini_scanner.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_interfaces.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_istdiostream.h
 # End Source File
 # Begin Source File
@@ -415,6 +419,10 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_strtod.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_ts_hash.h
 # End Source File
 # Begin Source File
@@ -449,7 +457,7 @@ BuildCmds= \
 
 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -504,7 +512,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # End Group
@@ -533,7 +541,7 @@ InputPath=.\zend_ini_scanner.l
 
 !ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
@@ -570,7 +578,7 @@ InputPath=".\zend_language_scanner.l"
 
 # End Custom Build
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # End Group

Zend/ZendTS.dsp

@@ -276,6 +276,10 @@ SOURCE=.\zend_stream.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_strtod.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_ts_hash.c
 # End Source File
 # Begin Source File
@@ -452,6 +456,10 @@ SOURCE=.\zend_stream.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\zend_strtod.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\zend_ts_hash.h
 # End Source File
 # Begin Source File

Zend/tests/bug27798.phpt

@@ -0,0 +1,72 @@
+--TEST--
+Bug #27798 (private / protected variables not exposed by get_object_vars() inside class)
+--FILE--
+<?php
+
+class Base
+{
+	public    $Foo = 1;
+	protected $Bar = 2;
+	private   $Baz = 3;
+	
+	function __construct()
+	{
+		echo __METHOD__ . "\n";
+		var_dump(get_object_vars($this));
+	}
+}
+
+class Child extends Base
+{
+	private   $Baz = 4;
+
+	function __construct()
+	{
+		parent::__construct();
+		echo __METHOD__ . "\n";
+		var_dump(get_object_vars($this));
+	}
+}
+
+var_dump(get_object_vars(new Base));
+var_dump(get_object_vars(new Child));
+
+?>
+===DONE===
+--EXPECT--
+Base::__construct
+array(3) {
+  ["Foo"]=>
+  int(1)
+  ["Bar"]=>
+  int(2)
+  ["Baz"]=>
+  int(3)
+}
+array(1) {
+  ["Foo"]=>
+  int(1)
+}
+Base::__construct
+array(3) {
+  ["Baz"]=>
+  int(4)
+  ["Foo"]=>
+  int(1)
+  ["Bar"]=>
+  int(2)
+}
+Child::__construct
+array(3) {
+  ["Baz"]=>
+  int(4)
+  ["Foo"]=>
+  int(1)
+  ["Bar"]=>
+  int(2)
+}
+array(1) {
+  ["Foo"]=>
+  int(1)
+}
+===DONE===

Zend/tests/bug28444.phpt

@@ -0,0 +1,74 @@
+--TEST--
+Bug #28444 (Cannot access undefined property for object with overloaded property access)
+--FILE--
+<?php
+
+class Object
+{
+	public $x;
+
+	function __construct($x)
+	{
+		$this->x = $x;
+	}
+}
+
+class Overloaded
+{
+	public $props = array();
+	public $x;
+
+	function __construct($x)
+	{
+		$this->x = new Object($x);
+	}
+
+	function __get($prop)
+	{
+		echo __METHOD__ . "($prop)\n";
+		return $this->props[$prop];
+	}
+
+	function __set($prop, $val)
+	{
+		echo __METHOD__ . "($prop,$val)\n";
+		$this->props[$prop] = $val;
+	}
+}
+$y = new Overloaded(2);
+var_dump($y->x);
+var_dump($y->x->x);
+var_dump($y->x->x = 3);
+var_dump($y->y = 3);
+var_dump($y->y);
+var_dump($y->z = new Object(4));
+var_dump($y->z->x);
+$t = $y->z;
+var_dump($t->x = 5);
+var_dump($y->z->x = 6);
+
+?>
+===DONE===
+--EXPECTF--
+object(Object)#%d (1) {
+  ["x"]=>
+  int(2)
+}
+int(2)
+int(3)
+Overloaded::__set(y,3)
+int(3)
+Overloaded::__get(y)
+int(3)
+Overloaded::__set(z,Object id #3)
+object(Object)#%d (1) {
+  ["x"]=>
+  int(4)
+}
+Overloaded::__get(z)
+int(4)
+Overloaded::__get(z)
+int(5)
+Overloaded::__get(z)
+int(6)
+===DONE===

Zend/tests/bug29368.phpt

@@ -0,0 +1,34 @@
+--TEST--
+Bug #29368 (The destructor is called when an exception is thrown from the constructor)
+--FILE--
+<?
+
+class Foo
+{
+	function __construct()
+	{
+		echo __METHOD__ . "\n";
+		throw new Exception;
+	}
+	function __destruct()
+	{
+		echo __METHOD__ . "\n";
+	}
+}
+
+try
+{
+	$bar = new Foo;
+} catch(Exception $exc)
+{
+	echo "Caught exception!\n";
+}
+
+unset($bar);
+
+?>
+===DONE===
+--EXPECTF--
+Foo::__construct
+Caught exception!
+===DONE===

Zend/tests/bug29505.phpt

@@ -0,0 +1,31 @@
+--TEST--
+Bug #29505 (get_class_vars() severely broken when used with arrays)
+--FILE--
+<?php
+
+class Test {
+    public $empty = array();
+    public $three = array(1, "b"=>"c", 3=>array());
+}
+
+var_dump(get_class_vars('Test'));
+
+?>
+===DONE===
+--EXPECT--
+array(2) {
+  ["empty"]=>
+  array(0) {
+  }
+  ["three"]=>
+  array(3) {
+    [0]=>
+    int(1)
+    ["b"]=>
+    string(1) "c"
+    [3]=>
+    array(0) {
+    }
+  }
+}
+===DONE===

Zend/tests/bug29883.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #29883 (isset gives invalid values on strings)
+--FILE--
+<?php
+$x = "bug";
+var_dump(isset($x[-1]));
+var_dump(isset($x["1"]));
+echo $x["1"]."\n";
+?>
+--EXPECT--
+bool(false)
+bool(true)
+u

Zend/tests/bug30922.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #30922 (reflective functions crash PHP when interfaces extend themselves)
+--FILE--
+<?php
+interface RecurisiveFooFar extends RecurisiveFooFar {}
+class A implements RecurisiveFooFar {}
+
+$a = new A();
+var_dump($a instanceOf A);
+echo "ok\n";
+?>
+--EXPECTF--
+Fatal error: Interface RecurisiveFooFar cannot not implement itself in %sbug30922.php on line %d

Zend/zend.c

@@ -83,7 +83,6 @@ ZEND_INI_END()
 ZEND_API int compiler_globals_id;
 ZEND_API int executor_globals_id;
 ZEND_API int alloc_globals_id;
-zend_class_entry global_main_class;
 HashTable *global_function_table;
 HashTable *global_class_table;
 HashTable *global_constants_table;
@@ -429,7 +428,7 @@ static void zend_set_default_compile_time_values(TSRMLS_D)
 static void compiler_globals_ctor(zend_compiler_globals *compiler_globals TSRMLS_DC)
 {
 	zend_function tmp_func;
-	zend_class_entry tmp_class;
+	zend_class_entry *tmp_class;
 
 	compiler_globals->compiled_filename = NULL;
 
@@ -439,7 +438,7 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals TSRMLS
 
     compiler_globals->class_table = (HashTable *) malloc(sizeof(HashTable));
     zend_hash_init_ex(compiler_globals->class_table, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
-    zend_hash_copy(compiler_globals->class_table, global_class_table, (copy_ctor_func_t) zend_class_add_ref, &tmp_class, sizeof(zend_class_entry));
+    zend_hash_copy(compiler_globals->class_table, global_class_table, (copy_ctor_func_t) zend_class_add_ref, &tmp_class, sizeof(zend_class_entry *));
 
 	zend_set_default_compile_time_values(TSRMLS_C);
 
@@ -512,8 +511,8 @@ static void alloc_globals_dtor(zend_alloc_globals *alloc_globals_p TSRMLS_DC)
 #endif
 
 
-#ifdef __FreeBSD__
-/* FreeBSD floating point precision fix */
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+/* FreeBSD and DragonFly floating point precision fix */
 #include <floatingpoint.h>
 #endif
 
@@ -554,8 +553,8 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
 	alloc_globals_ctor(&alloc_globals TSRMLS_CC);
 #endif
 
-#ifdef __FreeBSD__
-	/* FreeBSD floating point precision fix */
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+	/* FreeBSD and DragonFly floating point precision fix */
 	fpsetmask(0);
 #endif
 
@@ -866,6 +865,7 @@ ZEND_API int zend_get_configuration_directive(char *name, uint name_length, zval
 ZEND_API void zend_error(int type, const char *format, ...)
 {
 	va_list args;
+	va_list usr_copy;
 	zval ***params;
 	zval *retval;
 	zval *z_error_type, *z_error_message, *z_error_filename, *z_error_lineno, *z_context;
@@ -937,7 +937,15 @@ ZEND_API void zend_error(int type, const char *format, ...)
 			ALLOC_INIT_ZVAL(z_error_lineno);
 			ALLOC_INIT_ZVAL(z_context);
 
-			z_error_message->value.str.len = zend_vspprintf(&z_error_message->value.str.val, 0, format, args);
+#if defined(va_copy)
+			va_copy(usr_copy, args);
+#else
+			usr_copy = args;
+#endif
+			z_error_message->value.str.len = zend_vspprintf(&z_error_message->value.str.val, 0, format, usr_copy);
+#if defined(va_copy)
+			va_end(usr_copy);
+#endif
 			z_error_message->type = IS_STRING;
 
 			z_error_type->value.lval = type;
@@ -974,6 +982,9 @@ ZEND_API void zend_error(int type, const char *format, ...)
 
 			if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC)==SUCCESS) {
 				if (retval) {
+					if (Z_TYPE_P(retval) == IS_BOOL && Z_LVAL_P(retval) == 0) {
+						zend_error_cb(type, error_filename, error_lineno, format, args);
+					}
 					zval_ptr_dtor(&retval);
 				}
 			} else {

Zend/zend.h

@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "2.0.0RC3RC1"
+#define ZEND_VERSION "2.0.3RC2"
 
 #define ZEND_ENGINE_2
 
@@ -91,7 +91,7 @@ const char *zend_mh_bundle_error(void);
 
 #endif /* HAVE_MACH_O_DYLD_H */
 
-#if defined(HAVE_LIBDL)
+#if defined(HAVE_LIBDL) && !defined(HAVE_MACH_O_DYLD_H)
 
 # ifndef RTLD_LAZY
 #  define RTLD_LAZY 1    /* Solaris 1, FreeBSD's (2.1.7.1 and older) */

Zend/zend_API.c

@@ -316,11 +316,13 @@ static char *zend_parse_arg_impl(zval **arg, va_list *va, char **spec TSRMLS_DC)
 						*pl = Z_STRLEN_PP(arg);
 						break;
 					case IS_OBJECT: {
-						if (Z_OBJ_HANDLER_PP(arg, cast_object)
-							&& Z_OBJ_HANDLER_PP(arg, cast_object)(*arg, *arg, IS_STRING, 0 TSRMLS_CC) == SUCCESS) {
-							*pl = Z_STRLEN_PP(arg);
-							*p = Z_STRVAL_PP(arg);
-							break;
+						if (Z_OBJ_HANDLER_PP(arg, cast_object)) {
+							SEPARATE_ZVAL_IF_NOT_REF(arg);
+							if (Z_OBJ_HANDLER_PP(arg, cast_object)(*arg, *arg, IS_STRING, 0 TSRMLS_CC) == SUCCESS) {
+								*pl = Z_STRLEN_PP(arg);
+								*p = Z_STRVAL_PP(arg);
+								break;
+							}
 						}
 					}
 						
@@ -694,6 +696,11 @@ ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type
 	zval *tmp;
 	zend_object *object;
 
+	if (class_type->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {
+		char *what = class_type->ce_flags & ZEND_ACC_INTERFACE ? "interface" : "abstract class";
+		zend_error(E_ERROR, "Cannot instantiate %s %s", what, class_type->name);
+	}
+
 	if (!class_type->constants_updated) {
 		zend_hash_apply_with_argument(&class_type->default_properties, (apply_func_arg_t) zval_update_constant, (void *) 1 TSRMLS_CC);
 		zend_hash_apply_with_argument(class_type->static_members, (apply_func_arg_t) zval_update_constant, (void *) 1 TSRMLS_CC);
@@ -1211,6 +1218,29 @@ ZEND_API int zend_startup_module(zend_module_entry *module)
 	return zend_register_module_ex(module TSRMLS_CC);
 }
 
+void zend_check_magic_method_implementation(zend_class_entry *ce, zend_function *fptr, int error_type TSRMLS_DC)
+{
+	char lcname[16];
+	int name_len;
+
+	/* we don't care if the function name is longer, in fact lowercasing only 
+	 * the beginning of the name speeds up the check process */
+	name_len = strlen(fptr->common.function_name);
+	zend_str_tolower_copy(lcname, fptr->common.function_name, MIN(name_len, sizeof(lcname)-1));
+	lcname[sizeof(lcname)-1] = '\0'; /* zend_str_tolower_copy won't necessarily set the zero byte */
+
+	if (name_len == sizeof(ZEND_DESTRUCTOR_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_DESTRUCTOR_FUNC_NAME, sizeof(ZEND_DESTRUCTOR_FUNC_NAME)) && fptr->common.num_args != 0) {
+		zend_error(error_type, "Destuctor %s::%s() cannot take arguments", ce->name, ZEND_DESTRUCTOR_FUNC_NAME);
+	} else if (name_len == sizeof(ZEND_CLONE_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)) && fptr->common.num_args != 0) {
+		zend_error(error_type, "Method %s::%s() cannot accept any arguments", ce->name, ZEND_CLONE_FUNC_NAME);
+	} else if (name_len == sizeof(ZEND_GET_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)) && fptr->common.num_args != 1) {
+		zend_error(error_type, "Method %s::%s() must take exactly 1 argument", ce->name, ZEND_GET_FUNC_NAME);
+	} else if (name_len == sizeof(ZEND_SET_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)) && fptr->common.num_args != 2) {
+		zend_error(error_type, "Method %s::%s() must take exactly 2 arguments", ce->name, ZEND_SET_FUNC_NAME);
+	} else if (name_len == sizeof(ZEND_CALL_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)) && fptr->common.num_args != 2) {
+		zend_error(error_type, "Method %s::%s() must take exactly 2 arguments", ce->name, ZEND_CALL_FUNC_NAME);
+	}
+}
 
 /* registers all functions in *library_functions in the function hash */
 ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC)
@@ -1221,9 +1251,11 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
 	int count=0, unload=0;
 	HashTable *target_function_table = function_table;
 	int error_type;
-	zend_function *ctor = NULL, *dtor = NULL, *clone = NULL;
+	zend_function *ctor = NULL, *dtor = NULL, *clone = NULL, *__get = NULL, *__set = NULL, *__call = NULL;
 	char *lowercase_name;
 	int fname_len;
+	char *lc_class_name;
+	int class_name_len;
 
 	if (type==MODULE_PERSISTENT) {
 		error_type = E_CORE_WARNING;
@@ -1235,6 +1267,11 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
 		target_function_table = CG(function_table);
 	}
 	internal_function->type = ZEND_INTERNAL_FUNCTION;
+	
+	if (scope) {
+		class_name_len = strlen(scope->name);
+		lc_class_name = zend_str_tolower_dup(scope->name, class_name_len);
+	}
 
 	while (ptr->fname) {
 		internal_function->handler = ptr->handler;
@@ -1304,18 +1341,28 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
 			 * If it's an old-style constructor, store it only if we don't have
 			 * a constructor already.
 			 */
-			if (!strcmp(ptr->fname, scope->name) && !ctor) {
+			if ((fname_len == class_name_len) && !memcmp(lowercase_name, lc_class_name, class_name_len+1) && !ctor) {
 				ctor = reg_function;
-			} else if (!strcmp(ptr->fname, ZEND_CONSTRUCTOR_FUNC_NAME)) {
+			} else if ((fname_len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME))) {
 				ctor = reg_function;
-			} else if (!strcmp(ptr->fname, ZEND_DESTRUCTOR_FUNC_NAME)) {
+			} else if ((fname_len == sizeof(ZEND_DESTRUCTOR_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_DESTRUCTOR_FUNC_NAME, sizeof(ZEND_DESTRUCTOR_FUNC_NAME))) {
 				dtor = reg_function;
 				if (internal_function->num_args) {
 					zend_error(error_type, "Destructor %s::%s() cannot take arguments", scope->name, ptr->fname);
 				}
-
-			} else if (!strcmp(ptr->fname, ZEND_CLONE_FUNC_NAME)) {
+			} else if ((fname_len == sizeof(ZEND_CLONE_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME))) {
 				clone = reg_function;
+			} else if ((fname_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME))) {
+				__call = reg_function;
+			} else if ((fname_len == sizeof(ZEND_GET_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME))) {
+				__get = reg_function;
+			} else if ((fname_len == sizeof(ZEND_SET_FUNC_NAME)-1) && !memcmp(lowercase_name, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME))) {
+				__set = reg_function;
+			} else {
+				reg_function = NULL;
+			}
+			if (reg_function) {
+				zend_check_magic_method_implementation(scope, reg_function, error_type TSRMLS_CC);
 			}
 		}
 		ptr++;
@@ -1323,9 +1370,12 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
 		free_alloca(lowercase_name);
 	}
 	if (unload) { /* before unloading, display all remaining bad function in the module */
+		if (scope) {
+			efree(lc_class_name);
+		}
 		while (ptr->fname) {
 			if (zend_hash_exists(target_function_table, ptr->fname, strlen(ptr->fname)+1)) {
-				zend_error(error_type, "Function registration failed - duplicate name - %s", ptr->fname);
+				zend_error(error_type, "Function registration failed - duplicate name - %s%s%s", scope ? scope->name : "", scope ? "::" : "", ptr->fname);
 			}
 			ptr++;
 		}
@@ -1336,27 +1386,49 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
 		scope->constructor = ctor;
 		scope->destructor = dtor;
 		scope->clone = clone;
+		scope->__call = __call;
+		scope->__get = __get;
+		scope->__set = __set;
 		if (ctor) {
 			ctor->common.fn_flags |= ZEND_ACC_CTOR;
 			if (ctor->common.fn_flags & ZEND_ACC_STATIC) {
-				zend_error(error_type, "Constructor %s::%s cannot be static", ctor->common.scope->name, ctor->common.function_name);
+				zend_error(error_type, "Constructor %s::%s() cannot be static", scope->name, ctor->common.function_name);
 			}
 			ctor->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC;
 		}
 		if (dtor) {
 			dtor->common.fn_flags |= ZEND_ACC_DTOR;
 			if (dtor->common.fn_flags & ZEND_ACC_STATIC) {
-				zend_error(error_type, "Destructor %s::%s cannot be static", dtor->common.scope->name, dtor->common.function_name);
+				zend_error(error_type, "Destructor %s::%s() cannot be static", scope->name, dtor->common.function_name);
 			}
 			dtor->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC;
 		}
 		if (clone) {
 			clone->common.fn_flags |= ZEND_ACC_CLONE;
 			if (clone->common.fn_flags & ZEND_ACC_STATIC) {
-				zend_error(error_type, "Constructor %s::%s cannot be static", clone->common.scope->name, clone->common.function_name);
+				zend_error(error_type, "Constructor %s::%s() cannot be static", scope->name, clone->common.function_name);
 			}
 			clone->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC;
 		}
+		if (__call) {
+			if (__call->common.fn_flags & ZEND_ACC_STATIC) {
+				zend_error(error_type, "Method %s::%s() cannot be static", scope->name, __call->common.function_name);
+			}
+			__call->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC;
+		}
+		if (__get) {
+			if (__get->common.fn_flags & ZEND_ACC_STATIC) {
+				zend_error(error_type, "Method %s::%s() cannot be static", scope->name, __get->common.function_name);
+			}
+			__get->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC;
+		}
+		if (__set) {
+			if (__set->common.fn_flags & ZEND_ACC_STATIC) {
+				zend_error(error_type, "Method %s::%s() cannot be static", scope->name, __set->common.function_name);
+			}
+			__set->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC;
+		}
+		efree(lc_class_name);
 	}
 	return SUCCESS;
 }

Zend/zend_API.h

@@ -167,6 +167,8 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC,
 ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC);
 ZEND_API void zend_unregister_functions(zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC);
 ZEND_API int zend_register_module(zend_module_entry *module_entry);
+ZEND_API int zend_register_module_ex(zend_module_entry *module TSRMLS_DC);
+void zend_check_magic_method_implementation(zend_class_entry *ce, zend_function *fptr, int error_type TSRMLS_DC);
 
 ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry TSRMLS_DC);
 ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce, char *parent_name TSRMLS_DC);

Zend/zend_alloc.c

@@ -75,7 +75,7 @@ static long mem_block_end_magic = MEM_BLOCK_END_MAGIC;
 #define _CHECK_MEMORY_LIMIT(s, rs, file, lineno) { AG(allocated_memory) += rs;\
 								if (AG(memory_limit)<AG(allocated_memory)) {\
 									int php_mem_limit = AG(memory_limit); \
-									if (AG(memory_limit)+1048576 > AG(allocated_memory) - rs) { \
+									if (EG(in_execution) && AG(memory_limit)+1048576 > AG(allocated_memory) - rs) { \
 										AG(memory_limit) = AG(allocated_memory) + 1048576; \
 										if (file) { \
 											zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)", php_mem_limit, file, lineno, s); \
@@ -481,7 +481,7 @@ ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC)
 		unsigned int i, j;
 		zend_mem_header *ptr;
 
-		for (i=1; i<MAX_CACHED_MEMORY; i++) {
+		for (i=0; i<MAX_CACHED_MEMORY; i++) {
 			for (j=0; j<AG(cache_count)[i]; j++) {
 				ptr = (zend_mem_header *) AG(cache)[i][j];
 #  if MEMORY_LIMIT
@@ -496,10 +496,12 @@ ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC)
 #endif /* !ZEND_DISABLE_MEMORY_CACHE */
 
 #if defined(ZEND_MM) && !ZEND_DEBUG
+	zend_mm_shutdown(&AG(mm_heap));
 	if (full_shutdown) {
-		zend_mm_shutdown(&AG(mm_heap));
 		return;
 	}
+	zend_mm_startup(&AG(mm_heap), 256*1024);
+
 #elif defined(ZEND_WIN32) && !ZEND_DEBUG
 	if (full_shutdown && AG(memory_heap)) {
 		HeapDestroy(AG(memory_heap));
@@ -621,10 +623,11 @@ ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC)
 #endif
 
 #if defined(ZEND_MM) && ZEND_DEBUG
+	zend_mm_shutdown(&AG(mm_heap));
 	if (full_shutdown) {
-		zend_mm_shutdown(&AG(mm_heap));
 		return;
 	}
+	zend_mm_startup(&AG(mm_heap), 256*1024);
 #elif defined(ZEND_WIN32) && ZEND_DEBUG
 	if (full_shutdown && AG(memory_heap)) {
 		HeapDestroy(AG(memory_heap));

Zend/zend_alloc.h

@@ -85,6 +85,10 @@ ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LIN
 ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
 ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
 
+#define USE_ZEND_ALLOC 1
+
+#if USE_ZEND_ALLOC
+
 /* Standard wrapper macros */
 #define emalloc(size)					_emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
 #define safe_emalloc(nmemb, size, offset)       _safe_emalloc((nmemb), (size), (offset) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
@@ -123,6 +127,52 @@ ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZE
 #define safe_estrdup(ptr)  ((ptr)?(estrdup(ptr)):(empty_string))
 #define safe_estrndup(ptr, len) ((ptr)?(estrndup((ptr), (len))):(empty_string))
 
+#else
+
+#define _GNU_SOURCE
+#include <string.h>
+#undef _GNU_SOURCE
+
+/* Standard wrapper macros */
+#define emalloc(size)					malloc(size)
+#define safe_emalloc(nmemb, size, offset)		malloc((nmemb) * (size) + (offset))
+#define efree(ptr)						free(ptr)
+#define ecalloc(nmemb, size)			calloc((nmemb), (size))
+#define erealloc(ptr, size)				realloc((ptr), (size))
+#define erealloc_recoverable(ptr, size)	realloc((ptr), (size))
+#define estrdup(s)						strdup(s)
+#define estrndup(s, length)				strndup((s), (length))
+
+/* Relay wrapper macros */
+#define emalloc_rel(size)					malloc(size)
+#define safe_emalloc_rel(nmemb, size, offset)		malloc((nmemb) * (size) + (offset))
+#define efree_rel(ptr)						free(ptr)
+#define ecalloc_rel(nmemb, size)			calloc((nmemb), (size))
+#define erealloc_rel(ptr, size)				realloc((ptr), (size))
+#define erealloc_recoverable_rel(ptr, size)	realloc((ptr), (size))
+#define estrdup_rel(s)						strdup(s)
+#define estrndup_rel(s, length)				strndup((s), (length))
+
+/* Selective persistent/non persistent allocation macros */
+#define pemalloc(size, persistent)		malloc(size)
+#define pefree(ptr, persistent)			free(ptr)
+#define pecalloc(nmemb, size, persistent)		calloc((nmemb), (size))
+#define perealloc(ptr, size, persistent)		realloc((ptr), (size))
+#define perealloc_recoverable(ptr, size, persistent)	realloc((ptr), (size))
+#define pestrdup(s, persistent)			strdup(s)
+
+#define pemalloc_rel(size, persistent)		malloc(size)
+#define pefree_rel(ptr, persistent)			free(ptr)
+#define pecalloc_rel(nmemb, size, persistent)		calloc((nmemb), (size))
+#define perealloc_rel(ptr, size, persistent)		realloc((ptr), (size))
+#define perealloc_recoverable_rel(ptr, size, persistent)	realloc((ptr), (size))
+#define pestrdup_rel(s, persistent)			strdup(s)
+
+#define safe_estrdup(ptr)  ((ptr)?(strdup(ptr)):(empty_string))
+#define safe_estrndup(ptr, len) ((ptr)?(strndup((ptr), (len))):(empty_string))
+
+#endif
+
 ZEND_API int zend_set_memory_limit(unsigned int memory_limit);
 
 ZEND_API void start_memory_manager(TSRMLS_D);

Zend/zend_builtin_functions.c

@@ -44,6 +44,7 @@ static ZEND_FUNCTION(get_class);
 static ZEND_FUNCTION(get_parent_class);
 static ZEND_FUNCTION(method_exists);
 static ZEND_FUNCTION(class_exists);
+static ZEND_FUNCTION(interface_exists);
 static ZEND_FUNCTION(function_exists);
 #if ZEND_DEBUG
 static ZEND_FUNCTION(leak);
@@ -102,6 +103,7 @@ static zend_function_entry builtin_functions[] = {
 	ZEND_FE(get_parent_class,	NULL)
 	ZEND_FE(method_exists,		NULL)
 	ZEND_FE(class_exists,		NULL)
+	ZEND_FE(interface_exists,	NULL)
 	ZEND_FE(function_exists,	NULL)
 #if ZEND_DEBUG
 	ZEND_FE(leak,				NULL)
@@ -601,12 +603,21 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass)
 		ZEND_WRONG_PARAM_COUNT();
 	}
 
-	if (Z_TYPE_PP(obj) != IS_OBJECT) {
+	if (only_subclass && Z_TYPE_PP(obj) == IS_STRING) {
+		zend_class_entry **the_ce;
+		if (zend_lookup_class(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), &the_ce TSRMLS_CC) == FAILURE) {
+			zend_error(E_WARNING, "Unknown class passed as parameter");
+			RETURN_FALSE;
+		}
+		instance_ce = *the_ce;		
+	} else if (Z_TYPE_PP(obj) != IS_OBJECT) {
 		RETURN_FALSE;
+	} else {
+		instance_ce = NULL;
 	}
 	
 	/* TBI!! new object handlers */
-	if (!HAS_CLASS_ENTRY(**obj)) {
+	if (Z_TYPE_PP(obj) == IS_OBJECT && !HAS_CLASS_ENTRY(**obj)) {
 		RETURN_FALSE;
 	}
 
@@ -616,7 +627,11 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass)
 		retval = 0;
 	} else {
 		if (only_subclass) {
-			instance_ce = Z_OBJCE_PP(obj)->parent;
+			if (!instance_ce) {
+				instance_ce = Z_OBJCE_PP(obj)->parent;
+			} else {
+				instance_ce = instance_ce->parent;
+			}
 		} else {
 			instance_ce = Z_OBJCE_PP(obj);
 		}
@@ -655,30 +670,72 @@ ZEND_FUNCTION(is_a)
 /* }}} */
 
 
+/* {{{ add_class_vars */
+static void add_class_vars(zend_class_entry *ce, HashTable *properties, zval *return_value TSRMLS_DC)
+{
+	int instanceof = EG(scope) && instanceof_function(EG(scope), ce TSRMLS_CC);
+
+	if (zend_hash_num_elements(properties) > 0) {
+		HashPosition pos;
+		zval **prop;
+	
+		zend_hash_internal_pointer_reset_ex(properties, &pos);
+		while (zend_hash_get_current_data_ex(properties, (void **) &prop, &pos) == SUCCESS) {
+			char *key, *class_name, *prop_name;
+			uint key_len;
+			ulong num_index;
+			zval *prop_copy;
+	
+			zend_hash_get_current_key_ex(properties, &key, &key_len, &num_index, 0, &pos);
+			zend_hash_move_forward_ex(properties, &pos);
+			zend_unmangle_property_name(key, &class_name, &prop_name);
+			if (class_name) {
+				if (class_name[0] != '*' && strcmp(class_name, ce->name)) {
+					/* filter privates from base classes */
+					continue;
+				} else if (!instanceof) {
+					/* filter protected if not inside class */
+					continue;
+				}
+			}
+
+			/* copy: enforce read only access */
+			ALLOC_ZVAL(prop_copy);
+			*prop_copy = **prop;
+			zval_copy_ctor(prop_copy);
+			INIT_PZVAL(prop_copy);
+
+			/* this is necessary to make it able to work with default array 
+			* properties, returned to user */
+			if (Z_TYPE_P(prop_copy) == IS_CONSTANT_ARRAY || Z_TYPE_P(prop_copy) == IS_CONSTANT) {
+				zval_update_constant(&prop_copy, 0 TSRMLS_CC);
+			}
+                           
+			add_assoc_zval(return_value, prop_name, prop_copy);
+		}
+	}
+}
+/* }}} */
+
+
 /* {{{ proto array get_class_vars(string class_name)
-   Returns an array of default properties of the class */
+   Returns an array of default properties of the class. */
 ZEND_FUNCTION(get_class_vars)
 {
-	zval **class_name;
-	zend_class_entry *ce, **pce;
-	zval *tmp;
+	char *class_name;
+	int class_name_len;
+	zend_class_entry **pce;
 
-	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &class_name)==FAILURE) {
-		ZEND_WRONG_PARAM_COUNT();
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &class_name, &class_name_len) == FAILURE) {
+		return;
 	}
 
-	convert_to_string_ex(class_name);
-	
-	if (zend_lookup_class(Z_STRVAL_PP(class_name), Z_STRLEN_PP(class_name), &pce TSRMLS_CC) == FAILURE) {
+	if (zend_lookup_class(class_name, class_name_len, &pce TSRMLS_CC) == FAILURE) {
 		RETURN_FALSE;
 	} else {
-		ce = *pce;
 		array_init(return_value);
-		if (!ce->constants_updated) {
-			zend_hash_apply_with_argument(&ce->default_properties, (apply_func_arg_t) zval_update_constant, (void *) 1 TSRMLS_CC);
-			ce->constants_updated = 1;
-		}
-		zend_hash_copy(return_value->value.ht, &ce->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+		add_class_vars(*pce, &(*pce)->default_properties, return_value TSRMLS_CC);
+		add_class_vars(*pce, (*pce)->static_members, return_value TSRMLS_CC);
 	}
 }
 /* }}} */
@@ -692,9 +749,10 @@ ZEND_FUNCTION(get_object_vars)
 	zval **value;
 	HashTable *properties;
 	HashPosition pos;
-	char *key;
+	char *key, *prop_name, *class_name;
 	uint key_len;
 	ulong num_index;
+	int instanceof;
 
 	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &obj) == FAILURE) {
 		ZEND_WRONG_PARAM_COUNT();
@@ -707,16 +765,27 @@ ZEND_FUNCTION(get_object_vars)
 		RETURN_FALSE;
 	}
 
+	instanceof = EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), Z_OBJCE_PP(obj) TSRMLS_CC);
+
 	array_init(return_value);
 
 	properties = Z_OBJ_HT_PP(obj)->get_properties(*obj TSRMLS_CC);
 	zend_hash_internal_pointer_reset_ex(properties, &pos);
 
 	while (zend_hash_get_current_data_ex(properties, (void **) &value, &pos) == SUCCESS) {
-		if (zend_hash_get_current_key_ex(properties, &key, &key_len, &num_index, 0, &pos) == HASH_KEY_IS_STRING && key[0]) {
+		if (zend_hash_get_current_key_ex(properties, &key, &key_len, &num_index, 0, &pos) == HASH_KEY_IS_STRING) {
+			if (key[0]) {
 			/* Not separating references */
 			(*value)->refcount++;
 			add_assoc_zval_ex(return_value, key, key_len, *value);
+			} else if (instanceof) {
+				zend_unmangle_property_name(key, &class_name, &prop_name);
+				if (!memcmp(class_name, "*", 2) || (Z_OBJCE_P(EG(This)) == Z_OBJCE_PP(obj) && !strcmp(Z_OBJCE_P(EG(This))->name, class_name))) {
+					/* Not separating references */
+					(*value)->refcount++;
+					add_assoc_zval_ex(return_value, prop_name, strlen(prop_name)+1, *value);
+				}
+			}
 		}
 		zend_hash_move_forward_ex(properties, &pos);
 	}
@@ -733,6 +802,7 @@ ZEND_FUNCTION(get_class_methods)
 	zend_class_entry *ce = NULL, **pce;
 	HashPosition pos;
 	zend_function *mptr;
+	int instanceof;
 
 	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &class)==FAILURE) {
 		ZEND_WRONG_PARAM_COUNT();
@@ -754,18 +824,22 @@ ZEND_FUNCTION(get_class_methods)
 		RETURN_NULL();
 	}
 
+	instanceof = EG(scope) && instanceof_function(EG(scope), ce TSRMLS_CC);
+
 	array_init(return_value);
 	zend_hash_internal_pointer_reset_ex(&ce->function_table, &pos);
 
 	while (zend_hash_get_current_data_ex(&ce->function_table, (void **) &mptr, &pos) == SUCCESS) {
-		MAKE_STD_ZVAL(method_name);
-		ZVAL_STRING(method_name, mptr->common.function_name, 1);
-		zend_hash_next_index_insert(return_value->value.ht, &method_name, sizeof(zval *), NULL);
+		if ((mptr->common.fn_flags & ZEND_ACC_PUBLIC) 
+		 || (instanceof && ((mptr->common.fn_flags & ZEND_ACC_PROTECTED) || EG(scope) == mptr->common.scope))) {
+			MAKE_STD_ZVAL(method_name);
+			ZVAL_STRING(method_name, mptr->common.function_name, 1);
+			zend_hash_next_index_insert(return_value->value.ht, &method_name, sizeof(zval *), NULL);
+		}
 		zend_hash_move_forward_ex(&ce->function_table, &pos);
 	}
 }
 /* }}} */
-\
 
 
 /* {{{ proto bool method_exists(object object, string method)
@@ -805,7 +879,7 @@ ZEND_FUNCTION(class_exists)
 {
 	char *class_name, *lc_name;
 	zend_class_entry **ce;
-	long class_name_len;
+	int class_name_len;
 	zend_bool autoload = 1;
 	int found;
 
@@ -819,11 +893,42 @@ ZEND_FUNCTION(class_exists)
 	
 		found = zend_hash_find(EG(class_table), lc_name, class_name_len+1, (void **) &ce);
 		free_alloca(lc_name);
-		RETURN_BOOL(found == SUCCESS);
+		RETURN_BOOL(found == SUCCESS && !((*ce)->ce_flags & ZEND_ACC_INTERFACE));
 	}
 
  	if (zend_lookup_class(class_name, class_name_len, &ce TSRMLS_CC) == SUCCESS) {
-		RETURN_TRUE;
+ 		RETURN_BOOL(((*ce)->ce_flags & ZEND_ACC_INTERFACE) == 0);
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool interface_exists(string classname [, bool autoload])
+   Checks if the class exists */
+ZEND_FUNCTION(interface_exists)
+{
+	char *iface_name, *lc_name;
+	zend_class_entry **ce;
+	int iface_name_len;
+	zend_bool autoload = 1;
+	int found;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &iface_name, &iface_name_len, &autoload) == FAILURE) {
+		return;
+	}
+
+	if (!autoload) {
+		lc_name = do_alloca(iface_name_len + 1);
+		zend_str_tolower_copy(lc_name, iface_name, iface_name_len);
+	
+		found = zend_hash_find(EG(class_table), lc_name, iface_name_len+1, (void **) &ce);
+		free_alloca(lc_name);
+		RETURN_BOOL(found == SUCCESS && (*ce)->ce_flags & ZEND_ACC_INTERFACE);
+	}
+
+ 	if (zend_lookup_class(iface_name, iface_name_len, &ce TSRMLS_CC) == SUCCESS) {
+ 		RETURN_BOOL(((*ce)->ce_flags & ZEND_ACC_INTERFACE) > 0);
 	} else {
 		RETURN_FALSE;
 	}
@@ -960,7 +1065,7 @@ ZEND_FUNCTION(set_error_handler)
 	zval *error_handler;
 	zend_bool had_orig_error_handler=0;
 	char *error_handler_name = NULL;
-	long error_type = E_ALL;
+	long error_type = E_ALL | E_STRICT;
  
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &error_handler, &error_type) == FAILURE) {
 		return;
@@ -1035,13 +1140,15 @@ ZEND_FUNCTION(set_exception_handler)
 		ZEND_WRONG_PARAM_COUNT();
 	}
 
-	if (!zend_is_callable(*exception_handler, 0, &exception_handler_name)) {
-		zend_error(E_WARNING, "%s() expects the argument (%s) to be a valid callback",
-				   get_active_function_name(TSRMLS_C), exception_handler_name?exception_handler_name:"unknown");
+	if (Z_TYPE_PP(exception_handler) != IS_NULL) { /* NULL == unset */
+		if (!zend_is_callable(*exception_handler, 0, &exception_handler_name)) {
+			zend_error(E_WARNING, "%s() expects the argument (%s) to be a valid callback",
+					   get_active_function_name(TSRMLS_C), exception_handler_name?exception_handler_name:"unknown");
+			efree(exception_handler_name);
+			return;
+		}
 		efree(exception_handler_name);
-		return;
 	}
-	efree(exception_handler_name);
 
 	if (EG(user_exception_handler)) {
 		had_orig_exception_handler = 1;
@@ -1051,7 +1158,7 @@ ZEND_FUNCTION(set_exception_handler)
 	}
 	ALLOC_ZVAL(EG(user_exception_handler));
 
-	if (Z_STRLEN_PP(exception_handler)==0) { /* unset user-defined handler */
+	if (Z_TYPE_PP(exception_handler) == IS_NULL) { /* unset user-defined handler */
 		FREE_ZVAL(EG(user_exception_handler));
 		EG(user_exception_handler) = NULL;
 		RETURN_TRUE;
@@ -1484,6 +1591,7 @@ ZEND_FUNCTION(debug_print_backtrace)
 	array_init(return_value);
 
 	while (ptr) {
+   		class_name = call_type = NULL;   
 		if (ptr->op_array) {
 			filename = ptr->op_array->filename;
 			lineno = ptr->opline->lineno;
@@ -1597,11 +1705,11 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last TSRML
 	ptr = EG(current_execute_data);
 
 	/* skip debug_backtrace() */
-	ptr = ptr->prev_execute_data;
 	if (skip_last--) {
 		int arg_count = *((ulong*)(cur_arg_pos - 2));
 		cur_arg_pos -= (arg_count + 2);
 		frames_on_stack--;
+		ptr = ptr->prev_execute_data;
 	}
 
 	array_init(return_value);
@@ -1654,6 +1762,11 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last TSRML
 			/* i know this is kinda ugly, but i'm trying to avoid extra cycles in the main execution loop */
 			zend_bool build_filename_arg = 1;
 
+			if (!ptr->opline) {
+				/* can happen when calling eval from a custom sapi */
+				function_name = "unknown";
+				build_filename_arg = 0;
+			} else
 			switch (ptr->opline->op2.u.constant.value.lval) {
 				case ZEND_EVAL:
 					function_name = "eval";

Zend/zend_compile.c

@@ -761,6 +761,9 @@ void zend_do_end_variable_parse(int type, int arg_offset TSRMLS_DC)
 				opline->opcode += 3;
 				break;
 			case BP_VAR_IS:
+				if (opline->opcode == ZEND_FETCH_DIM_W && opline->op2.op_type == IS_UNUSED) {
+					zend_error(E_COMPILE_ERROR, "Cannot use [] for reading");
+				}
 				opline->opcode += 6; /* 3+3 */
 				break;
 			case BP_VAR_FUNC_ARG:
@@ -992,35 +995,37 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
 			fn_flags |= ZEND_ACC_PUBLIC;
 		}
 
-		short_class_name = do_alloca(short_class_name_length + 1);
-		zend_str_tolower_copy(short_class_name, CG(active_class_entry)->name, short_class_name_length);
-		/* Improve after RC: cache the lowercase class name */
-
-		if ((short_class_name_length == name_len) && (!memcmp(short_class_name, lcname, name_len))) {
-			if (CG(active_class_entry)->constructor) {
-				zend_error(E_STRICT, "Redefining already defined constructor for class %s", CG(active_class_entry)->name);
-			} else {
+		if (!(CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE)) {
+			short_class_name = do_alloca(short_class_name_length + 1);
+			zend_str_tolower_copy(short_class_name, CG(active_class_entry)->name, short_class_name_length);
+			/* Improve after RC: cache the lowercase class name */
+	
+			if ((short_class_name_length == name_len) && (!memcmp(short_class_name, lcname, name_len))) {
+				if (CG(active_class_entry)->constructor) {
+					zend_error(E_STRICT, "Redefining already defined constructor for class %s", CG(active_class_entry)->name);
+				} else {
+					CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array);
+				}
+			} else if ((name_len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)))) {
+				if (CG(active_class_entry)->constructor) {
+					zend_error(E_STRICT, "Redefining already defined constructor for class %s", CG(active_class_entry)->name);
+				}
 				CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array);
+			} else if ((name_len == sizeof(ZEND_DESTRUCTOR_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_DESTRUCTOR_FUNC_NAME, sizeof(ZEND_DESTRUCTOR_FUNC_NAME)))) {
+				CG(active_class_entry)->destructor = (zend_function *) CG(active_op_array);
+			} else if ((name_len == sizeof(ZEND_CLONE_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)))) {
+				CG(active_class_entry)->clone = (zend_function *) CG(active_op_array);
+			} else if ((name_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)))) {
+				CG(active_class_entry)->__call = (zend_function *) CG(active_op_array);
+			} else if ((name_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)))) {
+				CG(active_class_entry)->__get = (zend_function *) CG(active_op_array);
+			} else if ((name_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)))) {
+				CG(active_class_entry)->__set = (zend_function *) CG(active_op_array);
+			} else if (!(fn_flags & ZEND_ACC_STATIC)) {
+				CG(active_op_array)->fn_flags |= ZEND_ACC_ALLOW_STATIC;
 			}
-		} else if ((name_len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)))) {
-			if (CG(active_class_entry)->constructor) {
-				zend_error(E_STRICT, "Redefining already defined constructor for class %s", CG(active_class_entry)->name);
-			}
-			CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array);
-		} else if ((name_len == sizeof(ZEND_DESTRUCTOR_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_DESTRUCTOR_FUNC_NAME, sizeof(ZEND_DESTRUCTOR_FUNC_NAME)))) {
-			CG(active_class_entry)->destructor = (zend_function *) CG(active_op_array);
-		} else if ((name_len == sizeof(ZEND_CLONE_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)))) {
-			CG(active_class_entry)->clone = (zend_function *) CG(active_op_array);
-		} else if ((name_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)))) {
-			CG(active_class_entry)->__call = (zend_function *) CG(active_op_array);
-		} else if ((name_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)))) {
-			CG(active_class_entry)->__get = (zend_function *) CG(active_op_array);
-		} else if ((name_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)))) {
-			CG(active_class_entry)->__set = (zend_function *) CG(active_op_array);
-		} else if (!(fn_flags & ZEND_ACC_STATIC)) {
-			CG(active_op_array)->fn_flags |= ZEND_ACC_ALLOW_STATIC;
+			free_alloca(short_class_name);
 		}
-		free_alloca(short_class_name);
 
 		efree(lcname);
 	} else {
@@ -1087,16 +1092,26 @@ void zend_do_handle_exception(TSRMLS_D)
 
 void zend_do_end_function_declaration(znode *function_token TSRMLS_DC)
 {
+	char lcname[16];
+	int name_len;
+
 	zend_do_extended_info(TSRMLS_C);
 	zend_do_return(NULL, 0 TSRMLS_CC);
 	zend_do_handle_exception(TSRMLS_C);
 
 	pass_two(CG(active_op_array) TSRMLS_CC);
 
-	if (CG(active_class_entry)
-		&& !strcmp(CG(active_op_array)->function_name, ZEND_CLONE_FUNC_NAME)
-		&& CG(active_op_array)->num_args != 0) {
-		zend_error(E_COMPILE_ERROR, "The clone method cannot accept any arguments");
+	if (CG(active_class_entry)) {
+		zend_check_magic_method_implementation(CG(active_class_entry), (zend_function*)CG(active_op_array), E_COMPILE_ERROR TSRMLS_CC);
+	} else {
+		/* we don't care if the function name is longer, in fact lowercasing only 
+		 * the beginning of the name speeds up the check process */
+		name_len = strlen(CG(active_op_array)->function_name);
+		zend_str_tolower_copy(lcname, CG(active_op_array)->function_name, MIN(name_len, sizeof(lcname)-1));
+		lcname[sizeof(lcname)-1] = '\0'; /* zend_str_tolower_copy won't necessarily set the zero byte */
+		if (name_len == sizeof(ZEND_AUTOLOAD_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_AUTOLOAD_FUNC_NAME, sizeof(ZEND_AUTOLOAD_FUNC_NAME)) && CG(active_op_array)->num_args != 1) {
+			zend_error(E_COMPILE_ERROR, "%s() must take exactly 1 argument", ZEND_AUTOLOAD_FUNC_NAME);
+		}		
 	}
 
 	CG(active_op_array)->line_end = zend_get_compiled_lineno(TSRMLS_C);
@@ -1114,10 +1129,6 @@ void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode *initia
 	zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 	zend_arg_info *cur_arg_info;
 
-	if (CG(active_class_entry) && CG(active_class_entry)->destructor == (zend_function *) CG(active_op_array))
-	{
-		zend_error(E_COMPILE_ERROR, "Destuctor %s::%s() cannot take arguments", CG(active_class_entry)->name, CG(active_op_array)->function_name);
-	}
 	CG(active_op_array)->num_args++;
 	opline->opcode = op;
 	opline->result = *var;
@@ -1193,7 +1204,7 @@ void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC)
 	last_op_number = get_next_op_number(CG(active_op_array))-1;
 	last_op = &CG(active_op_array)->opcodes[last_op_number];
 
-	if ((last_op->op2.op_type == IS_CONST) && (last_op->op2.u.constant.value.str.len == sizeof(ZEND_CLONE_FUNC_NAME)-1)
+	if ((last_op->op2.op_type == IS_CONST) && (last_op->op2.u.constant.type == IS_STRING) && (last_op->op2.u.constant.value.str.len == sizeof(ZEND_CLONE_FUNC_NAME)-1)
 		&& !zend_binary_strcasecmp(last_op->op2.u.constant.value.str.val, last_op->op2.u.constant.value.str.len, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)-1)) {
 		zend_error(E_COMPILE_ERROR, "Cannot call __clone() method on objects - use 'clone $obj' instead");
 	}
@@ -1298,36 +1309,27 @@ void zend_do_fetch_class_name(znode *result, znode *class_name_entry, znode *cla
 	result->u.constant.value.str.len = length;
 }
 
-void zend_do_begin_class_member_function_call(TSRMLS_D)
+void zend_do_begin_class_member_function_call(znode *class_name, znode *method_name TSRMLS_DC)
 {
 	unsigned char *ptr = NULL;
-	long fetch_const_op_number = get_next_op_number(CG(active_op_array));
-	zend_op *last_op = &CG(active_op_array)->opcodes[fetch_const_op_number-1];
+	zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 
-	if (last_op->opcode == ZEND_FETCH_CONSTANT) { /* regular method call */
-		/* a tmp var is leaked here */
-		last_op->opcode = ZEND_INIT_STATIC_METHOD_CALL;
-		if(last_op->op2.op_type == IS_CONST &&
-		   (sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == Z_STRLEN(last_op->op2.u.constant) &&
-		   memcmp(Z_STRVAL(last_op->op2.u.constant), ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == 0) {
-			zval_dtor(&last_op->op2.u.constant);
-			SET_UNUSED(last_op->op2);
+	opline->opcode = ZEND_INIT_STATIC_METHOD_CALL;
+	opline->op1 = *class_name;
+	opline->op2 = *method_name;
+
+	if (opline->op2.op_type == IS_CONST) {
+		if ((sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == Z_STRLEN(opline->op2.u.constant) &&
+		    memcmp(Z_STRVAL(opline->op2.u.constant), ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == 0) {
+			zval_dtor(&opline->op2.u.constant);
+			SET_UNUSED(opline->op2);
 		} else {
-			zend_lowercase_znode_if_const(&last_op->op2);
+			zend_str_tolower(opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len);
 		}
-	} else if (last_op->opcode == ZEND_FETCH_R) { /* indirect method call */
-		zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-
-		last_op->op2.u.EA.type = ZEND_FETCH_LOCAL;
-		opline->opcode = ZEND_INIT_STATIC_METHOD_CALL;
-		opline->op1 = last_op->op2;
-		opline->op2 = last_op->result;
-	} else {
-		zend_error(E_COMPILE_ERROR, "Internal compiler error - please report!");
 	}
 
-
 	zend_stack_push(&CG(function_call_stack), (void *) &ptr, sizeof(zend_function *));
+	zend_do_extended_fcall_begin(TSRMLS_C);
 }
 
 
@@ -1675,9 +1677,11 @@ static void do_inherit_parent_constructor(zend_class_entry *ce)
 		if (!zend_hash_exists(&ce->function_table, lc_class_name, ce->name_length+1)) {
 			lc_parent_class_name = zend_str_tolower_dup(ce->parent->name, ce->parent->name_length);
 			if (zend_hash_find(&ce->parent->function_table, lc_parent_class_name, ce->parent->name_length+1, (void **)&function)==SUCCESS) {
-				/* inherit parent's constructor */
-				zend_hash_update(&ce->function_table, lc_class_name, ce->name_length+1, function, sizeof(zend_function), NULL);
-				function_add_ref(function);
+				if (function->common.fn_flags & ZEND_ACC_CTOR) {
+					/* inherit parent's constructor */
+					zend_hash_update(&ce->function_table, lc_class_name, ce->name_length+1, function, sizeof(zend_function), NULL);
+					function_add_ref(function);
+				}
 			}
 			efree(lc_parent_class_name);
 		}
@@ -1924,6 +1928,9 @@ static inline void do_implement_interface(zend_class_entry *ce, zend_class_entry
 	if (!(ce->ce_flags & ZEND_ACC_INTERFACE) && iface->interface_gets_implemented && iface->interface_gets_implemented(iface, ce TSRMLS_CC) == FAILURE) {
 		zend_error(E_CORE_ERROR, "Class %s could not implement interface %s", ce->name, iface->name);
 	}
+	if (ce == iface) {
+		zend_error(E_ERROR, "Interface %s cannot not implement itself", ce->name);
+	}
 }
 
 
@@ -1993,6 +2000,8 @@ void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce TSRML
 	zend_hash_merge(&ce->constants_table, &parent_ce->constants_table, (void (*)(void *)) zval_add_ref, NULL, sizeof(zval *), 0);
 	zend_hash_merge_ex(&ce->function_table, &parent_ce->function_table, (copy_ctor_func_t) do_inherit_method, sizeof(zend_function), (merge_checker_func_t) do_inherit_method_check, ce);
 	do_inherit_parent_constructor(ce);
+	
+	zend_verify_abstract_class(ce TSRMLS_CC);
 }
 
 
@@ -2100,6 +2109,10 @@ ZEND_API zend_class_entry *do_bind_inherited_class(zend_op *opline, HashTable *c
 		ce = *pce;
 	}
 
+	if (parent_ce->ce_flags & ZEND_ACC_INTERFACE) {
+		zend_error(E_COMPILE_ERROR, "Class %s cannot extend from interface %s", ce->name, parent_ce->name);
+	}
+
 	zend_do_inheritance(ce, parent_ce TSRMLS_CC);
 
 	ce->refcount++;
@@ -3746,6 +3759,7 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify
 		ce->parent = NULL;
 		ce->num_interfaces = 0;
 		ce->interfaces = NULL;
+		ce->module = NULL;
 	}
 }
 

Zend/zend_compile.h

@@ -375,7 +375,7 @@ void zend_do_clone(znode *result, znode *expr TSRMLS_DC);
 void zend_do_begin_dynamic_function_call(znode *function_name TSRMLS_DC);
 void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC);
 void zend_do_fetch_class_name(znode *result, znode *class_entry, znode *class_name TSRMLS_DC);
-void zend_do_begin_class_member_function_call(TSRMLS_D);
+void zend_do_begin_class_member_function_call(znode *class_name, znode *method_name TSRMLS_DC);
 void zend_do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method, int is_dynamic_fcall TSRMLS_DC);
 void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC);
 void zend_do_handle_exception(TSRMLS_D);
@@ -494,13 +494,14 @@ ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC);
 ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC);
 
 ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC);
+ZEND_API void zend_function_dtor(zend_function *function);
 ZEND_API void destroy_zend_class(zend_class_entry **pce);
 void zend_class_add_ref(zend_class_entry **ce);
 
 ZEND_API void zend_mangle_property_name(char **dest, int *dest_length, char *src1, int src1_length, char *src2, int src2_length, int internal);
 ZEND_API void zend_unmangle_property_name(char *mangled_property, char **prop_name, char **class_name);
 
-#define ZEND_FUNCTION_DTOR (void (*)(void *)) destroy_zend_function
+#define ZEND_FUNCTION_DTOR (void (*)(void *)) zend_function_dtor
 #define ZEND_CLASS_DTOR (void (*)(void *)) destroy_zend_class
 
 zend_op *get_next_op(zend_op_array *op_array TSRMLS_DC);
@@ -839,6 +840,7 @@ END_EXTERN_C()
 #define ZEND_GET_FUNC_NAME          "__get"
 #define ZEND_SET_FUNC_NAME          "__set"
 #define ZEND_CALL_FUNC_NAME         "__call"
+#define ZEND_AUTOLOAD_FUNC_NAME     "__autoload"
 
 #endif /* ZEND_COMPILE_H */
 

Zend/zend_config.w32.h

@@ -55,6 +55,7 @@ typedef unsigned int uint;
 #define HAVE_STDARG_H	1
 #define HAVE_SNPRINTF	1
 #define HAVE_VSNPRINTF	1
+#define HAVE_STRCOLL	1
 
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf

Zend/zend_constants.c

@@ -231,10 +231,8 @@ ZEND_API int zend_get_constant(char *name, uint name_len, zval *result TSRMLS_DC
 			scope = CG(active_class_entry);
 		}
 	
-		class_name = do_alloca(class_name_len+1);
-		memcpy(class_name, name, class_name_len);
-		class_name[class_name_len] = '\0';
-	
+		class_name = estrndup(name, class_name_len);
+
 		if (class_name_len == sizeof("self")-1 && strcmp(class_name, "self") == 0) {
 			if (scope) {
 				ce = &scope;
@@ -255,7 +253,7 @@ ZEND_API int zend_get_constant(char *name, uint name_len, zval *result TSRMLS_DC
 				retval = 0;
 			}
 		}
-		free_alloca(class_name);
+		efree(class_name);
 
 		if (retval && ce) {
 			if (zend_hash_find(&((*ce)->constants_table), constant_name, const_name_len+1, (void **) &ret_constant) != SUCCESS) {
@@ -275,9 +273,8 @@ ZEND_API int zend_get_constant(char *name, uint name_len, zval *result TSRMLS_DC
 	}
 	
 	if (zend_hash_find(EG(zend_constants), name, name_len+1, (void **) &c) == FAILURE) {
-		lookup_name = do_alloca(name_len+1);
-		zend_str_tolower_copy(lookup_name, name, name_len);
-		lookup_name[name_len] = '\0';
+		lookup_name = estrndup(name, name_len);
+		zend_str_tolower(lookup_name, name_len);
 		 
 		if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) {
 			if ((c->flags & CONST_CS) && memcmp(c->name, name, name_len)!=0) {
@@ -286,7 +283,7 @@ ZEND_API int zend_get_constant(char *name, uint name_len, zval *result TSRMLS_DC
 		} else {
 			retval=0;
 		}
-		free_alloca(lookup_name);
+		efree(lookup_name);
 	}
 
 	if (retval) {
@@ -312,23 +309,23 @@ ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC)
 
 	if (!(c->flags & CONST_CS)) {
 		/* keep in mind that c->name_len already contains the '\0' */
-		lowercase_name = do_alloca(c->name_len);
-		zend_str_tolower_copy(lowercase_name, c->name, c->name_len - 1);
+		lowercase_name = estrndup(c->name, c->name_len);
+		zend_str_tolower(lowercase_name, c->name_len);
 		name = lowercase_name;
 	} else {
 		name = c->name;
 	}
 
 	if (zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
+		zend_error(E_NOTICE,"Constant %s already defined", name);
 		free(c->name);
 		if (!(c->flags & CONST_PERSISTENT)) {
 			zval_dtor(&c->value);
 		}
-		zend_error(E_NOTICE,"Constant %s already defined", name);
 		ret = FAILURE;
 	}
 	if (lowercase_name) {
-		free_alloca(lowercase_name);
+		efree(lowercase_name);
 	}
 	return ret;
 }

Zend/zend_dynamic_array.h

@@ -30,7 +30,7 @@ typedef struct _dynamic_array {
 } dynamic_array;
 
 BEGIN_EXTERN_C()
-ZEND_API int zend_dynamic_array_init(dynamic_array *da);
+ZEND_API int zend_dynamic_array_init(dynamic_array *da, unsigned int element_size, unsigned int size);
 ZEND_API void *zend_dynamic_array_push(dynamic_array *da);
 ZEND_API void *zend_dynamic_array_pop(dynamic_array *da);
 ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index);

Zend/zend_exceptions.c

@@ -50,7 +50,8 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC)
 		zend_throw_exception_hook(exception TSRMLS_CC);
 	}
 
-	if ((EG(current_execute_data)->opline+1)->opcode == ZEND_HANDLE_EXCEPTION) {
+	if (EG(current_execute_data)->opline == NULL ||
+	    (EG(current_execute_data)->opline+1)->opcode == ZEND_HANDLE_EXCEPTION) {
 		/* no need to rethrow the exception */
 		return;
 	}
@@ -427,9 +428,15 @@ ZEND_METHOD(exception, __toString)
  * And never try to change the state of exceptions and never implement anything
  * that gives the user anything to accomplish this.
  */
+static
+ZEND_BEGIN_ARG_INFO(arginfo_exception___construct, 0)
+	ZEND_ARG_INFO(0, message)
+	ZEND_ARG_INFO(0, code)
+ZEND_END_ARG_INFO();
+
 static zend_function_entry default_exception_functions[] = {
 	ZEND_ME(exception, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
-	ZEND_ME(exception, __construct, NULL, 0)
+	ZEND_ME(exception, __construct, arginfo_exception___construct, ZEND_ACC_PUBLIC)
 	ZEND_ME(exception, getMessage, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	ZEND_ME(exception, getCode, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	ZEND_ME(exception, getFile, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)

Zend/zend_execute.c

@@ -52,6 +52,7 @@ static void zend_extension_fcall_end_handler(zend_extension *extension, zend_op_
 #define EX_T(offset) (*(temp_variable *)((char *) EX(Ts) + offset))
 #define T(offset) (*(temp_variable *)((char *) Ts + offset))
 
+#define TEMP_VAR_STACK_LIMIT 2000
 
 /* former zend_execute_locks.h */
 static inline void zend_pzval_lock_func(zval *z)
@@ -377,7 +378,7 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, znode
 		*retval = EG(uninitialized_zval_ptr);
 
 		SELECTIVE_PZVAL_LOCK(*retval, result);
-		PZVAL_UNLOCK(value);
+		FREE_OP(Ts, value_op, free_value);
 		return;
 	}
 	
@@ -839,8 +840,10 @@ fetch_string_dim:
 				}
 			}
 			break;
-		case IS_DOUBLE:
 		case IS_RESOURCE:
+			zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", dim->value.lval, dim->value.lval);
+			/* Fall Through */
+		case IS_DOUBLE:
 		case IS_BOOL: 
 		case IS_LONG: {
 				long index;
@@ -1275,11 +1278,9 @@ static void zend_post_incdec_property(znode *result, znode *op1, znode *op2, tem
 		*retval = *z;
 		zendi_zval_copy_ctor(*retval);
 		incdec_op(z);
+		z->refcount++;
 		Z_OBJ_HT_P(object)->write_property(object, property, z TSRMLS_CC);
-		if (z->refcount == 0) {
-			zval_dtor(z);
-			FREE_ZVAL(z);
-		}
+		zval_ptr_dtor(&z);
 	}
 	
 	FREE_OP(Ts, op2, EG(free_op2));
@@ -1330,7 +1331,11 @@ static int zend_check_symbol(zval **pz TSRMLS_DC)
 	}
 
 #define RETURN_FROM_EXECUTE_LOOP(execute_data)								\
-	free_alloca(EX(Ts));													\
+	if (EX(op_array)->T < TEMP_VAR_STACK_LIMIT) {						\
+ 		free_alloca(EX(Ts));													\
+ 	} else {								\
+ 		efree(EX(Ts));							\
+ 	}									\
 	EG(in_execution) = EX(original_in_execution);							\
 	EG(current_execute_data) = EX(prev_execute_data);						\
 	return 1; /* CHECK_ME */
@@ -1349,7 +1354,11 @@ ZEND_API void execute(zend_op_array *op_array TSRMLS_DC)
 	/* Initialize execute_data */
 	EX(fbc) = NULL;
 	EX(object) = NULL;
-	EX(Ts) = (temp_variable *) do_alloca(sizeof(temp_variable)*op_array->T);
+ 	if (op_array->T < TEMP_VAR_STACK_LIMIT) {
+ 		EX(Ts) = (temp_variable *) do_alloca(sizeof(temp_variable) * op_array->T);
+ 	} else {
+ 		EX(Ts) = (temp_variable *) safe_emalloc(sizeof(temp_variable), op_array->T, 0);
+ 	}
 	EX(op_array) = op_array;
 	EX(original_in_execution) = EG(in_execution);
 	EX(prev_execute_data) = EG(current_execute_data);
@@ -1766,6 +1775,9 @@ static inline int zend_binary_assign_op_helper(int (*binary_op)(zval *result, zv
 		EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
+	    if (increment_opline) {
+    	    INC_OPCODE();
+    	}
 		NEXT_OPCODE();
 	}
 	
@@ -2777,6 +2789,9 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
 	if (EG(This)) {
 		if (EG(exception) && EX(fbc) && EX(fbc)->common.fn_flags&ZEND_ACC_CTOR) {
 			EG(This)->refcount--;
+			if (EG(This)->refcount == 1) {
+			    zend_object_store_ctor_failed(EG(This) TSRMLS_CC);
+			}
 			zval_ptr_dtor(&EG(This));
 		} else if (should_change_scope) {
 			zval_ptr_dtor(&EG(This));
@@ -2929,21 +2944,16 @@ int zend_catch_handler(ZEND_OPCODE_HANDLER_ARGS)
 	}
 	ce = Z_OBJCE_P(EG(exception));
 	if (ce != EX_T(opline->op1.u.var).class_entry) {
-		while (ce->parent) {
-			if (ce->parent == EX_T(opline->op1.u.var).class_entry) {
-				goto exception_should_be_taken;
+		if (!instanceof_function(ce, EX_T(opline->op1.u.var).class_entry TSRMLS_CC)) {
+			if (opline->op1.u.EA.type) {
+				zend_throw_exception_internal(NULL TSRMLS_CC);
+				NEXT_OPCODE();
 			}
-			ce = ce->parent;
+			SET_OPCODE(&op_array->opcodes[opline->extended_value]);
+			return 0; /* CHECK_ME */
 		}
-		if (opline->op1.u.EA.type) {
-			zend_throw_exception_internal(NULL TSRMLS_CC);
-			NEXT_OPCODE();
-		}
-		SET_OPCODE(&op_array->opcodes[opline->extended_value]);
-		return 0; /* CHECK_ME */
 	}
 
-exception_should_be_taken:
 	zend_hash_update(EG(active_symbol_table), opline->op2.u.constant.value.str.val,
 		opline->op2.u.constant.value.str.len+1, &EG(exception), sizeof(zval *), (void **) NULL);
 	EG(exception) = NULL;
@@ -3404,6 +3414,7 @@ static inline int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS)
 				zend_hash_update(array_ptr->value.ht, "", sizeof(""), &expr_ptr, sizeof(zval *), NULL);
 				break;
 			default:
+				zend_error(E_WARNING, "Illegal offset type");
 				zval_ptr_dtor(&expr_ptr);
 				/* do nothing */
 				break;
@@ -3661,7 +3672,7 @@ int zend_unset_dim_obj_handler(ZEND_OPCODE_HANDLER_ARGS)
 				case IS_BOOL: 
 				case IS_LONG:
 					if (offset->type == IS_DOUBLE) {
-						index = (long) offset->value.lval;
+						index = (long) offset->value.dval;
 					} else {
 						index = offset->value.lval;
 					}
@@ -3698,7 +3709,7 @@ int zend_fe_reset_handler(ZEND_OPCODE_HANDLER_ARGS)
 	if (opline->extended_value) {
 		array_ptr_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), BP_VAR_R);
 		if (array_ptr_ptr == NULL) {
-			MAKE_STD_ZVAL(array_ptr);
+			ALLOC_INIT_ZVAL(array_ptr);
 		} else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
 			ce = Z_OBJCE_PP(array_ptr_ptr);
 			if (!ce || ce->get_iterator == NULL) {
@@ -3796,7 +3807,7 @@ int zend_fe_fetch_handler(ZEND_OPCODE_HANDLER_ARGS)
 				key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 0, NULL);
 
 				zend_hash_move_forward(fe_ht);
-			} while (zend_check_property_access(zobj, str_key TSRMLS_CC) != SUCCESS);
+			} while (key_type != HASH_KEY_IS_STRING || zend_check_property_access(zobj, str_key TSRMLS_CC) != SUCCESS);
 			zend_unmangle_property_name(str_key, &class_name, &prop_name);
 			str_key_len = strlen(prop_name);
 			str_key = estrndup(prop_name, str_key_len);
@@ -4022,14 +4033,22 @@ static int zend_isset_isempty_dim_prop_obj_handler(int prop_dim, ZEND_OPCODE_HAN
 				result = Z_OBJ_HT_P(*container)->has_dimension(*container, offset, (opline->extended_value == ZEND_ISEMPTY) TSRMLS_CC);
 			}
 		} else if ((*container)->type == IS_STRING) { /* string offsets */
+			zval tmp_offset;
+
+			if (Z_TYPE_P(offset) != IS_LONG) {
+				tmp_offset = *offset;
+				zval_copy_ctor(&tmp_offset);
+				convert_to_long(&tmp_offset);
+				offset = &tmp_offset;
+			}
 			switch (opline->extended_value) {
 				case ZEND_ISSET:
-					if (offset->value.lval <= Z_STRLEN_PP(container)) {
+					if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_PP(container)) {
 						result = 1;
 					}
 					break;
 				case ZEND_ISEMPTY:
-					if (offset->value.lval <= Z_STRLEN_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') {
+					if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') {
 						result = 1;
 					}
 					break;

Zend/zend_execute_API.c

@@ -183,8 +183,6 @@ void init_executor(TSRMLS_D)
 	EG(scope) = NULL;
 
 	EG(This) = NULL;
-
-	EG(float_separator)[0] = '.';
 }
 
 void shutdown_executor(TSRMLS_D)
@@ -208,6 +206,9 @@ void shutdown_executor(TSRMLS_D)
 		zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_deactivator TSRMLS_CC);
 		zend_objects_store_call_destructors(&EG(objects_store) TSRMLS_CC);
 		zend_hash_graceful_reverse_destroy(&EG(symbol_table));
+	} zend_catch {
+		/* if we couldn't destruct cleanly, mark all objects as destructed anyway */
+		zend_objects_store_mark_destructed(&EG(objects_store) TSRMLS_CC);
 	} zend_end_try();
 
 	zend_try {
@@ -684,7 +685,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
 				zend_error(E_ERROR, "Object does not support method calls");
 			}
 			EX(function_state).function = 
-			  Z_OBJ_HT_PP(fci->object_pp)->get_method(*fci->object_pp, Z_STRVAL_P(fci->function_name), Z_STRLEN_P(fci->function_name) TSRMLS_CC);
+				Z_OBJ_HT_PP(fci->object_pp)->get_method(*fci->object_pp, Z_STRVAL_P(fci->function_name), Z_STRLEN_P(fci->function_name) TSRMLS_CC);
 		} else if (calling_scope) {
 			char *function_name_lc = zend_str_tolower_dup(Z_STRVAL_P(fci->function_name), Z_STRLEN_P(fci->function_name));
 
@@ -885,6 +886,10 @@ ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***
 	zval *exception;
 	char dummy = 1;
 	
+	if (name == NULL) {
+		return FAILURE;
+	}
+
 	lc_name = do_alloca(name_length + 1);
 	zend_str_tolower_copy(lc_name, name, name_length);
 
@@ -911,7 +916,7 @@ ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***
 		return FAILURE;
 	}
 
-	ZVAL_STRINGL(&autoload_function, "__autoload", sizeof("__autoload")-1,  0);
+	ZVAL_STRINGL(&autoload_function, ZEND_AUTOLOAD_FUNC_NAME, sizeof(ZEND_AUTOLOAD_FUNC_NAME)-1,  0);
 
 	INIT_PZVAL(class_name_ptr);
 	ZVAL_STRINGL(class_name_ptr, name, name_length, 0);
@@ -932,7 +937,7 @@ ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***
 
 	if (EG(exception)) {
 		free_alloca(lc_name);
-		zend_error(E_ERROR, "__autoload(%s) threw an exception of type '%s'", name, Z_OBJCE_P(EG(exception))->name);
+		zend_error(E_ERROR, "Function %s(%s) threw an exception of type '%s'", ZEND_AUTOLOAD_FUNC_NAME, name, Z_OBJCE_P(EG(exception))->name);
 		return FAILURE;
 	}
 	EG(exception) = exception;

Zend/zend_globals.h

@@ -237,9 +237,6 @@ struct _zend_executor_globals {
 
 	zend_property_info std_property_info;
 
-	/* locale stuff */
-	char float_separator[1];
-
 	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
 };
 

Zend/zend_hash.c

@@ -137,6 +137,7 @@ ZEND_API ulong zend_hash_func(char *arKey, uint nKeyLength)
 ZEND_API int _zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, zend_bool persistent ZEND_FILE_LINE_DC)
 {
 	uint i = 3;
+	Bucket **tmp;
 
 	SET_INCONSISTENT(HT_OK);
 
@@ -146,18 +147,8 @@ ZEND_API int _zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunctio
 
 	ht->nTableSize = 1 << i;
 	ht->nTableMask = ht->nTableSize - 1;
-	
-	/* Uses ecalloc() so that Bucket* == NULL */
-	if (persistent) {
-		ht->arBuckets = (Bucket **) calloc(ht->nTableSize, sizeof(Bucket *));
-		if (!ht->arBuckets) {
-			return FAILURE;
-		}
-	} else {
-		ht->arBuckets = (Bucket **) ecalloc_rel(ht->nTableSize, sizeof(Bucket *));
-	}
-	
 	ht->pDestructor = pDestructor;
+	ht->arBuckets = NULL;
 	ht->pListHead = NULL;
 	ht->pListTail = NULL;
 	ht->nNumOfElements = 0;
@@ -166,6 +157,21 @@ ZEND_API int _zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunctio
 	ht->persistent = persistent;
 	ht->nApplyCount = 0;
 	ht->bApplyProtection = 1;
+	
+	/* Uses ecalloc() so that Bucket* == NULL */
+	if (persistent) {
+		tmp = (Bucket **) calloc(ht->nTableSize, sizeof(Bucket *));
+		if (!tmp) {
+			return FAILURE;
+		}
+		ht->arBuckets = tmp;
+	} else {
+		tmp = (Bucket **) ecalloc_rel(ht->nTableSize, sizeof(Bucket *));
+		if (tmp) {
+			ht->arBuckets = tmp;
+		}
+	}
+	
 	return SUCCESS;
 }
 

Zend/zend_highlight.c

@@ -159,6 +159,12 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 		switch (token_type) {
 			case T_END_HEREDOC:
 				zend_html_puts(token.value.str.val, token.value.str.len TSRMLS_CC);
+				{
+					char *ptr = LANG_SCNG(yy_text);
+					if (ptr[LANG_SCNG(yy_leng) - 1] != ';') {
+						zend_html_putc('\n');
+					}
+				}
 				break;
 			default:
 				zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) TSRMLS_CC);
@@ -203,7 +209,7 @@ ZEND_API void zend_strip(TSRMLS_D)
 		switch (token_type) {
 			case T_WHITESPACE:
 				if (!prev_space) {
-					putchar(' ');
+					zend_write(" ", sizeof(" ") - 1);
 					prev_space = 1;
 				}
 						/* lack of break; is intentional */
@@ -215,9 +221,9 @@ ZEND_API void zend_strip(TSRMLS_D)
 			case T_END_HEREDOC: {
 					char *ptr = LANG_SCNG(yy_text);
 
-					fwrite(ptr, LANG_SCNG(yy_leng) - 1, 1, stdout);
+					zend_write(ptr, LANG_SCNG(yy_leng) - 1);
 					/* The ensure that we only write one ; and that it followed by the required newline */
-					putchar('\n');
+					zend_write("\n", sizeof("\n") - 1);
 					if (ptr[LANG_SCNG(yy_leng) - 1] == ';') {
 						lex_scan(&token TSRMLS_CC);
 					}
@@ -226,7 +232,7 @@ ZEND_API void zend_strip(TSRMLS_D)
 				break;
 			
 			default:
-				fwrite(LANG_SCNG(yy_text), LANG_SCNG(yy_leng), 1, stdout);
+				zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
 				break;
 		}
 

Zend/zend_ini.c

@@ -24,6 +24,7 @@
 #include "zend_ini.h"
 #include "zend_alloc.h"
 #include "zend_operators.h"
+#include "zend_strtod.h"
 
 static HashTable *registered_zend_ini_directives; 
 
@@ -147,10 +148,25 @@ ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_num
 	zend_ini_entry *p = ini_entry;
 	zend_ini_entry *hashed_ini_entry;
 	zval default_value;
+	HashTable *directives = registered_zend_ini_directives;
+
+#ifdef ZTS
+	/* if we are called during the request, eg: from dl(),
+	 * then we should not touch the global directives table,
+	 * and should update the per-(request|thread) version instead.
+	 * This solves two problems: one is that ini entries for dl()'d
+	 * extensions will now work, and the second is that updating the
+	 * global hash here from dl() is not mutex protected and can
+	 * lead to death.
+	 */
+	if (directives != EG(ini_directives)) {
+		directives = EG(ini_directives);
+	}
+#endif
 
 	while (p->name) {
 		p->module_number = module_number;
-		if (zend_hash_add(registered_zend_ini_directives, p->name, p->name_length, p, sizeof(zend_ini_entry), (void **) &hashed_ini_entry)==FAILURE) {
+		if (zend_hash_add(directives, p->name, p->name_length, p, sizeof(zend_ini_entry), (void **) &hashed_ini_entry)==FAILURE) {
 			zend_unregister_ini_entries(module_number TSRMLS_CC);
 			return FAILURE;
 		}
@@ -283,9 +299,9 @@ ZEND_API double zend_ini_double(char *name, uint name_length, int orig)
 
 	if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry)==SUCCESS) {
 		if (orig && ini_entry->modified) {
-			return (double) (ini_entry->orig_value ? strtod(ini_entry->orig_value, NULL) : 0.0);
+			return (double) (ini_entry->orig_value ? zend_strtod(ini_entry->orig_value, NULL) : 0.0);
 		} else if (ini_entry->value) {
-			return (double) strtod(ini_entry->value, NULL);
+			return (double) zend_strtod(ini_entry->value, NULL);
 		}
 	}
 
@@ -471,7 +487,7 @@ ZEND_API ZEND_INI_MH(OnUpdateReal)
 
 	p = (double *) (base+(size_t) mh_arg1);
 
-	*p = strtod(new_value, NULL);
+	*p = zend_strtod(new_value, NULL);
 	return SUCCESS;
 }
 

Zend/zend_ini.h

@@ -192,7 +192,7 @@ END_EXTERN_C()
 /* INI parsing engine */
 typedef void (*zend_ini_parser_cb_t)(zval *arg1, zval *arg2, int callback_type, void *arg);
 BEGIN_EXTERN_C()
-int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, zend_ini_parser_cb_t ini_parser_cb, void *arg);
+ZEND_API int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, zend_ini_parser_cb_t ini_parser_cb, void *arg);
 END_EXTERN_C()
 
 #define ZEND_INI_PARSER_ENTRY	1

Zend/zend_ini_parser.y

@@ -139,7 +139,7 @@ static void ini_error(char *str)
 }
 
 
-int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, zend_ini_parser_cb_t ini_parser_cb, void *arg)
+ZEND_API int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, zend_ini_parser_cb_t ini_parser_cb, void *arg)
 {
 	int retval;
 	zend_ini_parser_param ini_parser_param;

Zend/zend_interfaces.c

@@ -272,7 +272,7 @@ static zend_object_iterator *zend_user_it_get_new_iterator(zend_class_entry *ce,
 
 	zend_class_entry *ce_it = Z_TYPE_P(iterator) == IS_OBJECT ? Z_OBJCE_P(iterator) : NULL;
 
-	if (!ce || !ce_it || !ce_it->get_iterator) {
+	if (!ce || !ce_it || !ce_it->get_iterator || (ce_it->get_iterator == zend_user_it_get_new_iterator && iterator == object)) {
 		zend_error(E_WARNING, "Objects returned by %s::getIterator() must be traversable or implement interface Iterator", ce->name);
 		zval_ptr_dtor(&iterator);
 		return NULL;
@@ -287,7 +287,7 @@ static zend_object_iterator *zend_user_it_get_new_iterator(zend_class_entry *ce,
 static int zend_implement_traversable(zend_class_entry *interface, zend_class_entry *class_type TSRMLS_DC)
 {
 	/* check that class_type is traversable at c-level or implements at least one of 'aggregate' and 'Iterator' */
-	int i;
+	zend_uint i;
 
 	if (class_type->get_iterator || (class_type->parent && class_type->parent->get_iterator)) {
 		return SUCCESS;

Zend/zend_language_parser.y

@@ -614,12 +614,12 @@ function_call:
 		T_STRING	'(' { $2.u.opline_num = zend_do_begin_function_call(&$1 TSRMLS_CC); }
 				function_call_parameter_list
 				')' { zend_do_end_function_call(&$1, &$$, &$4, 0, $2.u.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); }
-	|	class_constant '(' { zend_do_begin_class_member_function_call(TSRMLS_C); zend_do_extended_fcall_begin(TSRMLS_C); } 
+	|	fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING '(' { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } 
 			function_call_parameter_list 
-			')' { zend_do_end_function_call(NULL, &$$, &$4, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
-	|	static_member '(' { zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_class_member_function_call(TSRMLS_C); zend_do_extended_fcall_begin(TSRMLS_C); } 
+			')' { zend_do_end_function_call(NULL, &$$, &$6, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
+	| fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM variable_without_objects '(' { zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } 
 			function_call_parameter_list 
-			')' { zend_do_end_function_call(NULL, &$$, &$4, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
+			')' { zend_do_end_function_call(NULL, &$$, &$6, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
 	|	variable_without_objects  '(' { zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_dynamic_function_call(&$1 TSRMLS_CC); }
 			function_call_parameter_list ')'
 			{ zend_do_end_function_call(&$1, &$$, &$4, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}

Zend/zend_language_scanner.l

@@ -57,6 +57,7 @@
 #include "zend_constants.h"
 #include "zend_variables.h"
 #include "zend_operators.h"
+#include "zend_strtod.h"
 
 #ifdef HAVE_STDARG_H
 # include <stdarg.h>
@@ -1188,7 +1189,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
 	errno = 0;
 	zendlval->value.lval = strtol(yytext, NULL, 0);
 	if (errno == ERANGE) { /* overflow */
-		zendlval->value.dval = strtod(yytext, NULL);
+		zendlval->value.dval = zend_strtod(yytext, NULL);
 		zendlval->type = IS_DOUBLE;
 		return T_DNUMBER;
 	} else {
@@ -1225,7 +1226,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
 }
 
 <ST_IN_SCRIPTING>{DNUM}|{EXPONENT_DNUM} {
-	zendlval->value.dval = strtod(yytext, NULL);
+	zendlval->value.dval = zend_strtod(yytext, NULL);
 	zendlval->type = IS_DOUBLE;
 	return T_DNUMBER;
 }
@@ -1445,7 +1446,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
 	}
 }
 
-<ST_IN_SCRIPTING>"/**"{NEWLINE} {
+<ST_IN_SCRIPTING>"/**"{WHITESPACE} {
 	CG(comment_start_line) = CG(zend_lineno);
 	BEGIN(ST_DOC_COMMENT);
 	yymore();

Zend/zend_mm.h

@@ -24,10 +24,16 @@
 
 #include <sys/types.h>
 
+#include "zend.h"
 #include "zend_types.h"
 
-/* Define this to enable Zend MM */
-#define ZEND_MM
+
+#ifdef ZEND_WIN32
+#undef ZEND_MM
+#else
+/* #define ZEND_MM */
+#undef ZEND_MM
+#endif
 
 /* mm block type */
 typedef struct _zend_mm_block {

Zend/zend_modules.h

@@ -37,7 +37,7 @@ extern struct _zend_arg_info third_arg_force_ref[4];
 extern struct _zend_arg_info fourth_arg_force_ref[5];
 extern struct _zend_arg_info all_args_by_ref[1];
 
-#define ZEND_MODULE_API_NO 20040412
+#define ZEND_MODULE_API_NO 20041030
 #ifdef ZTS
 #define USING_ZTS 1
 #else

Zend/zend_object_handlers.c

@@ -381,7 +381,14 @@ zval *zend_std_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
 	zval *retval;
 	
 	if (instanceof_function_ex(ce, zend_ce_arrayaccess, 1 TSRMLS_CC)) {
+		if(offset == NULL) {
+			/* [] construct */
+			zval offset_null;
+			INIT_ZVAL(offset_null);
+			offset = &offset_null;
+		}
 		zend_call_method_with_1_params(&object, ce, NULL, "offsetget", &retval, offset);
+
 		if (!retval) {
 			if (!EG(exception)) {
 				zend_error(E_ERROR, "Undefined offset for object of type %s used as array", ce->name);

Zend/zend_objects.c

@@ -76,10 +76,13 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl
 		old_exception = EG(exception);
 		EG(exception) = NULL;
 		zend_call_method_with_0_params(&obj, object->ce, NULL, "__destruct", NULL);
-		if (EG(exception)) {
-			zval_ptr_dtor(&EG(exception));
+		if (old_exception) {
+			if (EG(exception)) {
+				zend_error(E_ERROR, "Ignoring exception from %s::__destruct() while an exception is already active", object->ce->name);
+				zval_ptr_dtor(&EG(exception));
+			}
+			EG(exception) = old_exception;
 		}
-		EG(exception) = old_exception;
 	}
 }
 

Zend/zend_objects_API.c

@@ -58,6 +58,16 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS
 	}
 }
 
+ZEND_API void zend_objects_store_mark_destructed(zend_objects_store *objects TSRMLS_DC)
+{
+	zend_uint i = 1;
+
+	for (i = 1; i < objects->top ; i++) {
+		if (objects->object_buckets[i].valid) {
+			objects->object_buckets[i].destructor_called = 1;
+		}
+	}
+}
 
 ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects TSRMLS_DC)
 {
@@ -207,6 +217,15 @@ ZEND_API void zend_object_store_set_object(zval *zobject, void *object TSRMLS_DC
 }
 
 
+/* Called when the ctor was terminated by an exception */
+ZEND_API void zend_object_store_ctor_failed(zval *zobject TSRMLS_DC)
+{
+	zend_object_handle handle = Z_OBJ_HANDLE_P(zobject);
+
+	EG(objects_store).object_buckets[handle].destructor_called = 1;
+}
+
+
 /* Proxy objects workings */
 typedef struct _zend_proxy_object {
 	zval *object;

Zend/zend_objects_API.h

@@ -57,6 +57,7 @@ typedef struct _zend_objects_store {
 BEGIN_EXTERN_C()
 ZEND_API void zend_objects_store_init(zend_objects_store *objects, zend_uint init_size);
 ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TSRMLS_DC);
+ZEND_API void zend_objects_store_mark_destructed(zend_objects_store *objects TSRMLS_DC);
 ZEND_API void zend_objects_store_destroy(zend_objects_store *objects);
 
 /* Store API functions */
@@ -68,6 +69,7 @@ ZEND_API zend_object_value zend_objects_store_clone_obj(zval *object TSRMLS_DC);
 ZEND_API void *zend_object_store_get_object(zval *object TSRMLS_DC);
 /* See comment in zend_objects_API.c before you use this */
 ZEND_API void zend_object_store_set_object(zval *zobject, void *object TSRMLS_DC);
+ZEND_API void zend_object_store_ctor_failed(zval *zobject TSRMLS_DC);
 
 ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects TSRMLS_DC);
 

Zend/zend_opcode.c

@@ -108,6 +108,13 @@ ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC)
 	}
 }
 
+ZEND_API void zend_function_dtor(zend_function *function)
+{
+	TSRMLS_FETCH();
+
+	destroy_zend_function(function TSRMLS_CC);
+}
+
 static void zend_cleanup_op_array_data(zend_op_array *op_array)
 {
 	if (op_array->static_variables) {

Zend/zend_operators.c

@@ -29,6 +29,7 @@
 #include "zend_fast_cache.h"
 #include "zend_API.h"
 #include "zend_multiply.h"
+#include "zend_strtod.h"
 
 #define LONG_SIGN_MASK (1L << (8*sizeof(long)-1))
 
@@ -376,7 +377,7 @@ ZEND_API void convert_to_double(zval *op)
 		case IS_STRING:
 			strval = op->value.str.val;
 
-			op->value.dval = strtod(strval, NULL);
+			op->value.dval = zend_strtod(strval, NULL);
 			STR_FREE(strval);
 			break;
 		case IS_ARRAY:
@@ -1221,6 +1222,35 @@ ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_D
 	return SUCCESS;
 }
 
+#if HAVE_STRCOLL
+ZEND_API int string_locale_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+{
+	zval op1_copy, op2_copy;
+	int use_copy1, use_copy2;
+
+	zend_make_printable_zval(op1, &op1_copy, &use_copy1);
+	zend_make_printable_zval(op2, &op2_copy, &use_copy2);
+
+	if (use_copy1) {
+		op1 = &op1_copy;
+	}
+	if (use_copy2) {
+		op2 = &op2_copy;
+	}
+
+	result->value.lval = strcoll(op1->value.str.val, op2->value.str.val);
+	result->type = IS_LONG;
+
+	if (use_copy1) {
+		zval_dtor(op1);
+	}
+	if (use_copy2) {
+		zval_dtor(op2);
+	}
+	return SUCCESS;
+}
+#endif
+
 ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 {
 	zval op1_copy, op2_copy;
@@ -1867,9 +1897,9 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2)
 		(ret2=is_numeric_string(s2->value.str.val, s2->value.str.len, &lval2, &dval2, 0))) {
 		if ((ret1==IS_DOUBLE) || (ret2==IS_DOUBLE)) {
 			if (ret1!=IS_DOUBLE) {
-				dval1 = strtod(s1->value.str.val, NULL);
+				dval1 = zend_strtod(s1->value.str.val, NULL);
 			} else if (ret2!=IS_DOUBLE) {
-				dval2 = strtod(s2->value.str.val, NULL);
+				dval2 = zend_strtod(s2->value.str.val, NULL);
 			}
 			result->value.dval = dval1 - dval2;
 			result->value.lval = ZEND_NORMALIZE_BOOL(result->value.dval);
@@ -1922,13 +1952,13 @@ ZEND_API void zend_compare_objects(zval *result, zval *o1, zval *o2 TSRMLS_DC)
 {
 	result->type = IS_LONG;
 
-	if (Z_OBJ_HT_P(o1)->compare_objects == NULL) {
-		if (Z_OBJ_HANDLE_P(o1) == Z_OBJ_HANDLE_P(o2)) {
-			result->value.lval = 0;
-		} else {
-			result->value.lval = 1;
-		}			
+	if (Z_OBJ_HANDLE_P(o1) == Z_OBJ_HANDLE_P(o2)) {
+		result->value.lval = 0;
 		return;
+	}
+
+	if (Z_OBJ_HT_P(o1)->compare_objects == NULL) {
+		result->value.lval = 1;
 	} else {
 		result->value.lval = Z_OBJ_HT_P(o1)->compare_objects(o1, o2 TSRMLS_CC);
 	}
@@ -1943,13 +1973,6 @@ ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC)
 	op->value.str.val = (char *) emalloc_rel(MAX_LENGTH_OF_DOUBLE + EG(precision) + 1);
 	sprintf(op->value.str.val, "%.*G", (int) EG(precision), dval);
 	op->value.str.len = strlen(op->value.str.val);
-
-	if (EG(float_separator)[0] != '.') { 
-		char *p = op->value.str.val;
-		if ((p = strchr(p, '.'))) {
-			*p = EG(float_separator)[0];
-		}	
-	}
 }
 
 /*

Zend/zend_operators.h

@@ -29,6 +29,7 @@
 #include <ieeefp.h>
 #endif
 
+#include "zend_strtod.h"
 
 #if 0&&HAVE_BCMATH
 #include "ext/bcmath/libbcmath/src/bcmath.h"
@@ -87,6 +88,8 @@ static inline zend_bool is_numeric_string(char *str, int length, long *lval, dou
 				*lval = local_lval;
 			}
 			return IS_LONG;
+		} else if (end_ptr_long == str && *end_ptr_long != '\0' && *str != '.') { /* ignore partial string matches */
+			return 0;
 		}
 	} else {
 		end_ptr_long=NULL;
@@ -97,7 +100,7 @@ static inline zend_bool is_numeric_string(char *str, int length, long *lval, dou
 	}
 
 	errno=0;
-	local_dval = strtod(str, &end_ptr_double);
+	local_dval = zend_strtod(str, &end_ptr_double);
 	if (errno != ERANGE) {
 		if (end_ptr_double == str+length) { /* floating point string */
 			if (!zend_finite(local_dval)) {
@@ -177,6 +180,9 @@ ZEND_API int zval_is_true(zval *op);
 ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
 ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
 ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+#if HAVE_STRCOLL
+ZEND_API int string_locale_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+#endif
 
 ZEND_API void zend_str_tolower(char *str, unsigned int length);
 ZEND_API char *zend_str_tolower_copy(char *dest, const char *source, unsigned int length);

Zend/zend_stream.c

@@ -49,7 +49,7 @@ ZEND_API int zend_stream_open(const char *filename, zend_file_handle *handle TSR
 	return (handle->handle.fp) ? SUCCESS : FAILURE;
 }
 
-int zend_stream_fixup(zend_file_handle *file_handle TSRMLS_DC)
+ZEND_API int zend_stream_fixup(zend_file_handle *file_handle TSRMLS_DC)
 {
 	switch (file_handle->type) {
 		case ZEND_HANDLE_FILENAME:
@@ -90,7 +90,7 @@ int zend_stream_fixup(zend_file_handle *file_handle TSRMLS_DC)
 	return SUCCESS;
 }
 
-size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t len TSRMLS_DC)
+ZEND_API size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t len TSRMLS_DC)
 {
 	if (file_handle->handle.stream.interactive) {
 		int c = '*', n; 
@@ -105,7 +105,7 @@ size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t len TSR
 	return file_handle->handle.stream.reader(file_handle->handle.stream.handle, buf, len TSRMLS_CC);
 }
 
-int zend_stream_getc(zend_file_handle *file_handle TSRMLS_DC)
+ZEND_API int zend_stream_getc(zend_file_handle *file_handle TSRMLS_DC)
 {
 	char buf;
 
@@ -115,7 +115,7 @@ int zend_stream_getc(zend_file_handle *file_handle TSRMLS_DC)
 	return EOF;
 }
 
-int zend_stream_ferror(zend_file_handle *file_handle TSRMLS_DC)
+ZEND_API int zend_stream_ferror(zend_file_handle *file_handle TSRMLS_DC)
 {
 	return 0;
 }

Zend/zend_stream.h

@@ -49,10 +49,10 @@ typedef struct _zend_file_handle {
 
 BEGIN_EXTERN_C()
 ZEND_API int zend_stream_open(const char *filename, zend_file_handle *handle TSRMLS_DC);
-int zend_stream_ferror(zend_file_handle *file_handle TSRMLS_DC);
-int zend_stream_getc(zend_file_handle *file_handle TSRMLS_DC);
-size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t len TSRMLS_DC);
-int zend_stream_fixup(zend_file_handle *file_handle TSRMLS_DC);
+ZEND_API int zend_stream_ferror(zend_file_handle *file_handle TSRMLS_DC);
+ZEND_API int zend_stream_getc(zend_file_handle *file_handle TSRMLS_DC);
+ZEND_API size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t len TSRMLS_DC);
+ZEND_API int zend_stream_fixup(zend_file_handle *file_handle TSRMLS_DC);
 END_EXTERN_C()
 
 #define zend_stream_close(handle)	zend_file_handle_dtor((handle))

Zend/zend_strtod.h

@@ -0,0 +1,31 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2004 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Derick Rethans <derick@php.net>                             |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+/* This is a header file for the strtod implementation by David M. Gay which
+ * can be found in zend_strtod.c */
+#ifndef ZEND_STRTOD_H
+#define ZEND_STRTOD_H
+#include <zend.h>
+
+BEGIN_EXTERN_C()
+ZEND_API double zend_strtod(const char *s00, char **se);
+END_EXTERN_C()
+
+#endif

Zend/zend_variables.c

@@ -140,14 +140,16 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
 		case IS_CONSTANT_ARRAY: {
 				zval *tmp;
 				HashTable *original_ht = zvalue->value.ht;
+				HashTable *tmp_ht = NULL;
 				TSRMLS_FETCH();
 
 				if (zvalue->value.ht == &EG(symbol_table)) {
 					return SUCCESS; /* do nothing */
 				}
-				ALLOC_HASHTABLE_REL(zvalue->value.ht);
-				zend_hash_init(zvalue->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0);
-				zend_hash_copy(zvalue->value.ht, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+				ALLOC_HASHTABLE_REL(tmp_ht);
+				zend_hash_init(tmp_ht, 0, NULL, ZVAL_PTR_DTOR, 0);
+				zend_hash_copy(tmp_ht, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+				zvalue->value.ht = tmp_ht;
 			}
 			break;
 		case IS_OBJECT:

acinclude.m4

@@ -1,4 +1,4 @@
-dnl $Id$
+dnl $Id$ -*- autoconf -*-
 dnl
 dnl This file contains local autoconf functions.
 
@@ -21,12 +21,12 @@ AC_DEFUN(PHP_PROG_RE2C,[
 ])
 
 
-dnl PHP_DEFINE(WHAT[, value])
+dnl PHP_DEFINE(WHAT[, value[, directory]])
 dnl
 dnl Creates builddir/include/what.h and in there #define WHAT value
 dnl
 AC_DEFUN([PHP_DEFINE],[
-  [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" > include/php_]translit($1,A-Z,a-z)[.h]
+  [echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" > ]ifelse([$3],,[include],[$3])[/php_]translit($1,A-Z,a-z)[.h]
 ])
 
 dnl PHP_INIT_BUILD_SYSTEM
@@ -1695,16 +1695,24 @@ AC_DEFUN([PHP_SETUP_ICONV], [
   found_iconv=no
   unset ICONV_DIR
 
+  # Create the directories for a VPATH build:
+  test -d ext || mkdir ext
+  test -d ext/iconv || mkdir ext/iconv
+
+  echo > ext/iconv/php_have_libiconv.h
+  echo > ext/iconv/php_have_iconv.h
+  echo > ext/iconv/php_php_iconv_impl.h
+
   dnl
   dnl Check libc first if no path is provided in --with-iconv
   dnl
   if test "$PHP_ICONV" = "yes"; then
     AC_CHECK_FUNC(iconv, [
-      PHP_DEFINE(HAVE_ICONV)
+      PHP_DEFINE(HAVE_ICONV,1,[ext/iconv])
       found_iconv=yes
     ],[
       AC_CHECK_FUNC(libiconv,[
-        PHP_DEFINE(HAVE_LIBICONV)
+        PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
         found_iconv=yes
       ])
     ])
@@ -1737,11 +1745,11 @@ AC_DEFUN([PHP_SETUP_ICONV], [
     then
       PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
         found_iconv=yes
-        PHP_DEFINE(HAVE_LIBICONV)
+        PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
       ], [
         PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
           found_iconv=yes
-          PHP_DEFINE(HAVE_ICONV)
+          PHP_DEFINE(HAVE_ICONV,1,[ext/iconv])
         ], [], [
           -L$ICONV_DIR/lib
         ])

configure.in

@@ -40,8 +40,8 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 MAJOR_VERSION=5
 MINOR_VERSION=0
-RELEASE_VERSION=0
-EXTRA_VERSION="RC3RC1"
+RELEASE_VERSION=3
+EXTRA_VERSION="RC2"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context
@@ -545,17 +545,20 @@ AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
   AC_TRY_RUN([
 #include <netdb.h>
 #include <sys/types.h>
+#ifndef AF_INET
+# include <sys/socket.h>
+#endif
 int main(void) {
   struct addrinfo *ai, *pai, hints;
 
   memset(&hints, 0, sizeof(hints));
   hints.ai_flags = AI_NUMERICHOST;
 
-  if (getaddrinfo("127.0.0.1", NULL, &hints, &ai) < 0) {
+  if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
     exit(1);
   }
 
-  if (ai == NULL) {
+  if (ai == 0) {
     exit(1);
   }
 
@@ -584,8 +587,8 @@ fi
 AC_REPLACE_FUNCS(strlcat strlcpy getopt)
 AC_FUNC_UTIME_NULL
 AC_FUNC_ALLOCA
-PHP_AC_BROKEN_SPRINTF
-PHP_AC_BROKEN_SNPRINTF
+dnl PHP_AC_BROKEN_SPRINTF
+dnl PHP_AC_BROKEN_SNPRINTF
 PHP_DECLARED_TIMEZONE
 PHP_TIME_R_TYPE
 PHP_READDIR_R_TYPE
@@ -765,6 +768,19 @@ if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then
   AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support])
 fi
 
+AC_MSG_CHECKING([how big to make fd sets])
+AC_ARG_ENABLE(fd-setsize,
+[  --enable-fd-setsize     Set size of descriptor sets],[
+  if test "x$enableval" != "xyes"; then
+    CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$enableval"
+    AC_MSG_RESULT(using $enableval)
+  else
+    AC_MSG_RESULT(using system default)
+  fi
+],[
+  AC_MSG_RESULT(using system default)
+])
+
 AC_MSG_CHECKING([whether to enable versioning])
 AC_ARG_ENABLE(versioning,
 [  --enable-versioning     Export only required symbols.
@@ -933,7 +949,7 @@ fi
 
 if test "$abs_srcdir" != "$abs_builddir"; then
   INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend"
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
+  INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/"
 fi
 
 ZEND_EXTRA_LIBS="$LIBS"
@@ -1232,7 +1248,7 @@ PHP_ADD_SOURCES(Zend, \
     zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
     zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
     zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
-    zend_iterators.c zend_interfaces.c zend_exceptions.c)
+    zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c)
 
 if test -r "$abs_srcdir/Zend/zend_objects.c"; then
   PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_mm.c \

ext/bcmath/bcmath.c

@@ -53,8 +53,8 @@ zend_module_entry bcmath_module_entry = {
 	bcmath_functions,
 	PHP_MINIT(bcmath),
 	PHP_MSHUTDOWN(bcmath),
-	NULL,
-	NULL,
+	PHP_RINIT(bcmath),
+	PHP_RSHUTDOWN(bcmath),
 	PHP_MINFO(bcmath),
 	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
@@ -86,8 +86,6 @@ PHP_MINIT_FUNCTION(bcmath)
 
 	REGISTER_INI_ENTRIES();
 
-	bc_init_numbers(TSRMLS_C);
-
 	return SUCCESS;
 }
 /* }}} */
@@ -96,15 +94,33 @@ PHP_MINIT_FUNCTION(bcmath)
  */
 PHP_MSHUTDOWN_FUNCTION(bcmath)
 {
-	_bc_free_num_ex(&BCG(_zero_), 1);
-	_bc_free_num_ex(&BCG(_one_), 1);
-	_bc_free_num_ex(&BCG(_two_), 1);
-
 	UNREGISTER_INI_ENTRIES();
 
 	return SUCCESS;
 }
 /* }}} */
+
+/* {{{ PHP_RINIT_FUNCTION
+ */
+PHP_RINIT_FUNCTION(bcmath)
+{
+	bc_init_numbers(TSRMLS_C);
+
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_RSHUTDOWN_FUNCTION
+ */
+PHP_RSHUTDOWN_FUNCTION(bcmath)
+{
+	_bc_free_num_ex(&BCG(_zero_), 1);
+	_bc_free_num_ex(&BCG(_one_), 1);
+	_bc_free_num_ex(&BCG(_two_), 1);
+
+	return SUCCESS;
+}
+/* }}} */	
          
 /* {{{ PHP_MINFO_FUNCTION
  */

ext/bcmath/libbcmath/src/raisemod.c

@@ -92,6 +92,7 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale TSR
   bc_free_num (&power);
   bc_free_num (&exponent);
   bc_free_num (result);
+  bc_free_num (&parity);
   *result = temp;
   return 0;	/* Everything is OK. */
 }

ext/bcmath/php_bcmath.h

@@ -30,6 +30,8 @@ extern zend_module_entry bcmath_module_entry;
 
 PHP_MINIT_FUNCTION(bcmath);
 PHP_MSHUTDOWN_FUNCTION(bcmath);
+PHP_RINIT_FUNCTION(bcmath);
+PHP_RSHUTDOWN_FUNCTION(bcmath);
 PHP_MINFO_FUNCTION(bcmath);
 
 PHP_FUNCTION(bcadd);

ext/calendar/calendar.c

@@ -163,26 +163,14 @@ PHP_MINFO_FUNCTION(calendar)
 	php_info_print_table_end();
 }
 
-/* {{{ proto array cal_info(int calendar)
-   Returns information about a particular calendar */
-PHP_FUNCTION(cal_info)
+static void _php_cal_info(int cal, zval **ret)
 {
-	long cal;
 	zval *months, *smonths;
 	int i;
 	struct cal_entry_t *calendar;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &cal) == FAILURE) {
-		RETURN_FALSE;
-	}
-
-	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal);
-		RETURN_FALSE;
-	}
-
 	calendar = &cal_conversion_table[cal];
-	array_init(return_value);
+	array_init(*ret);
 
 	MAKE_STD_ZVAL(months);
 	MAKE_STD_ZVAL(smonths);
@@ -193,11 +181,46 @@ PHP_FUNCTION(cal_info)
 		add_index_string(months, i, calendar->month_name_long[i], 1);
 		add_index_string(smonths, i, calendar->month_name_short[i], 1);
 	}
-	add_assoc_zval(return_value, "months", months);
-	add_assoc_zval(return_value, "abbrevmonths", smonths);
-	add_assoc_long(return_value, "maxdaysinmonth", calendar->max_days_in_month);
-	add_assoc_string(return_value, "calname", calendar->name, 1);
-	add_assoc_string(return_value, "calsymbol", calendar->symbol, 1);
+	add_assoc_zval(*ret, "months", months);
+	add_assoc_zval(*ret, "abbrevmonths", smonths);
+	add_assoc_long(*ret, "maxdaysinmonth", calendar->max_days_in_month);
+	add_assoc_string(*ret, "calname", calendar->name, 1);
+	add_assoc_string(*ret, "calsymbol", calendar->symbol, 1);
+	
+}
+
+/* {{{ proto array cal_info(int calendar)
+   Returns information about a particular calendar */
+PHP_FUNCTION(cal_info)
+{
+	long cal = -1;
+	
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &cal) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	if (cal == -1) {
+		int i;
+		zval *val;
+
+		array_init(return_value);
+
+		for (i = 0; i < CAL_NUM_CALS; i++) {
+			MAKE_STD_ZVAL(val);
+			_php_cal_info(i, &val);
+			add_index_zval(return_value, i, val);
+		}
+		return;
+	}
+
+
+	if (cal != -1 && (cal < 0 || cal >= CAL_NUM_CALS)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid calendar ID %ld.", cal);
+		RETURN_FALSE;
+	}
+
+	_php_cal_info(cal, &return_value);
 
 }
 /* }}} */

ext/com_dotnet/com_com.c

@@ -37,7 +37,7 @@ PHP_FUNCTION(com_create_instance)
 	php_com_dotnet_object *obj;
 	char *module_name, *typelib_name = NULL, *server_name = NULL;
 	char *user_name = NULL, *domain_name = NULL, *password = NULL;
-	long module_name_len, typelib_name_len, server_name_len,
+	int module_name_len, typelib_name_len, server_name_len,
 		user_name_len, domain_name_len, password_len;
 	OLECHAR *moniker;
 	CLSID clsid;
@@ -287,7 +287,7 @@ PHP_FUNCTION(com_get_active_object)
 {
 	CLSID clsid;
 	char *module_name;
-	long module_name_len;
+	int module_name_len;
 	long code_page = COMG(code_page);
 	IUnknown *unk = NULL;
 	IDispatch *obj = NULL;
@@ -799,7 +799,7 @@ PHP_FUNCTION(com_message_pump)
 PHP_FUNCTION(com_load_typelib)
 {
 	char *name;
-	long namelen;
+	int namelen;
 	ITypeLib *pTL = NULL;
 	zend_bool cs = TRUE;
 	int codepage = COMG(code_page);

ext/com_dotnet/com_dotnet.c

@@ -32,53 +32,139 @@
 # include "Zend/zend_exceptions.h"
 # include <mscoree.h>
 
+/* Since there is no official public mscorlib.h header file, and since
+ * generating your own version from the elusive binary .tlb file takes a lot of
+ * hacking and results in a 3MB header file (!), we opt for this slightly
+ * voodoo approach.  The following is just enough definition to be able to
+ * reach the _AppDomain::CreateInstance method that we need to use to be able
+ * to fire up .Net objects.  We used to use IDispatch for this, but it would
+ * not always work.
+ *
+ * The following info was obtained using OleView to export the IDL from
+ * mscorlib.tlb.  Note that OleView is unable to generate C headers for this
+ * particular tlb... hence this mess.
+ */
+
+const GUID IID_mscorlib_System_AppDomain = {
+0x05F696DC, 0x2B29, 0x3663, {0xAD, 0x8B, 0xC4, 0x38, 0x9C, 0xF2, 0xA7, 0x13 }};
+
+typedef struct _Imscorlib_System_AppDomain IAppDomain;
+
+struct _Imscorlib_System_AppDomainVtbl {
+	BEGIN_INTERFACE
+
+	HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+		IAppDomain * This,
+		/* [in] */ REFIID riid,
+		/* [iid_is][out] */ void **ppvObject);
+        
+	ULONG ( STDMETHODCALLTYPE *AddRef )( 
+		IAppDomain * This);
+        
+	ULONG ( STDMETHODCALLTYPE *Release )( 
+		IAppDomain * This);
+        
+	/* this is padding to get CreateInstance into the correct position */
+#define DUMMY_METHOD(x)		HRESULT ( STDMETHODCALLTYPE *dummy_##x )(IAppDomain *This)
+
+	DUMMY_METHOD(GetTypeInfoCount);
+	DUMMY_METHOD(GetTypeInfo);
+	DUMMY_METHOD(GetIDsOfNames);
+	DUMMY_METHOD(Invoke);
+	DUMMY_METHOD(ToString);
+	DUMMY_METHOD(Equals);
+	DUMMY_METHOD(GetHashCode);
+	DUMMY_METHOD(GetType);
+	DUMMY_METHOD(InitializeLifetimeService);
+	DUMMY_METHOD(GetLifetimeService);
+	DUMMY_METHOD(Evidence);
+	DUMMY_METHOD(add_DomainUnload);
+	DUMMY_METHOD(remove_DomainUnload);
+	DUMMY_METHOD(add_AssemblyLoad);
+	DUMMY_METHOD(remove_AssemblyLoad);
+	DUMMY_METHOD(add_ProcessExit);
+	DUMMY_METHOD(remove_ProcessExit);
+	DUMMY_METHOD(add_TypeResolve);
+	DUMMY_METHOD(remove_TypeResolve);
+	DUMMY_METHOD(add_ResourceResolve);
+	DUMMY_METHOD(remove_ResourceResolve);
+	DUMMY_METHOD(add_AssemblyResolve);
+	DUMMY_METHOD(remove_AssemblyResolve);
+	DUMMY_METHOD(add_UnhandledException);
+	DUMMY_METHOD(remove_UnhandledException);
+	DUMMY_METHOD(DefineDynamicAssembly);
+	DUMMY_METHOD(DefineDynamicAssembly_2);
+	DUMMY_METHOD(DefineDynamicAssembly_3);
+	DUMMY_METHOD(DefineDynamicAssembly_4);
+	DUMMY_METHOD(DefineDynamicAssembly_5);
+	DUMMY_METHOD(DefineDynamicAssembly_6);
+	DUMMY_METHOD(DefineDynamicAssembly_7);
+	DUMMY_METHOD(DefineDynamicAssembly_8);
+	DUMMY_METHOD(DefineDynamicAssembly_9);
+
+	HRESULT ( STDMETHODCALLTYPE *CreateInstance )(IAppDomain * This, BSTR AssemblyName, BSTR typeName, IUnknown **pRetVal);
+	HRESULT ( STDMETHODCALLTYPE *CreateInstanceFrom )(IAppDomain * This, BSTR AssemblyFile, BSTR typeName, IUnknown **pRetVal);
+
+	/* more methods live here */
+
+	END_INTERFACE
+};
+
+struct _Imscorlib_System_AppDomain {
+	struct _Imscorlib_System_AppDomainVtbl *lpVtbl;
+};
+
+
 struct dotnet_runtime_stuff {
 	ICorRuntimeHost *dotnet_host;
-	IDispatch *dotnet_domain;
+	IAppDomain 		*dotnet_domain;
 	DISPID create_instance;
 };
 
-/* Since there is no official public mscorlib.h header file, and since
- * generating your own version from the binary .tlb file results in a 3MB
- * header file (!), we opt for the Dispatch-able approach.  This is slightly
- * slower for creating new objects, but not too bad */
-static int dotnet_init(TSRMLS_D)
+static HRESULT dotnet_init(char **p_where TSRMLS_DC)
 {
 	HRESULT hr;
 	struct dotnet_runtime_stuff *stuff;
 	IUnknown *unk = NULL;
-	OLECHAR *olename;
+	OLECHAR *olename, *oletmp;
+	char *where = "";
 
 	stuff = malloc(sizeof(*stuff));
 	memset(stuff, 0, sizeof(*stuff));
 
-	if (SUCCEEDED(CoCreateInstance(&CLSID_CorRuntimeHost, NULL, CLSCTX_ALL,
-			&IID_ICorRuntimeHost, (LPVOID*)&stuff->dotnet_host))) {
+	where = "CoCreateInstance";
+	hr = CoCreateInstance(&CLSID_CorRuntimeHost, NULL, CLSCTX_ALL,
+			&IID_ICorRuntimeHost, (LPVOID*)&stuff->dotnet_host);
 
-		/* fire up the host and get the domain object */
-		if (SUCCEEDED(ICorRuntimeHost_Start(stuff->dotnet_host)) &&
-				SUCCEEDED(ICorRuntimeHost_GetDefaultDomain(stuff->dotnet_host, &unk)) &&
-				SUCCEEDED(IUnknown_QueryInterface(unk, &IID_IDispatch, (LPVOID*)&stuff->dotnet_domain))) {
+	if (FAILED(hr))
+		goto out;
 
-			/* locate the create-instance member */
-			olename = php_com_string_to_olestring("CreateInstance", sizeof("CreateInstance")-1, CP_ACP TSRMLS_CC);
-			hr = IDispatch_GetIDsOfNames(stuff->dotnet_domain, &IID_NULL, &olename, 1, LOCALE_SYSTEM_DEFAULT, &stuff->create_instance);
-			efree(olename);
+	/* fire up the host and get the domain object */
+	where = "ICorRuntimeHost_Start\n";
+	hr = ICorRuntimeHost_Start(stuff->dotnet_host);
+	if (FAILED(hr))
+		goto out;
+	
+	where = "ICorRuntimeHost_GetDefaultDomain";
+	hr = ICorRuntimeHost_GetDefaultDomain(stuff->dotnet_host, &unk);
+	if (FAILED(hr))
+		goto out;
 
-			if (SUCCEEDED(hr)) {
-				COMG(dotnet_runtime_stuff) = stuff;
-			}
-		}
+	where = "QI: System._AppDomain";
+	hr = IUnknown_QueryInterface(unk, &IID_mscorlib_System_AppDomain, (LPVOID*)&stuff->dotnet_domain);
+	if (FAILED(hr))
+		goto out;
+		
+	COMG(dotnet_runtime_stuff) = stuff;
 
-		if (unk) {
-			IUnknown_Release(unk);
-		}
+out:
+	if (unk) {
+		IUnknown_Release(unk);
 	}
-
 	if (COMG(dotnet_runtime_stuff) == NULL) {
 		/* clean up */
 		if (stuff->dotnet_domain) {
-			IDispatch_Release(stuff->dotnet_domain);
+			IUnknown_Release(stuff->dotnet_domain);
 		}
 		if (stuff->dotnet_host) {
 			ICorRuntimeHost_Stop(stuff->dotnet_host);
@@ -86,10 +172,12 @@ static int dotnet_init(TSRMLS_D)
 		}
 		free(stuff);
 
-		return FAILURE;
+		*p_where = where;
+
+		return hr;
 	}
 
-	return SUCCESS;
+	return S_OK;
 }
 
 /* {{{ com_dotnet_create_instance - ctor for DOTNET class */
@@ -98,18 +186,23 @@ PHP_FUNCTION(com_dotnet_create_instance)
 	zval *object = getThis();
 	php_com_dotnet_object *obj;
 	char *assembly_name, *datatype_name;
-	long assembly_name_len, datatype_name_len;
+	int assembly_name_len, datatype_name_len;
 	struct dotnet_runtime_stuff *stuff;
-	IObjectHandle *handle;
-	DISPPARAMS params;
-	VARIANT vargs[2];
-	VARIANT retval;
+	OLECHAR *olestring, *oleassembly, *oletype;
 	HRESULT hr;
 	int ret = FAILURE;
+	char *where = "";
+	IUnknown *unk = NULL;
 
 	if (COMG(dotnet_runtime_stuff) == NULL) {
-		if (FAILURE == dotnet_init(TSRMLS_C)) {
-			php_com_throw_exception(E_ERROR, "Failed to initialize .Net runtime" TSRMLS_CC);
+		hr = dotnet_init(&where TSRMLS_CC);
+		if (FAILED(hr)) {
+			char buf[1024];
+			char *err = php_win_err(hr);
+			snprintf(buf, sizeof(buf), "Failed to init .Net runtime [%s] %s", where, err);
+			if (err)
+				LocalFree(err);
+			php_com_throw_exception(hr, buf TSRMLS_CC);
 			ZVAL_NULL(object);
 			return;
 		}
@@ -128,50 +221,63 @@ PHP_FUNCTION(com_dotnet_create_instance)
 		return;
 	}
 
-	params.cArgs = 2;
-	params.cNamedArgs = 0;
-	params.rgdispidNamedArgs = NULL;
-	params.rgvarg = vargs;
-
-	VariantInit(&vargs[0]);
-	VariantInit(&vargs[1]);
-	VariantInit(&retval);
-
-	V_VT(&vargs[0]) = VT_BSTR;
-	V_BSTR(&vargs[0]) = php_com_string_to_olestring(datatype_name, datatype_name_len, obj->code_page TSRMLS_CC);
-
-	V_VT(&vargs[1]) = VT_BSTR;
-	V_BSTR(&vargs[1]) = php_com_string_to_olestring(assembly_name, assembly_name_len, obj->code_page TSRMLS_CC);
-
-	hr = IDispatch_Invoke(stuff->dotnet_domain, stuff->create_instance, &IID_NULL, LOCALE_SYSTEM_DEFAULT,
-		DISPATCH_METHOD, &params, &retval, NULL, NULL);
+	oletype = php_com_string_to_olestring(datatype_name, datatype_name_len, obj->code_page TSRMLS_CC);
+	oleassembly = php_com_string_to_olestring(assembly_name, assembly_name_len, obj->code_page TSRMLS_CC);
+	where = "CreateInstance";
+	hr = stuff->dotnet_domain->lpVtbl->CreateInstance(stuff->dotnet_domain, oleassembly, oletype, &unk);
+	efree(oletype);
+	efree(oleassembly);
 
 	if (SUCCEEDED(hr)) {
-		/* retval should now be an IUnknown/IDispatch representation of an IObjectHandle interface */
-		if ((V_VT(&retval) == VT_UNKNOWN || V_VT(&retval) == VT_DISPATCH) &&
-				SUCCEEDED(IUnknown_QueryInterface(V_UNKNOWN(&retval), &IID_IObjectHandle, &handle))) {
-			VARIANT unwrapped;
+		VARIANT unwrapped;
+		IObjectHandle *handle = NULL;
 
-			if (SUCCEEDED(IObjectHandle_Unwrap(handle, &unwrapped))) {
-				/* unwrapped is now the dispatch pointer we want */
-				V_DISPATCH(&obj->v) = V_DISPATCH(&unwrapped);
-				V_VT(&obj->v) = VT_DISPATCH;
+		where = "QI: IObjectHandle";
+		hr = IUnknown_QueryInterface(unk, &IID_IObjectHandle, &handle);
 
-				/* get its type-info */
-				IDispatch_GetTypeInfo(V_DISPATCH(&obj->v), 0, LANG_NEUTRAL, &obj->typeinfo);
+		if (SUCCEEDED(hr)) {
+			where = "IObjectHandle_Unwrap";
+			hr = IObjectHandle_Unwrap(handle, &unwrapped);
+			if (SUCCEEDED(hr)) {
 
-				ret = SUCCESS;
+				if (V_VT(&unwrapped) == VT_UNKNOWN) {
+					where = "Unwrapped, QI for IDispatch";
+					hr = IUnknown_QueryInterface(V_UNKNOWN(&unwrapped), &IID_IDispatch, &V_DISPATCH(&obj->v));
+
+					if (SUCCEEDED(hr)) {
+						V_VT(&obj->v) = VT_DISPATCH;
+
+						/* get its type-info */
+						IDispatch_GetTypeInfo(V_DISPATCH(&obj->v), 0, LANG_NEUTRAL, &obj->typeinfo);
+						ret = SUCCESS;
+					}
+				} else if (V_VT(&unwrapped) == VT_DISPATCH) {
+					/* unwrapped is now the dispatch pointer we want */
+					V_DISPATCH(&obj->v) = V_DISPATCH(&unwrapped);
+					V_VT(&obj->v) = VT_DISPATCH;
+
+					/* get its type-info */
+					IDispatch_GetTypeInfo(V_DISPATCH(&obj->v), 0, LANG_NEUTRAL, &obj->typeinfo);
+
+					ret = SUCCESS;
+				} else {
+					/* shouldn't happen, but let's be ready for it */
+					VariantClear(&unwrapped);
+					hr = E_INVALIDARG;
+				}
 			}
 			IObjectHandle_Release(handle);
 		}
-		VariantClear(&retval);
+		IUnknown_Release(unk);
 	}
 
-	VariantClear(&vargs[0]);
-	VariantClear(&vargs[1]);
-
 	if (ret == FAILURE) {
-		php_com_throw_exception(hr, "Failed to instantiate .Net object" TSRMLS_CC);
+		char buf[1024];
+		char *err = php_win_err(hr);
+		snprintf(buf, sizeof(buf), "Failed to instantiate .Net object [%s] [0x%08x] %s", where, hr, err);
+		if (err)
+			LocalFree(err);
+		php_com_throw_exception(hr, buf TSRMLS_CC);
 		ZVAL_NULL(object);
 		return;
 	}

ext/com_dotnet/com_extension.c

@@ -194,7 +194,7 @@ PHP_MINIT_FUNCTION(com_dotnet)
 	INIT_CLASS_ENTRY(ce, "com_exception", NULL);
 	php_com_exception_class_entry = zend_register_internal_class_ex(&ce, zend_exception_get_default(), NULL TSRMLS_CC);
 	php_com_exception_class_entry->ce_flags |= ZEND_ACC_FINAL;
-	php_com_exception_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED;
+//	php_com_exception_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED;
 
 	INIT_CLASS_ENTRY(ce, "com_safearray_proxy", NULL);
 	php_com_saproxy_class_entry = zend_register_internal_class(&ce TSRMLS_CC);

ext/com_dotnet/com_handlers.c

@@ -286,11 +286,19 @@ static void function_dtor(void *pDest)
 	}
 }
 
+static PHP_FUNCTION(com_method_handler)
+{
+	Z_OBJ_HANDLER_P(getThis(), call_method)(
+			((zend_internal_function*)EG(function_state_ptr)->function)->function_name,
+			INTERNAL_FUNCTION_PARAM_PASSTHRU);
+}
+
 static union _zend_function *com_method_get(zval *object, char *name, int len TSRMLS_DC)
 {
 	zend_internal_function f, *fptr = NULL;
 	php_com_dotnet_object *obj;
 	union _zend_function *func;
+	DISPID dummy;
 
 	obj = CDNO_FETCH(object);
 
@@ -298,6 +306,10 @@ static union _zend_function *com_method_get(zval *object, char *name, int len TS
 		return NULL;
 	}
 
+	if (FAILED(php_com_get_id_of_name(obj, name, len, &dummy TSRMLS_CC))) {
+		return NULL;
+	}
+
 	/* check cache */
 	if (obj->method_cache == NULL || FAILURE == zend_hash_find(obj->method_cache, name, len, (void**)&fptr)) {
 		f.type = ZEND_OVERLOADED_FUNCTION;
@@ -306,7 +318,10 @@ static union _zend_function *com_method_get(zval *object, char *name, int len TS
 		f.scope = obj->ce;
 		f.fn_flags = 0;
 		f.function_name = estrndup(name, len);
+		f.handler = PHP_FN(com_method_handler);
 
+		fptr = &f;
+		
 		if (obj->typeinfo) {
 			/* look for byref params */
 			ITypeComp *comp;
@@ -346,6 +361,9 @@ static union _zend_function *com_method_get(zval *object, char *name, int len TS
 						case DESCKIND_TYPECOMP:
 							ITypeComp_Release(bindptr.lptcomp);
 							break;
+
+						case DESCKIND_NONE:
+							break;
 					}
 					if (TI) {
 						ITypeInfo_Release(TI);
@@ -356,21 +374,27 @@ static union _zend_function *com_method_get(zval *object, char *name, int len TS
 			}
 		}
 
-		/* save this method in the cache */
-		if (!obj->method_cache) {
-			ALLOC_HASHTABLE(obj->method_cache);
-			zend_hash_init(obj->method_cache, 2, NULL, function_dtor, 0);
-		}
+		if (fptr) {
+			/* save this method in the cache */
+			if (!obj->method_cache) {
+				ALLOC_HASHTABLE(obj->method_cache);
+				zend_hash_init(obj->method_cache, 2, NULL, function_dtor, 0);
+			}
 
-		zend_hash_update(obj->method_cache, name, len, &f, sizeof(f), (void**)&fptr);
+			zend_hash_update(obj->method_cache, name, len, &f, sizeof(f), (void**)&fptr);
+		}
 	}
 
-	/* duplicate this into a new chunk of emalloc'd memory,
-	 * since the engine will efree it */
-	func = emalloc(sizeof(*fptr));
-	memcpy(func, fptr, sizeof(*fptr));
+	if (fptr) {
+		/* duplicate this into a new chunk of emalloc'd memory,
+		 * since the engine will efree it */
+		func = emalloc(sizeof(*fptr));
+		memcpy(func, fptr, sizeof(*fptr));
 
-	return func;
+		return func;
+	}
+
+	return NULL;
 }
 
 static int com_call_method(char *method, INTERNAL_FUNCTION_PARAMETERS)

ext/com_dotnet/com_persist.c

@@ -375,7 +375,7 @@ CPH_METHOD(SaveToFile)
 {
 	HRESULT res;
 	char *filename, *fullpath = NULL;
-	long filename_len;
+	int filename_len;
 	zend_bool remember = TRUE;
 	OLECHAR *olefilename = NULL;
 	CPH_FETCH();
@@ -438,7 +438,7 @@ CPH_METHOD(LoadFromFile)
 {
 	HRESULT res;
 	char *filename, *fullpath;
-	long filename_len;
+	int filename_len;
 	long flags = 0;
 	OLECHAR *olefilename;
 	CPH_FETCH();

ext/com_dotnet/com_saproxy.c

@@ -168,7 +168,7 @@ static zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_
 		VariantInit(&v);
 		
 		/* we can return a real value */
-		indices = do_alloca(dims * sizeof(LONG));
+		indices = emalloc(dims * sizeof(LONG));
 
 		/* copy indices from proxy */
 		for (i = 0; i < dims; i++) {
@@ -191,7 +191,7 @@ static zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_
 			res = SafeArrayGetElement(sa, indices, &v.lVal);
 		}
 
-		free_alloca(indices);
+		efree(indices);
 
 		if (SUCCEEDED(res)) {
 			php_com_wrap_variant(return_value, &v, proxy->obj->code_page TSRMLS_CC);
@@ -244,7 +244,7 @@ static void saproxy_write_dimension(zval *object, zval *offset, zval *value TSRM
 		VARTYPE vt;
 
 		dims = SafeArrayGetDim(V_ARRAY(&proxy->obj->v));
-		indices = do_alloca(dims * sizeof(LONG));
+		indices = emalloc(dims * sizeof(LONG));
 		/* copy indices from proxy */
 		for (i = 0; i < dims; i++) {
 			convert_to_long(proxy->indices[i]);
@@ -272,7 +272,7 @@ static void saproxy_write_dimension(zval *object, zval *offset, zval *value TSRM
 			res = SafeArrayPutElement(V_ARRAY(&proxy->obj->v), indices, &v.lVal);
 		}
 	
-		free_alloca(indices);
+		efree(indices);
 		VariantClear(&v);
 
 		if (FAILED(res)) {

ext/com_dotnet/com_typeinfo.c

@@ -227,34 +227,35 @@ void php_com_typelibrary_dtor(void *pDest)
 PHPAPI ITypeLib *php_com_load_typelib_via_cache(char *search_string,
 	int codepage, int *cached TSRMLS_DC)
 {
-	ITypeLib **TL;
+	ITypeLib **TLp;
+	ITypeLib *TL;
 	char *name_dup;
 	int l;
 
 	l = strlen(search_string);
 
 	if (zend_ts_hash_find(&php_com_typelibraries, search_string, l+1,
-			(void**)&TL) == SUCCESS) {
+			(void**)&TLp) == SUCCESS) {
 		*cached = 1;
 		/* add a reference for the caller */
-		ITypeLib_AddRef(*TL);
-		return *TL;
+		ITypeLib_AddRef(*TLp);
+		return *TLp;
 	}
 
 	*cached = 0;
 	name_dup = estrndup(search_string, l);
-	*TL = php_com_load_typelib(name_dup, codepage TSRMLS_CC);
+	TL = php_com_load_typelib(name_dup, codepage TSRMLS_CC);
 	efree(name_dup);
 
-	if (*TL) {
+	if (TL) {
 		if (SUCCESS == zend_ts_hash_update(&php_com_typelibraries,
-				search_string, l+1, (void*)*TL, sizeof(ITypeLib*), NULL)) {
+				search_string, l+1, (void*)TL, sizeof(ITypeLib*), NULL)) {
 			/* add a reference for the hash table */
-			ITypeLib_AddRef(*TL);
+			ITypeLib_AddRef(TL);
 		}
 	}
 
-	return *TL;
+	return TL;
 }
 
 ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink TSRMLS_DC)

ext/com_dotnet/com_variant.c

@@ -260,7 +260,7 @@ PHPAPI int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC
 /* {{{ com_variant_create_instance - ctor for new VARIANT() */
 PHP_FUNCTION(com_variant_create_instance)
 {
-	VARTYPE vt = VT_EMPTY;
+	/* VARTYPE == unsigned short */ long vt = VT_EMPTY;
 	long codepage = CP_ACP;
 	zval *object = getThis();
 	php_com_dotnet_object *obj;
@@ -290,7 +290,7 @@ PHP_FUNCTION(com_variant_create_instance)
 
 	if (ZEND_NUM_ARGS() >= 2) {
 
-		res = VariantChangeType(&obj->v, &obj->v, 0, vt);
+		res = VariantChangeType(&obj->v, &obj->v, 0, (VARTYPE)vt);
 
 		if (FAILED(res)) {
 			char *werr, *msg;
@@ -788,7 +788,7 @@ PHP_FUNCTION(variant_date_to_timestamp)
    Returns a variant date representation of a unix timestamp */
 PHP_FUNCTION(variant_date_from_timestamp)
 {
-	int timestamp;
+	long timestamp;
 	SYSTEMTIME systime;
 	struct tm *tmv;
 	VARIANT res;
@@ -799,7 +799,8 @@ PHP_FUNCTION(variant_date_from_timestamp)
 	}
 
 	VariantInit(&res);
-	tmv = gmtime(&timestamp);
+	tzset();
+	tmv = localtime(&timestamp);
 	memset(&systime, 0, sizeof(systime));
 
 	systime.wDay = tmv->tm_mday;
@@ -841,7 +842,7 @@ PHP_FUNCTION(variant_set_type)
 {
 	zval *zobj;
 	php_com_dotnet_object *obj;
-	VARTYPE vt;
+	/* VARTYPE == unsigned short */ long vt;
 	HRESULT res;
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -850,7 +851,7 @@ PHP_FUNCTION(variant_set_type)
 	}
 	obj = CDNO_FETCH(zobj);
 
-	res = VariantChangeType(&obj->v, &obj->v, 0, vt);
+	res = VariantChangeType(&obj->v, &obj->v, 0, (VARTYPE)vt);
 
 	if (SUCCEEDED(res)) {
 		if (vt != VT_DISPATCH && obj->typeinfo) {
@@ -876,7 +877,7 @@ PHP_FUNCTION(variant_cast)
 {
 	zval *zobj;
 	php_com_dotnet_object *obj;
-	VARTYPE vt;
+	/* VARTYPE == unsigned short */ long vt;
 	VARIANT vres;
 	HRESULT res;
 
@@ -887,7 +888,7 @@ PHP_FUNCTION(variant_cast)
 	obj = CDNO_FETCH(zobj);
 
 	VariantInit(&vres);
-	res = VariantChangeType(&vres, &obj->v, 0, vt);
+	res = VariantChangeType(&vres, &obj->v, 0, (VARTYPE)vt);
 
 	if (SUCCEEDED(res)) {
 		php_com_wrap_variant(return_value, &vres, obj->code_page TSRMLS_CC);

ext/com_dotnet/com_wrapper.c

@@ -296,12 +296,16 @@ static HRESULT STDMETHODCALLTYPE disp_invokeex(
 		} else if (wFlags & DISPATCH_PROPERTYPUT) {
 			zend_update_property(Z_OBJCE_P(disp->object), disp->object, Z_STRVAL_PP(name), Z_STRLEN_PP(name)+1, *params[0] TSRMLS_CC);
 		} else if (wFlags & DISPATCH_METHOD) {
-			if (SUCCESS == call_user_function_ex(EG(function_table), &disp->object, *name,
-					&retval, pdp->cArgs, params, 1, NULL TSRMLS_CC)) {
-				ret = S_OK;
-			} else {
+			zend_try {
+				if (SUCCESS == call_user_function_ex(EG(function_table), &disp->object, *name,
+							&retval, pdp->cArgs, params, 1, NULL TSRMLS_CC)) {
+					ret = S_OK;
+				} else {
+					ret = DISP_E_EXCEPTION;
+				}
+			} zend_catch {
 				ret = DISP_E_EXCEPTION;
-			}
+			} zend_end_try();
 		} else {
 			trace("Don't know how to handle this invocation %08x\n", wFlags);
 		}

ext/com_dotnet/php_com_dotnet_internal.h

@@ -36,7 +36,7 @@ typedef struct _php_com_dotnet_object {
 	VARIANT v;
 
 	ITypeInfo *typeinfo;
-	int code_page;
+	long code_page;
 	unsigned int have_default_bind:1;
 
 	zend_class_entry *ce;

ext/cpdf/cpdf.c

@@ -726,7 +726,7 @@ PHP_FUNCTION(cpdf_set_font)
 	int id, type;
 	CPDFdoc *pdf;
 
-	if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &arg1, &arg2, &arg3, &arg4) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1286,6 +1286,10 @@ PHP_FUNCTION(cpdf_setdash)
 	convert_to_long_ex(arg2);
 	convert_to_long_ex(arg3);
 
+	if (!pdf->currentMemStream) {
+		RETURN_FALSE;
+	}
+
 	snprintf(buffer, BUFFERLEN, "[%d %d] 0", (int) Z_LVAL_PP(arg2), (int) Z_LVAL_PP(arg3));
 	cpdf_setdash(pdf, buffer);
 

ext/ctype/ctype.c

@@ -97,7 +97,13 @@ PHP_MINFO_FUNCTION(ctype)
 		return; \
  	switch (Z_TYPE_P(c)) { \
 	case IS_LONG: \
-		RETURN_BOOL(iswhat(Z_LVAL_P(c))); \
+		if (Z_LVAL_P(c) <= 255 && Z_LVAL_P(c) >= 0) { \
+			RETURN_BOOL(iswhat(Z_LVAL_P(c))); \
+		} else if (Z_LVAL_P(c) >= -128 && Z_LVAL_P(c) < 0) { \
+			RETURN_BOOL(iswhat(Z_LVAL_P(c) + 256)); \
+		} \
+		SEPARATE_ZVAL(&c);	\
+		convert_to_string(c);	\
 	case IS_STRING: \
 		{ \
 			char *p; \

ext/curl/interface.c

@@ -220,6 +220,9 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLOPT_UNRESTRICTED_AUTH);
 	REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPRT);
 	REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
+	REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
+	REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
+	REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
 
 #if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */
  	REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
@@ -231,7 +234,11 @@ PHP_MINIT_FUNCTION(curl)
  	REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
  	REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
 #endif
-	
+
+#if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH is available since curl 7.10.7 */
+	REGISTER_CURL_CONSTANT(CURLOPT_PROXYAUTH);
+#endif
+
 	/* Constants effecting the way CURLOPT_CLOSEPOLICY works */
 	REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
 	REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_TRAFFIC);
@@ -424,6 +431,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
 			PHPWRITE(data, length);
 			break;
 		case PHP_CURL_FILE:
+			fflush(t->fp);
 			return fwrite(data, size, nmemb, t->fp);
 		case PHP_CURL_RETURN:
 			smart_str_appendl(&t->buf, data, (int) length);
@@ -794,6 +802,7 @@ PHP_FUNCTION(curl_init)
 	curl_easy_setopt(ch->cp, CURLOPT_WRITEHEADER,       (void *) ch);
 	curl_easy_setopt(ch->cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1);
 	curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120);
+	curl_easy_setopt(ch->cp, CURLOPT_MAXREDIRS, 20); /* prevent infinite redirects */
 #if defined(ZTS)
 	curl_easy_setopt(ch->cp, CURLOPT_NOSIGNAL, 1);
 #endif
@@ -912,6 +921,9 @@ PHP_FUNCTION(curl_setopt)
 		case CURLOPT_FTP_USE_EPRT:
 #if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */
 		case CURLOPT_HTTPAUTH:
+#endif
+#if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH is available since curl 7.10.7 */
+		case CURLOPT_PROXYAUTH:
 #endif
 		case CURLOPT_UNRESTRICTED_AUTH:
 		case CURLOPT_PORT:
@@ -1084,7 +1096,7 @@ PHP_FUNCTION(curl_setopt)
 						error = curl_formadd(&first, &last, 
 											 CURLFORM_COPYNAME, string_key,
 											 CURLFORM_NAMELENGTH, string_key_len - 1,
-											 (ZVAL_REFCOUNT(*zvalue) > 1 ? CURLFORM_PTRCONTENTS : CURLFORM_COPYCONTENTS), postval, 
+											 CURLFORM_COPYCONTENTS, postval, 
 											 CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(current),
 											 CURLFORM_END);
 					}
@@ -1326,10 +1338,13 @@ PHP_FUNCTION(curl_getinfo)
 		switch (option) {
 			case CURLINFO_EFFECTIVE_URL: 
 			case CURLINFO_CONTENT_TYPE: {
-				char *s_code;
+ 				char *s_code = NULL;
 
-				curl_easy_getinfo(ch->cp, option, &s_code);
-				RETURN_STRING(s_code, 1);
+ 				if (curl_easy_getinfo(ch->cp, option, &s_code) == CURLE_OK && s_code) {
+ 					RETURN_STRING(s_code, 1);
+ 				} else {
+ 					RETURN_FALSE;
+ 				}
 				break;
 			}
 			case CURLINFO_HTTP_CODE: 
@@ -1338,10 +1353,13 @@ PHP_FUNCTION(curl_getinfo)
 			case CURLINFO_FILETIME: 
 			case CURLINFO_SSL_VERIFYRESULT: 
 			case CURLINFO_REDIRECT_COUNT: {
-				long code;
+				long code = 0;
 
-				curl_easy_getinfo(ch->cp, option, &code);
-				RETURN_LONG(code);
+				if (curl_easy_getinfo(ch->cp, option, &code) == CURLE_OK) {
+					RETURN_LONG(code);
+				} else {
+					RETURN_FALSE;
+				}
 				break;
 			}
 			case CURLINFO_TOTAL_TIME: 
@@ -1356,10 +1374,13 @@ PHP_FUNCTION(curl_getinfo)
 			case CURLINFO_CONTENT_LENGTH_UPLOAD: 
 			case CURLINFO_STARTTRANSFER_TIME:
 			case CURLINFO_REDIRECT_TIME: {
-				double code;
+				double code = 0.0;
 
-				curl_easy_getinfo(ch->cp, option, &code);
-				RETURN_DOUBLE(code);
+				if (curl_easy_getinfo(ch->cp, option, &code) == CURLE_OK) {
+					RETURN_DOUBLE(code);
+				} else {
+					RETURN_FALSE;
+				}
 				break;
 			}
 		}

ext/curl/streams.c

@@ -299,7 +299,7 @@ php_stream *php_curl_stream_opener(php_stream_wrapper *wrapper, char *filename,
 	curl_easy_setopt(curlstream->curl, CURLOPT_PROGRESSDATA, stream);
 	curl_easy_setopt(curlstream->curl, CURLOPT_NOPROGRESS, 0);
 
-	curl_easy_setopt(curlstream->curl, CURLOPT_USERAGENT, "PHP/" PHP_VERSION);
+	curl_easy_setopt(curlstream->curl, CURLOPT_USERAGENT, FG(user_agent) ? FG(user_agent) : "PHP/" PHP_VERSION);
 	
 	/* TODO: read cookies and options from context */
 

ext/dba/config.m4

@@ -11,8 +11,11 @@ AC_DEFUN(PHP_DBA_STD_BEGIN,[
 AC_DEFUN(PHP_TEMP_LDFLAGS,[
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="$1 $LDFLAGS"
-  $2
+  old_LIBS=$LIBS
+  LIBS="$2 $LIBS"
+  $3
   LDFLAGS=$old_LDFLAGS
+  LIBS=$old_LIBS
 ])
 
 dnl Assign INCLUDE/LFLAGS from PREFIX
@@ -169,7 +172,7 @@ dnl parameters(version, library list, function)
 AC_DEFUN(PHP_DBA_DB_CHECK,[
   for LIB in $2; do
     if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
-      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[
+      PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[
         AC_TRY_LINK([
 #include "$THIS_INCLUDE"
         ],[

ext/dba/tests/dba_cdb_make.phpt

@@ -14,7 +14,7 @@ magic_quotes_runtime=1
 	require_once('test.inc');
 	echo "database handler: $handler\n";
 	// print md5 checksum of test.cdb which is generated by cdb_make program
-	var_dump(md5(implode('',file(dirname(__FILE__).'/test.cdb'))));
+	var_dump(md5_file(dirname(__FILE__).'/test.cdb'));
 	if (($db_make=dba_open($db_file, "n", $handler))!==FALSE) {
 		dba_insert("1", "1", $db_make);
 		dba_insert("2", "2", $db_make);
@@ -26,7 +26,7 @@ magic_quotes_runtime=1
 //		dba_replace cdb_make doesn't know replace
 		dba_close($db_make);
 		// write md5 checksum of generated database file
-		var_dump(md5(implode('',file($db_file))));
+		var_dump(md5_file($db_file));
 		// no need to test created database: this is done by dba_cdb_read.phpt
 	} else {
 		echo "Error creating database\n";
@@ -34,5 +34,5 @@ magic_quotes_runtime=1
 ?>
 --EXPECT--
 database handler: cdb_make
-string(32) "723d19f39c1b15b3b455dd64323148d1"
-string(32) "723d19f39c1b15b3b455dd64323148d1"
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"

ext/dio/config.w32

@@ -0,0 +1,9 @@
+// $Id$
+// vim:ft=javascript
+
+ARG_ENABLE("dio", "Enable the direct I/O support", "no");
+
+if (PHP_DIO != "no") {
+	EXTENSION("dio", "dio.c");
+	AC_DEFINE('HAVE_DIO', 1, 'dio support');
+}

ext/dio/dio.c

@@ -27,9 +27,15 @@
 
 #include <sys/stat.h>
 #include <sys/types.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
 #include <fcntl.h>
+#ifndef PHP_WIN32
 #include <termios.h>
+#endif
 
 /* e.g. IRIX does not have CRTSCTS */
 #ifndef CRTSCTS
@@ -45,14 +51,20 @@ static int le_fd;
 
 function_entry dio_functions[] = {
 	PHP_FE(dio_open,      NULL)
+#ifndef PHP_WIN32
 	PHP_FE(dio_truncate,  NULL)
+#endif
 	PHP_FE(dio_stat,      NULL)
 	PHP_FE(dio_seek,      NULL)
+#ifndef PHP_WIN32
 	PHP_FE(dio_fcntl,     NULL)
+#endif
 	PHP_FE(dio_read,      NULL)
 	PHP_FE(dio_write,     NULL)
 	PHP_FE(dio_close,     NULL)
+#ifndef PHP_WIN32
 	PHP_FE(dio_tcsetattr,     NULL)
+#endif
 	{NULL, NULL, NULL}
 };
 
@@ -76,8 +88,10 @@ ZEND_GET_MODULE(dio)
 static void _dio_close_fd(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
 	php_fd_t *f = (php_fd_t *) rsrc->ptr;
-	close(f->fd);
-	free(f);
+	if (f) {
+		close(f->fd);
+		free(f);
+	}
 }
 
 #define RDIOC(c) REGISTER_LONG_CONSTANT(#c, c, CONST_CS | CONST_PERSISTENT)
@@ -94,15 +108,22 @@ PHP_MINIT_FUNCTION(dio)
 	RDIOC(O_EXCL);
 	RDIOC(O_TRUNC);
 	RDIOC(O_APPEND);
+#ifdef O_NONBLOCK
 	RDIOC(O_NONBLOCK);
+#endif
+#ifdef O_NDELAY
 	RDIOC(O_NDELAY);
+#endif
 #ifdef O_SYNC
 	RDIOC(O_SYNC);
 #endif
 #ifdef O_ASYNC
 	RDIOC(O_ASYNC);
 #endif
+#ifdef O_NOCTTY
 	RDIOC(O_NOCTTY);
+#endif
+#ifndef PHP_WIN32
 	RDIOC(S_IRWXU);
 	RDIOC(S_IRUSR);
 	RDIOC(S_IWUSR);
@@ -127,6 +148,7 @@ PHP_MINIT_FUNCTION(dio)
 	RDIOC(F_UNLCK);
 	RDIOC(F_RDLCK);
 	RDIOC(F_WRLCK);
+#endif
 	
 	return SUCCESS;
 }
@@ -138,10 +160,13 @@ PHP_MINFO_FUNCTION(dio)
 	php_info_print_table_end();
 }
 
-static void new_php_fd(php_fd_t **f, int fd)
+static int new_php_fd(php_fd_t **f, int fd)
 {
-	*f = malloc(sizeof(php_fd_t));
+	if (!(*f = malloc(sizeof(php_fd_t)))) {
+		return 0;
+	}
 	(*f)->fd = fd;
+	return 1;
 }
 
 /* {{{ proto resource dio_open(string filename, int flags[, int mode])
@@ -174,7 +199,10 @@ PHP_FUNCTION(dio_open)
 		RETURN_FALSE;
 	}
 
-	new_php_fd(&f, fd);
+	
+	if (!new_php_fd(&f, fd)) {
+		RETURN_FALSE;
+	}
 	ZEND_REGISTER_RESOURCE(return_value, f, le_fd);
 }
 /* }}} */
@@ -195,6 +223,11 @@ PHP_FUNCTION(dio_read)
 
 	ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
 
+	if (bytes <= 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0.");
+		RETURN_FALSE;
+	}
+
 	data = emalloc(bytes + 1);
 	res = read(f->fd, data, bytes);
 	if (res <= 0) {
@@ -224,6 +257,11 @@ PHP_FUNCTION(dio_write)
 		return;
 	}
 
+	if (trunc_len < 0 || trunc_len > data_len) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "length must be greater or equal to zero and less then the length of the specified string.");
+		RETURN_FALSE;
+	}
+
 	ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
 
 	res = write(f->fd, data, trunc_len ? trunc_len : data_len);
@@ -235,6 +273,7 @@ PHP_FUNCTION(dio_write)
 }
 /* }}} */
 
+#ifndef PHP_WIN32
 /* {{{ proto bool dio_truncate(resource fd, int offset)
    Truncate file descriptor fd to offset bytes */
 PHP_FUNCTION(dio_truncate)
@@ -257,6 +296,7 @@ PHP_FUNCTION(dio_truncate)
 	RETURN_TRUE;
 }
 /* }}} */
+#endif
 
 #define ADD_FIELD(f, v) add_assoc_long_ex(return_value, (f), sizeof(f), v);
 
@@ -288,8 +328,10 @@ PHP_FUNCTION(dio_stat)
 	ADD_FIELD("gid", s.st_gid);
 	ADD_FIELD("device_type", s.st_rdev);
 	ADD_FIELD("size", s.st_size);
+#ifndef PHP_WIN32
 	ADD_FIELD("block_size", s.st_blksize);
 	ADD_FIELD("blocks", s.st_blocks);
+#endif
 	ADD_FIELD("atime", s.st_atime);
 	ADD_FIELD("mtime", s.st_mtime);
 	ADD_FIELD("ctime", s.st_ctime);
@@ -315,6 +357,7 @@ PHP_FUNCTION(dio_seek)
 }
 /* }}} */
 
+#ifndef PHP_WIN32
 /* {{{ proto mixed dio_fcntl(resource fd, int cmd[, mixed arg])
    Perform a c library fcntl on fd */
 PHP_FUNCTION(dio_fcntl)
@@ -401,7 +444,9 @@ PHP_FUNCTION(dio_fcntl)
 				RETURN_FALSE;
 			}
 
-			new_php_fd(&new_f, fcntl(f->fd, cmd, Z_LVAL_P(arg)));
+			if (!new_php_fd(&new_f, fcntl(f->fd, cmd, Z_LVAL_P(arg)))) {
+				RETURN_FALSE;
+			}
 			ZEND_REGISTER_RESOURCE(return_value, new_f, le_fd);
 			break;
 		}
@@ -415,7 +460,9 @@ PHP_FUNCTION(dio_fcntl)
 	}
 }
 /* }}} */
+#endif
 
+#ifndef PHP_WIN32
 /* {{{ proto mixed dio_tcsetattr(resource fd,  array args )
    Perform a c library tcsetattr on fd */
 PHP_FUNCTION(dio_tcsetattr)
@@ -576,6 +623,7 @@ PHP_FUNCTION(dio_tcsetattr)
 	RETURN_TRUE;
 }
 /* }}} */
+#endif
 
 /* {{{ proto void dio_close(resource fd)
    Close the file descriptor given by fd */

ext/dom/EXPERIMENTAL

@@ -1,5 +0,0 @@
-this module is experimental,
-its functions may change their names 
-or move to extension all together 
-so do not rely to much on them 
-you have been warned!

ext/dom/attr.c

@@ -31,7 +31,7 @@
 
 
 /*
-* class domattr extends domnode 
+* class DOMAttr extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-637646024
 * Since: 
@@ -43,7 +43,7 @@ zend_function_entry php_dom_attr_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomAttr::__construct(string name, [string value]); */
+/* {{{ proto void DOMAttr::__construct(string name, [string value]); */
 PHP_METHOD(domattr, __construct)
 {
 
@@ -85,10 +85,10 @@ PHP_METHOD(domattr, __construct)
 	}
 }
 
-/* }}} end DomAttr::__construct */
+/* }}} end DOMAttr::__construct */
 
 
-/* {{{ proto name	string	
+/* {{{ name	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1112119403
 Since: 
@@ -114,7 +114,7 @@ int dom_attr_name_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto specified	boolean	
+/* {{{ specified	boolean	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-862529273
 Since: 
@@ -131,7 +131,7 @@ int dom_attr_specified_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto value	string	
+/* {{{ value	string	
 readonly=no 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-221662474
 Since: 
@@ -200,7 +200,7 @@ int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 
 
-/* {{{ proto ownerElement	element	
+/* {{{ ownerElement	DOMElement	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement
 Since: DOM Level 2
@@ -236,7 +236,7 @@ int dom_attr_owner_element_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto schemaTypeInfo	typeinfo	
+/* {{{ schemaTypeInfo	DOMTypeInfo	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo
 Since: DOM Level 3

ext/dom/cdatasection.c

@@ -29,7 +29,7 @@
 
 
 /*
-* class domcdatasection extends domtext 
+* class DOMCdataSection extends DOMText 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-667469212
 * Since: 
@@ -40,7 +40,7 @@ zend_function_entry php_dom_cdatasection_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomCDataSection::__construct(string value); */
+/* {{{ proto void DOMCdataSection::__construct(string value); */
 PHP_METHOD(domcdatasection, __construct)
 {
 
@@ -73,6 +73,6 @@ PHP_METHOD(domcdatasection, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end DomCDataSection::__construct */
+/* }}} end DOMCdataSection::__construct */
 
 #endif

ext/dom/characterdata.c

@@ -29,7 +29,7 @@
 
 
 /*
-* class domcharacterdata extends domnode 
+* class DOMCharacterData extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-FF21A306
 * Since: 
@@ -44,7 +44,7 @@ zend_function_entry php_dom_characterdata_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto data	string	
+/* {{{ data	string	
 readonly=no 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-72AB8359
 Since: 
@@ -105,7 +105,7 @@ int dom_characterdata_data_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 /* }}} */
 
-/* {{{ proto length	unsigned long	
+/* {{{ length	long	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7D61178C
 Since: 
@@ -140,7 +140,7 @@ int dom_characterdata_length_read(dom_object *obj, zval **retval TSRMLS_DC)
 /* }}} */
 
 
-/* {{{ proto domstring dom_characterdata_substring_data(unsigned long offset, unsigned long count);
+/* {{{ proto string dom_characterdata_substring_data(int offset, int count);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF
 Since: 
 */
@@ -190,7 +190,7 @@ PHP_FUNCTION(dom_characterdata_substring_data)
 /* }}} end dom_characterdata_substring_data */
 
 
-/* {{{ proto dom_void dom_characterdata_append_data(string arg);
+/* {{{ proto void dom_characterdata_append_data(string arg);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F
 Since: 
 */
@@ -215,7 +215,7 @@ PHP_FUNCTION(dom_characterdata_append_data)
 /* }}} end dom_characterdata_append_data */
 
 
-/* {{{ proto dom_void dom_characterdata_insert_data(unsigned long offset, string arg);
+/* {{{ proto void dom_characterdata_insert_data(int offset, string arg);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F
 Since: 
 */
@@ -264,7 +264,7 @@ PHP_FUNCTION(dom_characterdata_insert_data)
 /* }}} end dom_characterdata_insert_data */
 
 
-/* {{{ proto dom_void dom_characterdata_delete_data(unsigned long offset, unsigned long count);
+/* {{{ proto void dom_characterdata_delete_data(int offset, int count);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781
 Since: 
 */
@@ -320,7 +320,7 @@ PHP_FUNCTION(dom_characterdata_delete_data)
 /* }}} end dom_characterdata_delete_data */
 
 
-/* {{{ proto dom_void dom_characterdata_replace_data(unsigned long offset, unsigned long count, string arg);
+/* {{{ proto void dom_characterdata_replace_data(int offset, int count, string arg);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB
 Since: 
 */

ext/dom/comment.c

@@ -29,7 +29,7 @@
 
 
 /*
-* class domcomment extends domcharacterdata 
+* class DOMComment extends DOMCharacterData 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1728279322
 * Since: 
@@ -40,7 +40,7 @@ zend_function_entry php_dom_comment_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomComment::__construct([string value]); */
+/* {{{ proto void DOMComment::__construct([string value]); */
 PHP_METHOD(domcomment, __construct)
 {
 
@@ -73,5 +73,5 @@ PHP_METHOD(domcomment, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)nodep, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end DomComment::__construct */
+/* }}} end DOMComment::__construct */
 #endif

ext/dom/document.c

@@ -42,7 +42,7 @@ struct _idsIterator {
 #define DOM_LOAD_FILE 1
 
 /*
-* class domdocument extends domnode 
+* class DOMDocument extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-i-Document
 * Since: 
@@ -88,7 +88,7 @@ zend_function_entry php_dom_document_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto doctype	documenttype	
+/* {{{ docType	DOMDocumentType	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-B63ED1A31
 Since: 
@@ -124,7 +124,7 @@ int dom_document_doctype_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto implementation	domimplementation	
+/* {{{ implementation	DOMImplementation	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1B793EBA
 Since: 
@@ -140,7 +140,7 @@ int dom_document_implementation_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto domelement document_element	documentElement	
+/* {{{ documentElement	DOMElement	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-87CD092
 Since: 
@@ -174,7 +174,7 @@ int dom_document_document_element_read(dom_object *obj, zval **retval TSRMLS_DC)
 /* }}} */
 
 
-/* {{{ proto actual_encoding	string	
+/* {{{ actualEncoding	string	
 readonly=no 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-actualEncoding
 Since: DOM Level 3
@@ -195,7 +195,7 @@ int dom_document_actual_encoding_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 /* }}} */
 
-/* {{{ proto encoding	string
+/* {{{ encoding	string
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-encoding
 Since: DOM Level 3
 */
@@ -268,7 +268,7 @@ int dom_document_encoding_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 
 
-/* {{{ proto standalone	boolean	
+/* {{{ standalone	boolean	
 readonly=no 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-standalone
 Since: DOM Level 3
@@ -334,7 +334,7 @@ int dom_document_standalone_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 
 
-/* {{{ proto version	string	
+/* {{{ version	string	
 readonly=no
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-version
 Since: DOM Level 3
@@ -399,7 +399,7 @@ int dom_document_version_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 /* }}} */
 
-/* {{{ proto strict_error_checking	boolean	
+/* {{{ strictErrorChecking	boolean	
 readonly=no 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-strictErrorChecking
 Since: DOM Level 3
@@ -444,7 +444,7 @@ int dom_document_strict_error_checking_write(dom_object *obj, zval *newval TSRML
 
 /* }}} */
 
-/* {{{ proto formatOutput	boolean	
+/* {{{ formatOutput	boolean	
 readonly=no
 */
 int dom_document_format_output_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -486,7 +486,7 @@ int dom_document_format_output_write(dom_object *obj, zval *newval TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ proto validateonParse	boolean	
+/* {{{ validateOnParse	boolean	
 readonly=no
 */
 int	dom_document_validate_on_parse_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -529,7 +529,7 @@ int dom_document_validate_on_parse_write(dom_object *obj, zval *newval TSRMLS_DC
 /* }}} */
 
 
-/* {{{ proto resolveExternals	boolean	
+/* {{{ resolveExternals	boolean	
 readonly=no
 */
 int dom_document_resolve_externals_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -572,7 +572,7 @@ int dom_document_resolve_externals_write(dom_object *obj, zval *newval TSRMLS_DC
 /* }}} */
 
 
-/* {{{ proto preserveWhiteSpace	boolean	
+/* {{{ preserveWhiteSpace	boolean	
 readonly=no
 */
 int dom_document_preserve_whitespace_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -615,7 +615,7 @@ int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval TSRMLS_
 /* }}} */
 
 
-/* {{{ proto substituteEntities	boolean	
+/* {{{ substituteEntities	boolean	
 readonly=no
 */
 int dom_document_substitue_entities_read(dom_object *obj, zval **retval TSRMLS_DC)
@@ -658,7 +658,7 @@ int dom_document_substitue_entities_write(dom_object *obj, zval *newval TSRMLS_D
 /* }}} */
 
 
-/* {{{ proto document_uri	string	
+/* {{{ documentURI	string	
 readonly=no 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-documentURI
 Since: DOM Level 3
@@ -724,7 +724,7 @@ int dom_document_document_uri_write(dom_object *obj, zval *newval TSRMLS_DC)
 
 
 
-/* {{{ proto config	domconfiguration	
+/* {{{ config	DOMConfiguration	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-config
 Since: DOM Level 3
@@ -740,7 +740,7 @@ int dom_document_config_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto domelement dom_document_create_element(string tagName [, string value]);
+/* {{{ proto DOMElement dom_document_create_element(string tagName [, string value]);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547
 Since: 
 */
@@ -774,7 +774,7 @@ PHP_FUNCTION(dom_document_create_element)
 /* }}} end dom_document_create_element */
 
 
-/* {{{ proto domdocumentfragment dom_document_create_document_fragment();
+/* {{{ proto DOMDocumentFragment dom_document_create_document_fragment();
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5
 Since: 
 */
@@ -802,7 +802,7 @@ PHP_FUNCTION(dom_document_create_document_fragment)
 /* }}} end dom_document_create_document_fragment */
 
 
-/* {{{ proto domtext dom_document_create_text_node(string data);
+/* {{{ proto DOMText dom_document_create_text_node(string data);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127
 Since: 
 */
@@ -831,7 +831,7 @@ PHP_FUNCTION(dom_document_create_text_node)
 /* }}} end dom_document_create_text_node */
 
 
-/* {{{ proto domcomment dom_document_create_comment(string data);
+/* {{{ proto DOMComment dom_document_create_comment(string data);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328
 Since: 
 */
@@ -860,7 +860,7 @@ PHP_FUNCTION(dom_document_create_comment)
 /* }}} end dom_document_create_comment */
 
 
-/* {{{ proto domcdatasection dom_document_create_cdatasection(string data);
+/* {{{ proto DOMCdataSection dom_document_create_cdatasection(string data);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8
 Since: 
 */
@@ -889,7 +889,7 @@ PHP_FUNCTION(dom_document_create_cdatasection)
 /* }}} end dom_document_create_cdatasection */
 
 
-/* {{{ proto domprocessinginstruction dom_document_create_processing_instruction(string target, string data);
+/* {{{ proto DOMProcessingInstruction dom_document_create_processing_instruction(string target, string data);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439
 Since: 
 */
@@ -925,7 +925,7 @@ PHP_FUNCTION(dom_document_create_processing_instruction)
 /* }}} end dom_document_create_processing_instruction */
 
 
-/* {{{ proto domattr dom_document_create_attribute(string name);
+/* {{{ proto DOMAttr dom_document_create_attribute(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198
 Since: 
 */
@@ -960,7 +960,7 @@ PHP_FUNCTION(dom_document_create_attribute)
 /* }}} end dom_document_create_attribute */
 
 
-/* {{{ proto domentityreference dom_document_create_entity_reference(string name);
+/* {{{ proto DOMEntityReference dom_document_create_entity_reference(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE
 Since: 
 */
@@ -994,7 +994,7 @@ PHP_FUNCTION(dom_document_create_entity_reference)
 /* }}} end dom_document_create_entity_reference */
 
 
-/* {{{ proto domnodelist dom_document_get_elements_by_tag_name(string tagname);
+/* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name(string tagname);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094
 Since: 
 */
@@ -1016,12 +1016,12 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name)
 	php_dom_create_interator(return_value, DOM_NODELIST TSRMLS_CC);
 	namednode = (dom_object *)zend_objects_get_address(return_value TSRMLS_CC);
 	local = xmlCharStrndup(name, name_len);
-	dom_namednode_iter(intern, 0, namednode, NULL, local, NULL);
+	dom_namednode_iter(intern, 0, namednode, NULL, local, NULL TSRMLS_CC);
 }
 /* }}} end dom_document_get_elements_by_tag_name */
 
 
-/* {{{ proto domnode dom_document_import_node(node importedNode, boolean deep);
+/* {{{ proto DOMNode dom_document_import_node(DOMNode importedNode, boolean deep);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode
 Since: DOM Level 2
 */
@@ -1063,7 +1063,7 @@ PHP_FUNCTION(dom_document_import_node)
 /* }}} end dom_document_import_node */
 
 
-/* {{{ proto domelement dom_document_create_element_ns(string namespaceURI, string qualifiedName);
+/* {{{ proto DOMElement dom_document_create_element_ns(string namespaceURI, string qualifiedName [,string value]);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS
 Since: DOM Level 2
 */
@@ -1073,13 +1073,13 @@ PHP_FUNCTION(dom_document_create_element_ns)
 	xmlDocPtr docp;
 	xmlNodePtr nodep = NULL;
 	xmlNsPtr nsptr = NULL;
-	int ret, uri_len = 0, name_len = 0;
-	char *uri, *name;
+	int ret, uri_len = 0, name_len = 0, value_len = 0;
+	char *uri, *name, *value = NULL;
 	char *localname = NULL, *prefix = NULL;
 	int errorcode;
 	dom_object *intern;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s|s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) {
 		return;
 	}
 
@@ -1089,7 +1089,7 @@ PHP_FUNCTION(dom_document_create_element_ns)
 
 	if (errorcode == 0) {
 		if (xmlValidateName((xmlChar *) localname, 0) == 0) {
-			nodep = xmlNewDocNode (docp, NULL, localname, NULL);
+			nodep = xmlNewDocNode (docp, NULL, localname, value);
 			if (nodep != NULL && uri != NULL) {
 				nsptr = xmlSearchNsByHref (nodep->doc, nodep, uri);
 				if (nsptr == NULL) {
@@ -1127,7 +1127,7 @@ PHP_FUNCTION(dom_document_create_element_ns)
 /* }}} end dom_document_create_element_ns */
 
 
-/* {{{ proto domattr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName);
+/* {{{ proto DOMAttr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS
 Since: DOM Level 2
 */
@@ -1193,7 +1193,7 @@ PHP_FUNCTION(dom_document_create_attribute_ns)
 /* }}} end dom_document_create_attribute_ns */
 
 
-/* {{{ proto domnodelist dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName);
+/* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS
 Since: DOM Level 2
 */
@@ -1216,12 +1216,12 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns)
 	namednode = (dom_object *)zend_objects_get_address(return_value TSRMLS_CC);
 	local = xmlCharStrndup(name, name_len);
 	nsuri = xmlCharStrndup(uri, uri_len);
-	dom_namednode_iter(intern, 0, namednode, NULL, local, nsuri);
+	dom_namednode_iter(intern, 0, namednode, NULL, local, nsuri TSRMLS_CC);
 }
 /* }}} end dom_document_get_elements_by_tag_name_ns */
 
 
-/* {{{ proto domelement dom_document_get_element_by_id(string elementId);
+/* {{{ proto DOMElement dom_document_get_element_by_id(string elementId);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId
 Since: DOM Level 2
 */
@@ -1252,7 +1252,7 @@ PHP_FUNCTION(dom_document_get_element_by_id)
 /* }}} end dom_document_get_element_by_id */
 
 
-/* {{{ proto domnode dom_document_adopt_node(node source);
+/* {{{ proto DOMNode dom_document_adopt_node(DOMNode source);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode
 Since: DOM Level 3
 */
@@ -1263,7 +1263,7 @@ PHP_FUNCTION(dom_document_adopt_node)
 /* }}} end dom_document_adopt_node */
 
 
-/* {{{ proto dom_void dom_document_normalize_document();
+/* {{{ proto void dom_document_normalize_document();
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument
 Since: DOM Level 3
 */
@@ -1284,7 +1284,7 @@ PHP_FUNCTION(dom_document_normalize_document)
 /* }}} end dom_document_normalize_document */
 
 
-/* {{{ proto domnode dom_document_rename_node(node n, string namespaceURI, string qualifiedName);
+/* {{{ proto DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-renameNode
 Since: DOM Level 3
 */
@@ -1294,7 +1294,7 @@ PHP_FUNCTION(dom_document_rename_node)
 }
 /* }}} end dom_document_rename_node */
 
-/* {{{ proto void DomDocument::__construct([string version], [string encoding]); */
+/* {{{ proto void DOMDocument::__construct([string version], [string encoding]); */
 PHP_METHOD(domdocument, __construct)
 {
 
@@ -1337,7 +1337,7 @@ PHP_METHOD(domdocument, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, (xmlNodePtr)docp, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end dom_document_document */
+/* }}} end DOMDocument::__construct */
 
 char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len  TSRMLS_DC) {
 	xmlURI *uri;
@@ -1544,7 +1544,7 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) {
 }
 /* }}} end dom_parser_document */
 
-/* {{{ proto boolean domnode dom_document_load(string source);
+/* {{{ proto DOMNode dom_document_load(string source);
 URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load
 Since: DOM Level 3
 */
@@ -1554,7 +1554,7 @@ PHP_METHOD(domdocument, load)
 }
 /* }}} end dom_document_load */
 
-/* {{{ proto boolean domnode dom_document_loadxml(string source);
+/* {{{ proto DOMNode dom_document_loadxml(string source);
 URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML
 Since: DOM Level 3
 */
@@ -1564,7 +1564,7 @@ PHP_METHOD(domdocument, loadXML)
 }
 /* }}} end dom_document_loadxml */
 
-/* {{{ proto long domnode dom_document_save(string file);
+/* {{{ proto int dom_document_save(string file);
 Convenience method to save to file
 */
 PHP_FUNCTION(dom_document_save)
@@ -1600,7 +1600,7 @@ PHP_FUNCTION(dom_document_save)
 }
 /* }}} end dom_document_save */
 
-/* {{{ proto string domnode dom_document_savexml([node n]);
+/* {{{ proto string dom_document_savexml([node n]);
 URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML
 Since: DOM Level 3
 */
@@ -1729,7 +1729,7 @@ PHP_FUNCTION(dom_document_xinclude)
 }
 
 
-/* {{{ proto string domnode dom_document_validate();
+/* {{{ proto boolean dom_document_validate();
 Since: DOM extended
 */
 PHP_FUNCTION(dom_document_validate)
@@ -1842,19 +1842,19 @@ _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
 	}
 }
 
-/* {{{ proto boolean domnode _dom_document_schema_validate(string filename); */
+/* {{{ proto boolean dom_document_schema_validate_file(string filename); */
 PHP_FUNCTION(dom_document_schema_validate_file)
 {
 	_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
-/* }}} end _dom_document_schema_validate */
+/* }}} end dom_document_schema_validate_file */
 
-/* {{{ proto boolean domnode _dom_document_schema_validate(string source); */
+/* {{{ proto boolean dom_document_schema_validate(string source); */
 PHP_FUNCTION(dom_document_schema_validate_xml)
 {
 	_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
 }
-/* }}} end _dom_document_schema_validate */
+/* }}} end dom_document_schema_validate */
 
 
 static void
@@ -1932,14 +1932,14 @@ _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type)
 	}
 }
 
-/* {{{ proto boolean domnode dom_document_relaxNG_validate_file(string filename); */
+/* {{{ proto boolean dom_document_relaxNG_validate_file(string filename); */
 PHP_FUNCTION(dom_document_relaxNG_validate_file)
 {
 	_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
 /* }}} end dom_document_relaxNG_validate_file */
 
-/* {{{ proto boolean domnode dom_document_relaxNG_validate_xml(string source); */
+/* {{{ proto boolean dom_document_relaxNG_validate_xml(string source); */
 PHP_FUNCTION(dom_document_relaxNG_validate_xml)
 {
 	_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
@@ -2022,7 +2022,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode)
 	}
 }
 
-/* {{{ proto boolean domnode dom_document_load_html_file(string source);
+/* {{{ proto DOMNode dom_document_load_html_file(string source);
 Since: DOM extended
 */
 PHP_METHOD(domdocument, loadHTMLFile)
@@ -2031,7 +2031,7 @@ PHP_METHOD(domdocument, loadHTMLFile)
 }
 /* }}} end dom_document_load_html_file */
 
-/* {{{ proto boolean domnode dom_document_load_html(string source);
+/* {{{ proto DOMNode dom_document_load_html(string source);
 Since: DOM extended
 */
 PHP_METHOD(domdocument, loadHTML)
@@ -2040,7 +2040,7 @@ PHP_METHOD(domdocument, loadHTML)
 }
 /* }}} end dom_document_load_html */
 
-/* {{{ proto long dom_document_save_html_file(string file);
+/* {{{ proto int dom_document_save_html_file(string file);
 Convenience method to save to file as html
 */
 PHP_FUNCTION(dom_document_save_html_file)

ext/dom/documentfragment.c

@@ -29,7 +29,7 @@
 
 
 /*
-* class domdocumentfragment extends domnode 
+* class DOMDocumentFragment extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-B63ED1A3
 * Since: 
@@ -40,7 +40,7 @@ zend_function_entry php_dom_documentfragment_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomDocumentFragment::__construct(); */
+/* {{{ proto void DOMDocumentFragment::__construct(); */
 PHP_METHOD(domdocumentfragment, __construct)
 {
 
@@ -72,5 +72,5 @@ PHP_METHOD(domdocumentfragment, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end DomDocumentFragment::__construct */
+/* }}} end DOMDocumentFragment::__construct */
 #endif

ext/dom/documenttype.c

@@ -28,7 +28,7 @@
 #include "php_dom.h"
 
 /*
-* class domdocumenttype extends domnode 
+* class DOMDocumentType extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-412266927
 * Since: 
@@ -38,9 +38,7 @@ zend_function_entry php_dom_documenttype_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
-
-/* {{{ proto name	string	
+/* {{{ name	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1844763134
 Since: 
@@ -66,7 +64,7 @@ int dom_documenttype_name_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto entities	namednodemap	
+/* {{{ entities	DOMNamedNodeMap	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1788794630
 Since: 
@@ -90,7 +88,7 @@ int dom_documenttype_entities_read(dom_object *obj, zval **retval TSRMLS_DC)
 	entityht = (xmlHashTable *) doctypep->entities;
 
 	intern = (dom_object *)zend_objects_get_address(*retval TSRMLS_CC);
-	dom_namednode_iter(obj, XML_ENTITY_NODE, intern, entityht, NULL, NULL);
+	dom_namednode_iter(obj, XML_ENTITY_NODE, intern, entityht, NULL, NULL TSRMLS_CC);
 
 	return SUCCESS;
 }
@@ -99,7 +97,7 @@ int dom_documenttype_entities_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto notations	namednodemap	
+/* {{{ notations	DOMNamedNodeMap	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D46829EF
 Since: 
@@ -123,7 +121,7 @@ int dom_documenttype_notations_read(dom_object *obj, zval **retval TSRMLS_DC)
 	notationht = (xmlHashTable *) doctypep->notations;
 
 	intern = (dom_object *)zend_objects_get_address(*retval TSRMLS_CC);
-	dom_namednode_iter(obj, XML_NOTATION_NODE, intern, notationht, NULL, NULL);
+	dom_namednode_iter(obj, XML_NOTATION_NODE, intern, notationht, NULL, NULL TSRMLS_CC);
 
 	return SUCCESS;
 }
@@ -132,7 +130,7 @@ int dom_documenttype_notations_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto public_id	string	
+/* {{{ publicId	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-publicId
 Since: DOM Level 2
@@ -162,7 +160,7 @@ int dom_documenttype_public_id_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto system_id	string	
+/* {{{ systemId	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-systemId
 Since: DOM Level 2
@@ -191,7 +189,7 @@ int dom_documenttype_system_id_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto internal_subset	string	
+/* {{{ internalSubset	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-internalSubset
 Since: DOM Level 2

ext/dom/domerror.c

@@ -41,7 +41,7 @@ zend_function_entry php_dom_domerror_class_functions[] = {
 
 /* {{{ attribute protos, not implemented yet */
 
-/* {{{ proto severity	unsigned short	
+/* {{{ severity	unsigned short	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-severity
 Since: 
@@ -57,7 +57,7 @@ int dom_domerror_severity_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto message	string	
+/* {{{ message	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-message
 Since: 
@@ -73,7 +73,7 @@ int dom_domerror_message_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto type	string	
+/* {{{ type	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-type
 Since: 
@@ -89,7 +89,7 @@ int dom_domerror_type_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto relatedException	object	
+/* {{{ relatedException	object	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedException
 Since: 
@@ -105,7 +105,7 @@ int dom_domerror_related_exception_read(dom_object *obj, zval **retval TSRMLS_DC
 
 
 
-/* {{{ proto relatedData	domobject	
+/* {{{ relatedData	domobject	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedData
 Since: 
@@ -121,7 +121,7 @@ int dom_domerror_related_data_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto location	domlocator	
+/* {{{ location	domlocator	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-location
 Since: 

ext/dom/domexception.c

@@ -29,7 +29,7 @@
 
 
 /*
-* class domexception 
+* class DOMException 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-17189187
 * Since: 

ext/dom/domimplementation.c

@@ -28,7 +28,7 @@
 #include "php_dom.h"
 
 /*
-* class domimplementation 
+* class DOMImplementation 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-102161490
 * Since: 
@@ -42,9 +42,6 @@ zend_function_entry php_dom_domimplementation_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ attribute protos, not implemented yet */
-
-
 /* {{{ proto boolean dom_domimplementation_has_feature(string feature, string version);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5CED94D7
 Since: 
@@ -67,7 +64,7 @@ PHP_METHOD(domimplementation, hasFeature)
 /* }}} end dom_domimplementation_has_feature */
 
 
-/* {{{ proto domdocumenttype dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId);
+/* {{{ proto DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType
 Since: DOM Level 2
 */
@@ -121,7 +118,7 @@ PHP_METHOD(domimplementation, createDocumentType)
 /* }}} end dom_domimplementation_create_document_type */
 
 
-/* {{{ proto domdocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, documenttype doctype);
+/* {{{ proto DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument
 Since: DOM Level 2
 */
@@ -224,7 +221,7 @@ PHP_METHOD(domimplementation, createDocument)
 /* }}} end dom_domimplementation_create_document */
 
 
-/* {{{ proto domnode dom_domimplementation_get_feature(string feature, string version);
+/* {{{ proto DOMNode dom_domimplementation_get_feature(string feature, string version);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature
 Since: DOM Level 3
 */

ext/dom/domimplementationlist.c

@@ -42,7 +42,7 @@ zend_function_entry php_dom_domimplementationlist_class_functions[] = {
 
 /* {{{ attribute protos, not implemented yet */
 
-/* {{{ proto length	unsigned long	
+/* {{{ length	unsigned long	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationList-length
 Since: 
@@ -59,7 +59,7 @@ int dom_domimplementationlist_length_read(dom_object *obj, zval **retval TSRMLS_
 
 
 
-/* {{{ proto domdomimplementation dom_domimplementationlist_item(unsigned long index);
+/* {{{ proto domdomimplementation dom_domimplementationlist_item(int index);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationList-item
 Since: 
 */

ext/dom/domlocator.c

@@ -41,7 +41,7 @@ zend_function_entry php_dom_domlocator_class_functions[] = {
 
 /* {{{ attribute protos, not implemented yet */
 
-/* {{{ proto line_number	long	
+/* {{{ line_number	long	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-line-number
 Since: 
@@ -57,7 +57,7 @@ int dom_domlocator_line_number_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto column_number	long	
+/* {{{ column_number	long	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-column-number
 Since: 
@@ -73,7 +73,7 @@ int dom_domlocator_column_number_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto offset	long	
+/* {{{ offset	long	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-offset
 Since: 
@@ -89,7 +89,7 @@ int dom_domlocator_offset_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto related_node	node	
+/* {{{ related_node	node	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-node
 Since: 
@@ -105,7 +105,7 @@ int dom_domlocator_related_node_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto uri	string	
+/* {{{ uri	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-uri
 Since: 

ext/dom/domstringlist.c

@@ -42,7 +42,7 @@ zend_function_entry php_dom_domstringlist_class_functions[] = {
 
 /* {{{ attribute protos, not implemented yet */
 
-/* {{{ proto length	unsigned long	
+/* {{{ length	unsigned long	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-length
 Since: 
@@ -59,7 +59,7 @@ int dom_domstringlist_length_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto domstring dom_domstringlist_item(unsigned long index);
+/* {{{ proto domstring dom_domstringlist_item(int index);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-item
 Since: 
 */

ext/dom/element.c

@@ -29,7 +29,7 @@
 
 
 /*
-* class domelement extends domnode 
+* class DOMElement extends DOMNode 
 *
 * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-745549614
 * Since: 
@@ -58,7 +58,7 @@ zend_function_entry php_dom_element_class_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-/* {{{ proto void DomElement::__construct(string name, [string value], [string uri]); */
+/* {{{ proto void DOMElement::__construct(string name, [string value], [string uri]); */
 PHP_METHOD(domelement, __construct)
 {
 
@@ -135,9 +135,9 @@ PHP_METHOD(domelement, __construct)
 		php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
 	}
 }
-/* }}} end DomElement::__construct */
+/* }}} end DOMElement::__construct */
 
-/* {{{ proto tagName	string	
+/* {{{ tagName	string	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-104682815
 Since: 
@@ -174,7 +174,7 @@ int dom_element_tag_name_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto schemaTypeInfo	typeinfo	
+/* {{{ schemaTypeInfo	typeinfo	
 readonly=yes 
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Element-schemaTypeInfo
 Since: DOM Level 3
@@ -190,7 +190,7 @@ int dom_element_schema_type_info_read(dom_object *obj, zval **retval TSRMLS_DC)
 
 
 
-/* {{{ proto domstring dom_element_get_attribute(string name);
+/* {{{ proto string dom_element_get_attribute(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9
 Since:
 */
@@ -219,7 +219,7 @@ PHP_FUNCTION(dom_element_get_attribute)
 /* }}} end dom_element_get_attribute */
 
 
-/* {{{ proto dom_void dom_element_set_attribute(string name, string value);
+/* {{{ proto void dom_element_set_attribute(string name, string value);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082
 Since: 
 */
@@ -265,7 +265,7 @@ PHP_FUNCTION(dom_element_set_attribute)
 /* }}} end dom_element_set_attribute */
 
 
-/* {{{ proto dom_void dom_element_remove_attribute(string name);
+/* {{{ proto void dom_element_remove_attribute(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9
 Since:
 */
@@ -308,7 +308,7 @@ PHP_FUNCTION(dom_element_remove_attribute)
 /* }}} end dom_element_remove_attribute */
 
 
-/* {{{ proto domattr dom_element_get_attribute_node(string name);
+/* {{{ proto DOMAttr dom_element_get_attribute_node(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8
 Since: 
 */
@@ -337,7 +337,7 @@ PHP_FUNCTION(dom_element_get_attribute_node)
 /* }}} end dom_element_get_attribute_node */
 
 
-/* {{{ proto domattr dom_element_set_attribute_node(attr newAttr);
+/* {{{ proto DOMAttr dom_element_set_attribute_node(DOMAttr newAttr);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154
 Since: 
 */
@@ -395,7 +395,7 @@ PHP_FUNCTION(dom_element_set_attribute_node)
 /* }}} end dom_element_set_attribute_node */
 
 
-/* {{{ proto domattr dom_element_remove_attribute_node(attr oldAttr);
+/* {{{ proto DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198
 Since: 
 */
@@ -433,7 +433,7 @@ PHP_FUNCTION(dom_element_remove_attribute_node)
 /* }}} end dom_element_remove_attribute_node */
 
 
-/* {{{ proto domnodelist dom_element_get_elements_by_tag_name(string name);
+/* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name(string name);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D
 Since: 
 */
@@ -455,12 +455,12 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name)
 	php_dom_create_interator(return_value, DOM_NODELIST TSRMLS_CC);
 	namednode = (dom_object *)zend_objects_get_address(return_value TSRMLS_CC);
 	local = xmlCharStrndup(name, name_len);
-	dom_namednode_iter(intern, 0, namednode, NULL, local, NULL);
+	dom_namednode_iter(intern, 0, namednode, NULL, local, NULL TSRMLS_CC);
 }
 /* }}} end dom_element_get_elements_by_tag_name */
 
 
-/* {{{ proto domstring dom_element_get_attribute_ns(string namespaceURI, string localName);
+/* {{{ proto string dom_element_get_attribute_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS
 Since: DOM Level 2
 */
@@ -501,7 +501,7 @@ PHP_FUNCTION(dom_element_get_attribute_ns)
 /* }}} end dom_element_get_attribute_ns */
 
 
-/* {{{ proto dom_void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value);
+/* {{{ proto void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS
 Since: DOM Level 2
 */
@@ -599,7 +599,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
 /* }}} end dom_element_set_attribute_ns */
 
 
-/* {{{ proto dom_void dom_element_remove_attribute_ns(string namespaceURI, string localName);
+/* {{{ proto void dom_element_remove_attribute_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS
 Since: DOM Level 2
 */
@@ -657,7 +657,7 @@ PHP_FUNCTION(dom_element_remove_attribute_ns)
 /* }}} end dom_element_remove_attribute_ns */
 
 
-/* {{{ proto domattr dom_element_get_attribute_node_ns(string namespaceURI, string localName);
+/* {{{ proto DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS
 Since: DOM Level 2
 */
@@ -688,7 +688,7 @@ PHP_FUNCTION(dom_element_get_attribute_node_ns)
 /* }}} end dom_element_get_attribute_node_ns */
 
 
-/* {{{ proto domattr dom_element_set_attribute_node_ns(attr newAttr);
+/* {{{ proto DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS
 Since: DOM Level 2
 */
@@ -754,7 +754,7 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns)
 
 
 
-/* {{{ proto domnodelist dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName);
+/* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942
 Since: DOM Level 2
 */
@@ -777,7 +777,7 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name_ns)
 	namednode = (dom_object *)zend_objects_get_address(return_value TSRMLS_CC);
 	local = xmlCharStrndup(name, name_len);
 	nsuri = xmlCharStrndup(uri, uri_len);
-	dom_namednode_iter(intern, 0, namednode, NULL, local, nsuri);
+	dom_namednode_iter(intern, 0, namednode, NULL, local, nsuri TSRMLS_CC);
 
 }
 /* }}} end dom_element_get_elements_by_tag_name_ns */
@@ -850,7 +850,7 @@ PHP_FUNCTION(dom_element_has_attribute_ns)
 /* }}} end dom_element_has_attribute_ns */
 
 
-/* {{{ proto dom_void dom_element_set_id_attribute(string name, boolean isId);
+/* {{{ proto void dom_element_set_id_attribute(string name, boolean isId);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr
 Since: DOM Level 3
 */
@@ -861,7 +861,7 @@ PHP_FUNCTION(dom_element_set_id_attribute)
 /* }}} end dom_element_set_id_attribute */
 
 
-/* {{{ proto dom_void dom_element_set_id_attribute_ns(string namespaceURI, string localName, boolean isId);
+/* {{{ proto void dom_element_set_id_attribute_ns(string namespaceURI, string localName, boolean isId);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS
 Since: DOM Level 3
 */
@@ -872,7 +872,7 @@ PHP_FUNCTION(dom_element_set_id_attribute_ns)
 /* }}} end dom_element_set_id_attribute_ns */
 
 
-/* {{{ proto dom_void dom_element_set_id_attribute_node(attr idAttr, boolean isId);
+/* {{{ proto void dom_element_set_id_attribute_node(attr idAttr, boolean isId);
 URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode
 Since: DOM Level 3
 */