archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
96632 commits 526 branches 1434 tags 878 MiB
Commit graph

619 commits

Author SHA1 Message Date
Dmitry Stogov
0cfb47651c Fixed compilation warnings 2016-06-28 11:37:51 +03:00
Dmitry Stogov
323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Dmitry Stogov
f0a2e8eb13 Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used. 2016-04-27 13:46:38 +03:00
Dmitry Stogov
c67c166f93 Removed zend_fcall_info.symbol_table 2016-03-02 17:50:55 +03:00
Xinchen Hui
2068bb1a11 Missed semicolon 2016-02-18 12:04:27 +08: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
Tom Van Looy
aadb3dd503 These function docs are referencing zend_object_value but this should be zend_object 2015-12-24 10:24:53 +01:00
Xinchen Hui
4171a8f6c6 Internal function argumensts cleanup (strict_types) 2015-12-12 22:52:37 -08:00
Anatol Belski
a7552ca310 add ovfl check, fix warnings 2015-09-24 16:33:56 +02:00
Dmitry Stogov
51cd49b2cf Cleanup: replace removed condition with ZEND_ASSERT() 2015-09-24 00:25:51 +03:00
Xinchen Hui
c87ef023aa Fixed Bug #70558 ("Couldn't fetch" error in DOMDocument::registerNodeClass()) 2015-09-23 07:01:50 -07:00
Anatol Belski
0c7872f88a add range check 2015-09-16 15:39:21 +02:00
Anatol Belski
969dcf7b61 add overflow check 2015-09-12 18:57:23 +02:00
Anatol Belski
5d035b57ee fix data types 2015-09-12 18:53:30 +02:00
Anatol Belski
c6ff5be09d add range checks 2015-09-12 10:29:00 +02: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
Anatol Belski
201afce875 add some range checks to ext/dom 2015-08-26 16:39:50 +02:00
Dmitry Stogov
715d5d2855 Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h. 
This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c.
Now explicit type casting may be required on call site.
This may break some C extension code, but it shoulfn't be a problem to add explicit casting.
 2015-08-13 13:56:29 +03:00
Christoph M. Becker
6576d809a5 test fails with old libxml2; skip in this case 2015-07-31 19:52:42 +02:00
Dmitry Patsura
ed3c7adc5f Remove unneded space(s) 2015-08-03 18:38:41 +08:00
Anatol Belski
545b364d56 remove TSRMLS_* 
either remains or merged in from PHP5
 2015-08-02 13:42:01 +02:00
Christoph M. Becker
78eab007a9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  test fails with old libxml2; skip in this case
 2015-07-31 19:55:07 +02:00
Nikita Popov
5c95226d50 Various warning fixes 2015-07-17 20:18:25 +02:00
Rasmus Lerdorf
1af1afdfdc DOMDocument::saveXML has a 2nd optional arg 2015-07-10 15:17:06 -07:00
Aaron Piotrowski
ed1b64877d Switch position of ce in exception ce variable names 2015-07-03 09:45:03 -05:00
Aaron Piotrowski
a812a74c2e Change zend_exception_get_default() to zend_exception_ce 2015-07-03 09:44:48 -05: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
Christoph M. Becker
86df85f43a Merge branch 'PHP-5.6' 
* PHP-5.6:
  added regression test for bug #69679
 2015-06-27 01:10:41 +02:00
Christoph M. Becker
6400ef192c added regression test for bug #69679 
DOMDocument::loadHTML refuses to accept NULL bytes.
 2015-06-27 01:08:56 +02:00
Rasmus Lerdorf
41774bceff Fix more minor mistakes in the proto comments 2015-06-23 15:47:33 -04:00
Anatol Belski
1e65b65dd6 more precise way to destroy iterator object 
which also fixes the iterator_to_array test
 2015-06-19 14:23:32 +02:00
Anatol Belski
9649cec2a3 added test for bug #69846 2015-06-19 12:46:19 +02:00
Anatol Belski
d079a1c9ea better approach to fix bug #69846 
don't destroy the current iterator object too early
 2015-06-19 11:22:12 +02:00
Anatol Belski
918de41ec2 partial fix to bug #69846 2015-06-18 20:17:04 +02:00
Aaron Piotrowski
110e0a5a2c Merge branch 'master' into throwable-interface 
# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt
 2015-06-14 18:53:11 -05:00
Stanislav Malyshev
d4407e1cb9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add NEWS
  Fixed bug #68776
  fix test
  update NEWS
  Fix bug #69646	OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

Conflicts:
	ext/dom/document.c
	ext/gd/gd.c
	ext/standard/exec.c
 2015-06-09 21:39:59 -07:00
Stanislav Malyshev
1346c3df42 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
  update NEWS
 2015-06-09 17:12:25 -07:00
Stanislav Malyshev
6b53b7cd84 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  fix test
  update NEWS
 2015-06-09 17:12:11 -07:00
Stanislav Malyshev
eee8b6c33f fix test 2015-06-09 17:11:33 -07:00
Stanislav Malyshev
8b1919ed73 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69646	OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.
 2015-06-09 15:32:27 -07:00
Stanislav Malyshev
4e2fb47092 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69646	OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

Conflicts:
	ext/dom/document.c
	ext/gd/gd.c
 2015-06-09 15:31:27 -07:00
Stanislav Malyshev
f7d7befae8 Fix #69719 - more checks for nulls in paths 2015-06-09 10:52:38 -07:00
Aaron Piotrowski
e97d5fab35 Update exception names in tests after formatting changes. 2015-05-17 17:31:43 -05:00
Aaron Piotrowski
fb7206e452 Merge branch 'master' into throwable-interface 2015-05-17 16:15:35 -05:00
Nikita Popov
3ae995f03c Tweak uncaught exception message display 
This implements a reduced variant of #1226 with just the following
change:

-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d

The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
 2015-05-17 18:47:06 +02:00
Aaron Piotrowski
64b167d201 Updated tests to reflect exception class changes. 2015-05-16 16:49:14 -05:00