php-src/main
Dmitry Stogov b108267f2c Merge branch 'master' into phpng
* master: (41 commits)
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
  Fix patch for bug #67436
  fix failed test
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
  Added tests for bug 67436
  Fixed wrong XFAIL test - already fixed
  Fix typo in Bug #67406 NEWS entry
  Fix typo in Bug #67406 NEWS entry
  ...

Conflicts:
	Zend/zend_compile.c
	ext/session/session.c
	ext/standard/array.c
	ext/standard/http_fopen_wrapper.c
	tests/classes/bug63462.phpt
2014-06-18 17:50:27 +04:00
..
streams Don't use cast (compiler friendly) 2014-05-26 11:05:04 +08:00
alloca.c - Fix outside-source-tree builds. Always include generated header files 2005-01-09 21:05:06 +00:00
build-defs.h.in Expose PHP_MANDIR 2011-04-18 09:50:32 +00:00
fopen_wrappers.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
fopen_wrappers.h Bump year 2014-01-03 11:08:10 +08:00
getopt.c Fixed compilaation warnings 2014-04-22 18:52:59 +04:00
internal_functions_nw.c Bump year 2014-01-03 11:08:10 +08:00
internal_functions_win32.c Bump year 2014-01-03 11:08:10 +08:00
internal_functions.c.in - MFH Cleanup exports and allow to overwrite ext registration 2008-08-22 12:59:46 +00:00
main.c forgot that hash uses ending 0 2014-05-15 10:39:35 +02:00
mergesort.c - MFH Cleanup exports and allow to overwrite ext registration 2008-08-22 12:59:46 +00:00
network.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
output.c Fixed wrong comparisons 2014-05-15 21:06:39 +04:00
php_compat.h Bump year 2014-01-03 11:08:10 +08:00
php_content_types.c Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
php_content_types.h Bump year 2014-01-03 11:08:10 +08:00
php_getopt.h Bump year 2014-01-03 11:08:10 +08:00
php_globals.h Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
php_ini.c There should been memory leaks(and don't use pointer cast) 2014-05-08 15:20:13 +08:00
php_ini.h Bump year 2014-01-03 11:08:10 +08:00
php_main.h Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
php_memory_streams.h Bump year 2014-01-03 11:08:10 +08:00
php_network.h Bump year 2014-01-03 11:08:10 +08:00
php_open_temporary_file.c Bump year 2014-01-03 11:08:10 +08:00
php_open_temporary_file.h Bump year 2014-01-03 11:08:10 +08:00
php_output.h Fixed invalid pointer usage (tests/output/ob_start_callbacks.phpt) 2014-03-07 16:49:01 +08:00
php_reentrancy.h Bump year 2014-01-03 11:08:10 +08:00
php_scandir.c Bump year 2014-01-03 11:08:10 +08:00
php_scandir.h Bump year 2014-01-03 11:08:10 +08:00
php_sprintf.c Bump year 2014-01-03 11:08:10 +08:00
php_stdint.h Bump year 2014-01-03 11:08:10 +08:00
php_streams.h Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
php_syslog.h Bump year 2014-01-03 11:08:10 +08:00
php_ticks.c Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
php_ticks.h Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
php_variables.c Prefer the macro we defined 2014-05-07 17:06:27 +08:00
php_variables.h fix dll export 2014-04-24 10:51:42 +02:00
php_version.h 5.5.15 now 2014-06-11 10:21:26 +02:00
php.h Merge branch 'PHP-5.6' 2014-02-13 11:56:54 +09:00
reentrancy.c Bump year 2014-01-03 11:08:10 +08:00
rfc1867.c Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
rfc1867.h Bump year 2014-01-03 11:08:10 +08:00
SAPI.c Merge branch 'master' into phpng 2014-06-18 17:50:27 +04:00
SAPI.h Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
snprintf.c Bump year 2014-01-03 11:08:10 +08:00
snprintf.h Bump year 2014-01-03 11:08:10 +08:00
spprintf.c Test push (previous push didn't send mail?) 2014-05-10 11:19:21 +08:00
spprintf.h Added vstrpprintf strpprintf to avoid duplicate string 2014-05-10 00:21:49 +08:00
strlcat.c Bump year 2014-01-03 11:08:10 +08:00
strlcpy.c Bump year 2014-01-03 11:08:10 +08:00
win32_internal_function_disabled.h Bump year 2014-01-03 11:08:10 +08:00
win95nt.h Bump year 2014-01-03 11:08:10 +08:00