--global have be removed in 5.2
man page: long option name is --strip, not --stripped
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
Merge branch 'PHP-5.6'

* PHP-5.6:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
primitive test fixes
Merge branch 'PHP-5.6'

* PHP-5.6:
  primitive test fixes
Allow NULL as value for CURLOPT_CUSTOMREQUEST option.

Added test case.

Refactored the code to isolate the string handling. Fixed return values to use SUCCESS and FAILURE.

Removed unused error variable.

Indentation fix.
Removed the ugly goto.
Fixed expected output of a few cURL test cases
Merge branch '5.5' into 5.6

* 5.5:
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
Merge branch '5.6'

* 5.6:
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
[bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given

A newline is added to the mail headers when mail.add_x_header is used and no other headers are passed to mail().

The scenario in which custom headers are used was already fixed in #48620, back in 2009.
Fixed test case title
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
substr_compare(): Allow zero length comparison

Treat zero length comparison as always equal.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  substr_compare(): Allow zero length comparison
Merge branch 'PHP-5.6'

* PHP-5.6:
  substr_compare(): Allow zero length comparison