Anatol Belski 69d6e093e9 Merge branch 'PHP-5.6' ... * PHP-5.6: fixed the cast and incompatible pointer warning Conflicts: sapi/cgi/fastcgi.c		2014-09-12 14:37:54 +02:00
..
aolserver	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
apache	Revert "Removing ext/ereg and dependencies"	2014-09-11 11:06:57 +04:00
apache2filter	fix hash API calls	2014-05-17 08:12:18 +02:00
apache2handler	fix apache handler build	2014-09-01 14:49:52 -07:00
apache_hooks	Revert "Removing ext/ereg and dependencies"	2014-09-11 11:06:57 +04:00
caudium	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
cgi	Merge branch 'PHP-5.6'	2014-09-12 14:37:54 +02:00
cli	first show to make 's' work with size_t	2014-08-27 20:49:31 +02:00
continuity	Update copyright year to 2014	2014-06-18 00:22:16 +03:00
embed	master renames phase 3	2014-08-25 20:22:49 +02:00
fpm	Refactored INI subsystem to use zend_string* instead of char*	2014-09-01 20:57:33 +04:00
isapi	Bump year	2014-01-03 11:08:10 +08:00
litespeed	Fine tuned the order of adding request variables.	2014-09-09 00:01:36 -04:00
milter	Remove ZEND_ACC_INTERACTIVE and CG(interactive)	2014-08-25 23:46:43 +02:00
nsapi	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
phpdbg	Removed ZEND_QM_ASSIGN_VAR and ZEND_JMP_SET_VAR opcodes (in PHPNG they did exacly the same as ZEND_QM_ASSIGN and ZEND_JMP_SET)	2014-09-11 12:29:54 +04:00
phttpd	Bump year	2014-01-03 11:08:10 +08:00
pi3web	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
roxen	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
tests	- Rewrite scanner to be based on re2c instead of flex	2008-03-16 21:06:55 +00:00
thttpd	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
tux	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
webjames	Bump year	2014-01-03 11:08:10 +08:00