diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:20:18 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:30:59 -0700 |
| commit | 02e4d7a290ae437688b3a3d114621a1d32444560 (patch) | |
| tree | ab3b9d2387ac6914ab7dd68afda87134d3b81e4b /ext/phar | |
| parent | ec790753948d190db354cbce97786b4a1aac63fc (diff) | |
| download | php-git-02e4d7a290ae437688b3a3d114621a1d32444560.tar.gz | |
Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
typofixes
Diffstat (limited to 'ext/phar')
| -rw-r--r-- | ext/phar/func_interceptors.c | 2 | ||||
| -rw-r--r-- | ext/phar/tests/files/openssl.cnf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c index 65193726de..00cb92ff13 100644 --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@ -733,7 +733,7 @@ notfound: PHAR_G(cwd_len) = save_len; efree(entry); efree(arch); - /* Error Occured */ + /* Error Occurred */ if (!IS_EXISTS_CHECK(type)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "%sstat failed for %s", IS_LINK_OPERATION(type) ? "L" : "", filename); } diff --git a/ext/phar/tests/files/openssl.cnf b/ext/phar/tests/files/openssl.cnf index 10e69076cf..4ed40fdc8a 100644 --- a/ext/phar/tests/files/openssl.cnf +++ b/ext/phar/tests/files/openssl.cnf @@ -3,7 +3,7 @@ default_bits = 1024 default_keyfile = privkey.pem distinguished_name = req_distinguished_name attributes = req_attributes -x509_extensions = v3_ca # The extentions to add to the self signed cert +x509_extensions = v3_ca # The extensions to add to the self signed cert string_mask = MASK:4294967295 |