php-src

0 Fork 0

mirror of https://github.com/bdnugget/php-src.git synced 2026-11-11 03:00:49 +00:00

Files

T

Anatol Belski 9c1dd320d6 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64

* origin/str_size_and_int64_56_backport: (33 commits)
  remove temp test files
  fix typo replacement
  don't compare constants on run time
  fix macros
  more descriptor fixes
  substr_compare(): Allow zero length comparison
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
  primitive test fixes
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
  remove pcntl leftover from the test code
  list the fpm change hat rfc in UPGRADING
  mention the apparmor support in fpm
  typo spotted by Lajos Veres
  update libs_version.txt
  update libs_version.txt
  NEWS
  ...

Conflicts:
	ext/openssl/openssl.c

2014-02-28 21:09:55 +01:00

aolserver

Bump year

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

apache

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

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

apache2filter

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

apache2handler

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