clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-04 00:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,030 Commits 494 Branches 1,367 Tags 814 MiB
b57b1ff495
Commit Graph

120 Commits

Author SHA1 Message Date
Xinchen Hui
d8651fbe1c Make they are in the same style of Z_ISREF 2014-05-03 16:08:58 +08:00
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Dmitry Stogov
5864ce8a44 Fixed compilation warnings 2014-04-22 17:46:34 +04:00
Nikita Popov
8a14276701 Fix libxml external entity loading 2014-04-18 00:15:13 +02:00
Nikita Popov
c3c47c431e Move libxml_destroy_fci to RSHUTDOWN 
If this is only done in post shutdown and the function name is
an object (e.g. closure), the object will already be freed during
zend_deactivate.

I left the rest of the shutdown procedure in post shutdown, as it
presumably has a reason to be there...
 2014-04-18 00:15:13 +02:00
Nikita Popov
59d45e69f4 Fix libxml/sxe/dom node import/export 
Also fix sxe zts.
 2014-04-18 00:15:13 +02:00
Dmitry Stogov
61e9b0d265 Fixed memory leak 2014-04-15 15:50:34 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Xinchen Hui
55440b0870 Fixed libxml handling default context 2014-04-14 23:40:21 +08:00
Xinchen Hui
180de35bce Refactor libxml (incompleted) 2014-04-11 18:07:25 +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
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
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
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
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
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
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