summaryrefslogtreecommitdiff
path: root/main/streams
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-06-10 14:20:18 -0700
committerStanislav Malyshev <stas@php.net>2013-06-10 14:30:59 -0700
commit02e4d7a290ae437688b3a3d114621a1d32444560 (patch)
treeab3b9d2387ac6914ab7dd68afda87134d3b81e4b /main/streams
parentec790753948d190db354cbce97786b4a1aac63fc (diff)
downloadphp-git-02e4d7a290ae437688b3a3d114621a1d32444560.tar.gz
Merge branch 'pull-request/341'
* pull-request/341: (23 commits) typofixes
Diffstat (limited to 'main/streams')
-rw-r--r--main/streams/xp_socket.c2
1 files changed, 1 insertions, 1 deletions
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);