php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,921 Commits 547 Branches 1,483 Tags
1c68d63f35aecc2aa602ffc429688ed43ffb92b6
Commit Graph

112 Commits

Author SHA1 Message Date
Nikita Popov d9fd44366d Merge branch 'PHP-7.0' into PHP-7.1 2017-06-03 00:42:30 +02:00
Tim Toohey d027bc2add Fixed bug #69373 
xmlNodeSetContentLen() calls xmlFreeNode() on node->children. This
causes problems if there are other references around to those children.
 2017-06-03 00:40:58 +02:00
Remi Collet 77e3fef64f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74416 Wrong reflection on DOMNode::cloneNode
 2017-04-13 07:07:43 +02:00
Fabien Villepinte bc4bb7882b Fixed bug #74416 Wrong reflection on DOMNode::cloneNode 2017-04-13 07:07:24 +02:00
Nikita Popov 908ad3cc80 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-10 23:29:43 +01:00
Arnout Boks 13edec75a3 Fixed #73907 (nextSibling property not included in var_dump of DOMNode) 2017-01-10 23:29:02 +01:00
Sammy Kaye Powers dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers 478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Dmitry Stogov 323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Lior Kaplan ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan 49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Xinchen Hui 4171a8f6c6 Internal function argumensts cleanup (strict_types) 2015-12-12 22:52:37 -08:00
Christoph M. Becker 1b344f55f4 Revert "Fix #70029: nodeValue of DOMElement list content of children nodes" 
This reverts commit 25a52d98d7.
 2015-09-06 15:36:43 +02:00
Christoph M. Becker 25a52d98d7 Fix #70029: nodeValue of DOMElement list content of children nodes 
According to the W3C DOM Core Level 3 specification DOMElement::nodeValue is
supposed to yield null, but currently the DOM extension yield the result of
calling xmlNodeGetContent(), what is the concatenation of the values of the
children of the element. This patch fixes the non standard behavior.
 2015-09-05 01:52:41 +02:00
Christoph M. Becker c9a8733ce2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70001: Assigning to DOMNode::textContent does additional entity encoding

Resolved conflicts:
	ext/dom/node.c
 2015-09-05 01:32:08 +02:00
Christoph M. Becker b2954c64ab Fix #70001: Assigning to DOMNode::textContent does additional entity encoding 
Assigning to DOMNode::textContent encodes entities, what does not match the
behavior of DOMText::__construct() and DOMDocument::createTextNode. This patch
changes the behavior of DOMNode::textContent in this regard.
 2015-09-05 01:17:50 +02:00
Dmitry Stogov 4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Xinchen Hui fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui 0579e8278d bump year 2015-01-15 23:26:37 +08:00
Stanislav Malyshev b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Johannes Schlüter d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Nikita Popov d85ab21ac4 Fix DOM warnings 2014-09-03 21:35:53 +02:00
Tjerk Meesters 297a9b1f75 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Make DOMNode::textContent writeable
  Updated UPGRADING
  Updated NEWS

Conflicts:
	ext/dom/attr.c
	ext/dom/characterdata.c
	ext/dom/document.c
	ext/dom/node.c
 2014-09-02 06:54:52 +08:00
Tjerk Meesters f54451cf39 Make DOMNode::textContent writeable 2014-09-02 06:34:18 +08:00
Anatol Belski 3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski fdfe8ac36e fix zpp 2014-08-21 20:25:31 +02:00
Anatol Belski 63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov 3419dc8c60 Use new zend_hash API 2014-05-28 18:12:52 +04:00
Dmitry Stogov 4ed452c1b5 Convert zval_get_string() into "fast path" macro and "slow path" function 2014-04-21 22:36:01 +04:00
Nikita Popov 39d12294fd Mostly fix Dom XPath 2014-04-16 17:14:34 +02:00
Nikita Popov 3b9fdf37e1 Make DOM compile 
Just make it compile, not work yet...
 2014-04-15 20:32:47 +02:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Rob Richards c5a611b257 Merge branch 'PHP-5.3' into PHP-5.4 
# By Daniel Veillard
* PHP-5.3:
  Update to work with libxml 2.9.0
 2012-08-09 14:24:50 -04:00
Daniel Veillard c4b26cc1b0 Update to work with libxml 2.9.0 2012-08-09 14:02:33 -04:00
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Dmitry Stogov 4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Ilia Alshanetsky 3726c5c67a Removal of deadcode identified by coverity 2011-08-08 13:45:18 +00:00
Ilia Alshanetsky e2e96913bf Deadcode & sizeof fix for issues found by coverity 
(different patch for 5.4+ will follow shortly)
 2011-08-08 12:29:32 +00:00
Felipe Pena 23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena 4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena 927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena 0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Raphael Geissert b373d8e184 Fix another typo s/exlcusive/exclusive 2010-05-01 18:30:38 +00:00
Raphael Geissert 7d716f8373 Fix another typo s/exlcusive/exclusive 2010-05-01 18:30:38 +00:00
Sebastian Bergmann 9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Rob Richards c3d66dbfed Fixed bug #49647 (DOMUserData does not exist) 2009-09-24 13:18:22 +00:00