php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
82,555 Commits 549 Branches 1,484 Tags
0d7159d26d277e34b4b2df4c1e49ec51ffb229cf
Commit Graph

162 Commits

Author SHA1 Message Date
Anatol Belski af2b066911 libxml-2.9.2 compatibility 2015-03-15 18:38:50 +01:00
Stanislav Malyshev 463611714c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
 2015-02-01 00:09:04 -08:00
Martin Jansen de31324c22 Fix bug #64938: libxml_disable_entity_loader setting is shared between threads 
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to  also have
the loader disabled.

With this change the loader is explicitely enabled in the request init
phase.
 2015-02-01 00:08:35 -08:00
Xinchen Hui 0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui 73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Veres Lajos 4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Matteo Beccati 6eaadc0228 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
 2014-06-09 07:07:17 +02:00
Matteo Beccati af5057bea7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
 2014-06-09 07:07:07 +02:00
Matteo Beccati 5c8c57aa6c Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191 
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
 2014-06-09 07:05:23 +02:00
Scott MacVicar 1f3af9cd21 [libxml] Unit test for libxml_disable_entity_loader() 
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
 2014-02-16 22:34:52 -08:00
Anatol Belski 6e3fae4390 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed post deactivate signature in ext\libxml
 2014-01-21 17:14:56 +01:00
Anatol Belski c6f2581c39 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed post deactivate signature in ext\libxml
 2014-01-21 17:14:32 +01:00
Anatol Belski fb721cefe7 fixed post deactivate signature in ext\libxml 2014-01-21 17:08:59 +01:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui 47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Michael Wallner e9877fe92e fix test concurrency 2013-09-18 10:53:11 +02:00
Stanislav Malyshev 3db907b803 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add schema default/fixed value support
 2013-08-10 17:56:46 -07:00
Stanislav Malyshev 473d66553d Merge branch 'pull-request/325' into PHP-5.5 
* pull-request/325:
  Add schema default/fixed value support
 2013-08-10 17:56:23 -07:00
Andrey Hristov 92d27ccb05 Constify streams API and a few other calls down the rabbit hole. 
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
 2013-07-30 12:49:36 +02:00
Stanislav Malyshev 02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Chris Wright c091819f40 Add schema default/fixed value support 
Added support for adding fixed/default values during XSD validation
and added/updated associated tests
 2013-04-12 09:50:14 +01:00
Dmitry Stogov c737b89473 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed external entity loading

Conflicts:
	ext/libxml/libxml.c
	ext/libxml/php_libxml.h
 2013-02-20 22:27:41 +04:00
Dmitry Stogov 8e76d0404b Fixed external entity loading 2013-02-20 22:14:59 +04:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Dmitry Stogov 1a09bf8023 Fixed bug #61557 (Crasher in tt-rss backend.php) 2012-11-29 14:38:18 +04:00
Xinchen Hui 3342e7276c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-30 11:10:26 +08:00
Xinchen Hui 2f1c4064f8 Fixed bug #63389 (Missing context check on libxml_set_streams_context() causes memleak) 
Simply change the expect parameter type, the valid of the resource will
be checked in using time.
 2012-10-30 11:08:14 +08:00
Gustavo André dos Santos Lopes 503358c179 Fix bug #62266 
Custom extension segfaults during xmlParseFile with FPM SAPI
because the regular list is not prepared during the MINIT phase
and our custom external entity loader tries to open PHP streams.
 2012-06-09 17:29:47 +01:00
zoe slattery 867447f420 Fix: 62067 Moved comments to FILE section 2012-05-19 16:34:16 +01:00
zoe slattery 778d69ddfe Fix: 62067 Moved comments to FILE section 2012-05-19 16:33:36 +01:00
Anatoliy Belsky 3d106aeb0d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
 2012-04-16 15:46:02 +02:00
Anatoliy Belsky bceafee879 Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails 2012-04-16 15:45:03 +02:00
Xinchen Hui 1ff8021519 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
  Cherry-pick 4cc74767

Conflicts:
	NEWS
 2012-04-04 17:36:18 +08:00
Xinchen Hui 94f1c05ff8 Fixed bug #61617 (Libxml tests failed(ht is already destroyed)) 2012-04-04 17:22:37 +08:00
Stanislav Malyshev 2a74cb4008 Merge branch 'sec53' into sec54 
* sec53:
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
 2012-03-25 12:51:46 -07:00
Stanislav Malyshev 167e2fd782 fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN 2012-03-25 12:50:25 -07: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
Gustavo André dos Santos Lopes dc32339c33 - Use our external entity loader only in the context of a PHP request. 2011-09-02 05:14:32 +00:00
Christian Stocker c1d92d7925 fixed libxml tests 2011-08-31 08:58:12 +00:00
Gustavo André dos Santos Lopes 5b544394c4 - Fixed tests when run from outside their directory. 2011-08-31 06:23:24 +00:00
Pierre Joye 63fa1fb1ca - ws 2011-08-30 05:44:37 +00:00
Pierre Joye 4bd71a6c4f - ws 2011-08-30 05:44:37 +00:00
Gustavo André dos Santos Lopes 7bd505021c - Turns out the external entity loader is not a per-thread global but a true 
global. Changed code accordingly; however, applications that embed PHP and
  also use libxml2 may be affected negatively.
 2011-08-30 01:08:22 +00:00
Pierre Joye 7246759277 - fix build, TSRMLS_FETCH must be the last declaration statement and init using TSRM cannot be done before either 2011-08-29 10:10:05 +00:00
Gustavo André dos Santos Lopes 0d7e6a73d6 - Added libxml_set_external_entity_loader(). 2011-08-29 05:00:26 +00:00
Felipe Pena 23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00