Anatol Belski 7b8ba8e3e3 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport ...

* origin/PHP-5.6: (43 commits)
  updated NEWS
  removed the libsqlite patch as it's not relevant anymore
  updated bundled libsqlite to 3.8.3.1
  add OPSYS_Z_CPM missing constant
  Update php.ini files (new openssl directives)
  Fixed null termination
  Updated NEWS for #65545
  Updated NEWS for #65545
  Add fread(length) method
  Updated news for #66822
  Allow T_POW in constant expressions
  Fix typo
  Fix #66698: Add fnv1a32 and fnv1a64 hash options
  Fix HTML entity table generation
  Add test for bug #62102 / RFC 2144
  Whitespace.
  Misc cleanup including adding the version number
  Fix order in NEWS
  Add CVE ref (not known at release time)
  Fix NEWS for 5.5.11 fix (really not in 5.5.10)
  ...

Conflicts:
	ext/mcrypt/mcrypt.c
	ext/mysqlnd/mysqlnd.h
	ext/mysqlnd/mysqlnd_ps.c
	ext/mysqlnd/mysqlnd_result.c
	ext/mysqlnd/mysqlnd_result.h
	ext/mysqlnd/mysqlnd_structs.h
	ext/openssl/openssl.c
	ext/openssl/xp_ssl.c
	ext/zip/php_zip.c

2014-03-09 15:00:36 +01:00

..

libsqlite

removed the libsqlite patch as it's not relevant anymore

2014-03-09 13:03:43 +01:00

tests

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-14 17:36:07 +01:00

config0.m4

Fix long-standing visual pain point: the misalignment of './configure help' text.

2013-08-06 11:06:09 -07:00

config.w32

let the libsqlite3 symbols be exported in dll

2013-09-17 13:05:44 +02:00

CREDITS

Good patch from Brad Dewar that adds missing createCollation()

2012-01-29 03:57:29 +00:00

php_sqlite3_structs.h

Merge remote-tracking branch 'origin/master' into str_size_and_int64

2014-01-04 02:17:11 +01:00

php_sqlite3.h

Bump year

2014-01-03 11:08:10 +08:00

sqlite3.c

Merge remote-tracking branch 'origin/master' into str_size_and_int64

2014-01-04 02:17:11 +01:00