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:20:18 -0700 |
| commit | ac40c0b562b0f90652cadef83968d7305626c377 (patch) | |
| tree | 450cd9d7b67422adfae2218a69d21fb02f921474 /main | |
| parent | 04145dc2aa6eea37f7cd27ffa69ad3b2f52a65da (diff) | |
| download | php-git-ac40c0b562b0f90652cadef83968d7305626c377.tar.gz | |
Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
typofixes
Diffstat (limited to 'main')
| -rw-r--r-- | main/rfc1867.c | 2 | ||||
| -rw-r--r-- | main/streams/xp_socket.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/rfc1867.c b/main/rfc1867.c index 35a1a15956..b9007f2cb8 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -62,7 +62,7 @@ static void safe_php_register_variable(char *var, char *strval, int val_len, zva #define MAX_SIZE_ANONNAME 33 /* Errors */ -#define UPLOAD_ERROR_OK 0 /* File upload succesful */ +#define UPLOAD_ERROR_OK 0 /* File upload successful */ #define UPLOAD_ERROR_A 1 /* Uploaded file exceeded upload_max_filesize */ #define UPLOAD_ERROR_B 2 /* Uploaded file exceeded MAX_FILE_SIZE */ #define UPLOAD_ERROR_C 3 /* Partially uploaded */ diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index beffc73e10..a9c050f267 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -194,7 +194,7 @@ static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC) * Essentially, we are waiting for the socket to become writeable, which means * that all pending data has been sent. * We use a small timeout which should encourage the OS to send the data, - * but at the same time avoid hanging indefintely. + * but at the same time avoid hanging indefinitely. * */ do { n = php_pollfd_for_ms(sock->socket, POLLOUT, 500); |