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
108,714 Commits 547 Branches 1,483 Tags
73ecad2f00a10797758018d2173e2f760f2d0e86
Commit Graph

204 Commits

Author SHA1 Message Date
Anatol Belski 0414fff205 Fix memory leak 2018-08-17 16:22:35 +02:00
Anatol Belski 0c2327b472 Cleanup 
(cherry picked from commit 8b3174f256)
 2018-08-17 13:01:57 +02:00
Anatol Belski ddd73d4fa8 Followup fix for ef9ed19e, see also bug #76738 
(cherry picked from commit 083285f22a)
 2018-08-17 13:01:56 +02:00
Xinchen Hui 10d724d82d Fixed build 
(cherry picked from commit 36f05a80d7)
 2018-08-17 13:01:55 +02:00
Andrew Nester 2072d377d3 DOMDocument::formatOutput attribute sometimes ignored 
(cherry picked from commit ef9ed19ec7)
 2018-08-17 13:01:55 +02:00
Christoph M. Becker 819cf5283b Revert "DOMDocument::formatOutput attribute sometimes ignored" 
This reverts commit ef9ed19ec7 and its
follow-up 36f05a80d7, since these caused
a serious regression (see bug #76738).
 2018-08-14 12:14:33 +02:00
Peter Kokot 8d3f8ca12a Remove unused Git attributes ident 
The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.

In Git this functionality is different and can be done with Git attribute
ident. These need to be defined manually for each file in the
.gitattributes file and are afterwards replaced with 40-character
hexadecimal blob object name which is based only on the particular file
contents.

This patch simplifies handling of $Id$ keywords by removing them since
they are not used anymore.
 2018-07-25 00:53:25 +02:00
Xinchen Hui 36f05a80d7 Fixed build 2018-07-04 11:15:32 +08:00
Andrew Nester ef9ed19ec7 DOMDocument::formatOutput attribute sometimes ignored 2018-06-28 10:38:20 +02:00
Dusta da82719f20 Update http to https 2018-06-25 08:31:32 +02:00
Dmitry Stogov 5eb1f92f31 Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence. 2018-05-28 16:27:12 +03:00
Gabriel Caruso 701437a948 Remove return types from some magic method in protos 
__construct, __destruct, __wakeup does not have return types defined.
 2018-03-09 12:04:46 +01:00
Gabriel Caruso affc20f891 Use bool instead of boolean in proto 2018-02-04 17:00:24 +01:00
Gabriel Caruso 6400264856 Trailing whitespaces 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-03 14:38:00 +01:00
Xinchen Hui a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Nikita Popov bf8c463f5b Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 12:36:13 +01:00
somedaysummer fab5ce347c PHP bug #74004 
Fix for DOMDocument loadHTML and loadHTMLFile ignore LIBXML_NOWARNING
and LIBXML_NOERROR flags.
 2017-03-02 12:35:42 +01:00
Nikita Popov f3b1ecb6c8 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-03 18:42:28 +01:00
Nikita Popov dcaf4da8a6 Revert "Merge branch 'pull-request/2344' into PHP-7.0" 
This reverts commit 6988d070ea, reversing
changes made to 75ad2b301a.
 2017-02-03 18:42:10 +01:00
Joe Watkins 611952cd98 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
 2017-02-03 06:12:42 +00:00
somedaysummer 4df993d89d Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML 2017-02-03 06:08:42 +00:00
Anatol Belski 3bc7ea9a0a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  sync NEWS with the reverted stuff
  Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"
  Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)"
 2017-02-01 20:01:40 +01:00
Anatol Belski 3446e3b749 Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)" 
This reverts commit 2fcf1259c6.
 2017-02-01 19:59:24 +01:00
Anatol Belski 69a2e4ece2 Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)" 
This reverts commit 62938bf088.
 2017-02-01 19:59:18 +01:00
Joe Watkins e6bc4f39a2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
 2017-01-30 11:26:37 +00:00
jhdxr 62938bf088 fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454) 2017-01-30 11:25:04 +00:00
Joe Watkins 366f838483 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)
 2017-01-28 08:27:53 +00:00
jhdxr 2fcf1259c6 fixed bug #50989 (DOM support for LIBXML_NOXMLDECL) 2017-01-28 08:27:05 +00: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
Stanislav Malyshev 336322ce63 Fix bug #73150: missing NULL check in dom_document_save_html 
(cherry picked from commit 1c0e9126fb)
(cherry picked from commit d1e878f272)
 2016-10-14 01:40:12 +02:00
Stanislav Malyshev d1e878f272 Fix bug #73150: missing NULL check in dom_document_save_html 
(cherry picked from commit 1c0e9126fb)
 2016-10-12 12:19:41 +02:00
Aaron Piotrowski 771e5cc247 Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error 2016-06-13 09:02:17 -05:00
Aaron Piotrowski e3c681aa5c Merge branch 'master' into throw-error-in-extensions 2016-06-10 22:02:23 -05: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
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 201afce875 add some range checks to ext/dom 2015-08-26 16:39:50 +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
Rasmus Lerdorf 1af1afdfdc DOMDocument::saveXML has a 2nd optional arg 2015-07-10 15:17:06 -07:00
Aaron Piotrowski 7ec1e17464 Update memory freeing and other issues, revert some changes 2015-07-05 23:25:53 -05:00
Aaron Piotrowski 907476f34c Convert E_ERROR to thrown Error in extensions 2015-07-05 12:16:57 -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
Rasmus Lerdorf 41774bceff Fix more minor mistakes in the proto comments 2015-06-23 15:47:33 -04: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 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