diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-02-14 17:15:35 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-02-14 17:15:35 +0200 |
| commit | 23d952ed60766be772fe72dcdc61407c6231dc18 (patch) | |
| tree | 85da0b833c76fddb10fd40db0124af9bd14f772c /ext/standard | |
| parent | 71b8f59ebba9ec3c5af6d4bd0b5e9dab3803dbe5 (diff) | |
| parent | f9829690d4f6e747a8d46751c9d37e5e5e40336c (diff) | |
| download | php-git-23d952ed60766be772fe72dcdc61407c6231dc18.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/dns_win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c index 2dbf3e2e1d..a784823dd3 100644 --- a/ext/standard/dns_win32.c +++ b/ext/standard/dns_win32.c @@ -334,7 +334,7 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, int raw, #endif default: - /* unkown type */ + /* unknown type */ zval_ptr_dtor(subarray); *subarray = NULL; return; |