From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 8 Oct 2015 08:23:24 +0000 (+0200)
Subject: Merge branch 'pr-1204'
X-Git-Tag: php-7.1.0alpha1~1010
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e66f1b9add70ecc3c5f1826cce930c968266bf8;p=php

Merge branch 'pr-1204'

* pr-1204:
  no need for default value
  allow passing null as the third param
  Implemented FR #55716 - Add an option to pass a custom stream context
---

1e66f1b9add70ecc3c5f1826cce930c968266bf8