clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,911 Commits 491 Branches 1,363 Tags 844 MiB
4288f0486b
Commit Graph

445 Commits

Author SHA1 Message Date
Dmitry Stogov
4288f0486b ext/phar support (incomplete) 2014-05-12 16:43:18 +04:00
Dmitry Stogov
2a31934a1a Support for ext/phar (incomplete) 2014-05-08 21:18:59 +04:00
Dmitry Stogov
df5ad846c6 Support for ext/phar (incomplete) 2014-05-08 18:30:07 +04: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
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Bob Weinand
a93e734f81 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-14 00:08:36 +02:00
Xinchen Hui
3f4c877bf7 Use better data structures (incomplete) 2014-02-11 19:33:18 +08:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04: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
63dba7ec9d Remove outdate codes, make it clearer, although just a bit.. 2013-11-05 18:47:12 +08:00
Nikita Popov
db6d93feca Remove some more unnecessary macros from phar 2013-09-13 21:49:09 +02:00
Nikita Popov
39bd738fbf Remove version checks in phar 
No need to keep around compatability code for PHP 5.0 and PHP 6.
 2013-09-13 21:47:59 +02:00
Pierre Joye
42a186e22d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  more check for php_stream_fopen_tmpfile failure
 2013-05-14 16:46:32 +02:00
Pierre Joye
7ec2e5314e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  more check for php_stream_fopen_tmpfile failure
 2013-05-14 16:45:56 +02:00
Pierre Joye
ba1af29805 more check for php_stream_fopen_tmpfile failure 2013-05-14 16:45:11 +02:00
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach 
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
 2013-03-12 17:27:31 +01:00
Xinchen Hui
c2f8e90504 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-06 10:20:00 +08:00
Xinchen Hui
bc11e6fdbb bump year 2013-01-06 10:19:09 +08:00
Felipe Pena
b0dbf71466 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Removed PHP 6 checks
 2012-08-21 20:15:48 -03:00
Felipe Pena
85fa4d7747 - Removed PHP 6 checks 2012-08-21 20:15:34 -03:00
Nikita Popov
d256caf781 Merge: Fix bug #61184 Phar::webPhar() generates headers with trailing NUL bytes 2012-03-02 08:21:54 +00:00
Nikita Popov
daa190f8fd Fix headers generated by phar 
sapi_header_line.line_len is the length without null terminator, so one has to
take sizeof - 1. This fixes some test failures as the NUL bytes were causing
warnings.

Needs to be merged to 5.4.
 2012-02-18 13:39:13 +00: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
Dmitry Stogov
4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Ilia Alshanetsky
1488704098 Make static analyzers happy 2011-08-09 14:11:56 +00:00
Ilia Alshanetsky
47632aa725 Make static analyzers happy 2011-08-09 14:11:56 +00:00
Xinchen Hui
4c2e6c1cf6 Initialize variable with fixed value for avoiding compile warnings 2011-08-07 11:13:27 +00:00
Xinchen Hui
cc42ac9d9b Initialize variable with fixed value for avoiding compile warnings 2011-08-07 11:13:27 +00:00
Felipe Pena
2df7afeb1c - Revert accidental change 2011-07-25 21:39:53 +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
Felipe Pena
3964ddd1c4 - Added missing void param checks, and fix arginfo 2011-06-18 22:48:31 +00:00
Felipe Pena
8c3335b96b - Added missing void param checks, and fix arginfo 2011-06-18 22:48:31 +00:00
Felipe Pena
ebf9db550f - Added missing arginfos for void params and void param checks 2011-06-18 15:56:14 +00:00
Felipe Pena
2b309c8f9e - Added missing arginfos for void params and void param checks 2011-06-18 15:56:14 +00:00
Felipe Pena
4929964a5d - Fixed bug #54395 (Phar::mount() crashes when calling with wrong parameters) 2011-03-26 17:02:34 +00:00
Felipe Pena
3acdca4703 - Fixed bug #54395 (Phar::mount() crashes when calling with wrong parameters) 2011-03-26 17:02:34 +00:00
Felipe Pena
6da18ca967 - Missing fixes for bug #54247 2011-03-14 14:12:42 +00:00
Felipe Pena
0be5ca5b3c - Missing fixes for bug #54247 2011-03-14 14:12:42 +00:00
Felipe Pena
8d816ed0ef - Fixed bug #54247 (format-string vulnerability on Phar) 2011-03-14 13:54:41 +00:00
Felipe Pena
fe91aeaaac - Fixed bug #54247 (format-string vulnerability on Phar) 2011-03-14 13:54:41 +00:00
Nuno Lopes
8d2d7255ec MFB: fix lcov build (r308657) 2011-02-25 09:37:33 +00:00
Nuno Lopes
e79bf567e8 fix lcov build 2011-02-25 09:32:17 +00:00
Felipe Pena
12d2104277 - Year++ 2011-01-01 02:48:19 +00:00
Felipe Pena
d90a33d51c - Year++ 2011-01-01 02:46:03 +00:00
Kalle Sommer Nielsen
1fed0e5a84 Kill some more constness warnings in com_dotnet/phar/standard 2010-11-19 16:03:00 +00:00
Adam Harvey
107f916322 Fix up the vim folds in phar_object.c and add a note that the two prototypes 
before Phar::__construct() are actually valid and not a mistake, per bug
#52909.
 2010-09-23 04:41:14 +00:00
Adam Harvey
a89b97102e Fix up the vim folds in phar_object.c and add a note that the two prototypes 
before Phar::__construct() are actually valid and not a mistake, per bug
#52909.
 2010-09-23 04:41:14 +00:00