mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-12 11:23:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
70,339 Commits 503 Branches 1,384 Tags 800 MiB
e50eb1ce34
Commit Graph

140 Commits

Author SHA1 Message Date
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07: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
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Christian Stocker
8806c371c8 Added the ability to pass options to loadHTML (Chregu, fxmulder at gmail dot com) 
(MFT - Merged from Trunk)
 2011-07-11 15:18:46 +00:00
Hannes Magnusson
2c03acef35 Fixed bug #54601 (Removing the doctype node segfaults) 2011-05-29 11:39:49 +00:00
Hannes Magnusson
07bcf1080d Fixed bug #54601 (Removing the doctype node segfaults) 2011-05-29 11:39:49 +00:00
Gustavo André dos Santos Lopes
047ed8dfbb - Fixed bug #54440: libxml extension ignores default context. 2011-04-09 18:32:55 +00:00
Gustavo André dos Santos Lopes
09b990f499 - Fixed bug #54440: libxml extension ignores default context. 2011-04-09 18:32:55 +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
Pierre Joye
aea6771d19 - add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :) 2010-12-13 18:43:10 +00:00
Pierre Joye
a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00
Pierre Joye
aa0ed267a2 - use TSRMLS_*C instead of TSRMLS_FETCH in zend_list_insert 2010-09-16 09:13:19 +00:00
Dmitry Stogov
d8bddb9665 In some SAPI (e.g. FastCGI) we don't need to setup and reset libxml callbacks on each request, we con do it only once. Probably the list of such SAPI may be extended. 2010-08-27 06:12:37 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Felipe Pena
9b8f2525aa - Fixed bug #49660 (libxml 2.7.3+ limits text nodes to 10MB). (Felipe) 
- Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a
  single text node when using libxml2.7.3+. (Kalle)
[DOC]
 2009-12-01 02:05:28 +00:00
Hannes Magnusson
f3d8a9ad0d MFH: Fix arginfo for libxml_disable_entity_loader() and libxml_use_internal_errors() 2009-06-23 13:44:24 +00:00
Rob Richards
f7b30e6578 MFH: add libxml_disable_entity_loader function 2009-06-23 10:50:09 +00:00
Rob Richards
1313c86484 MFH: add LIBXML_LOADED_VERSION constant that contains currently loaded libxml2 version 
add libxml2 version being used to info output
 2009-03-14 17:30:28 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Rob Richards
8fc5e99478 MFH: add missing exports 2008-12-27 12:16:12 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00