← Back to branch summary

~ubuntu-branches/ubuntu/lucid/php5/lucid

« back to all changes in this revision

Viewing changes to ext/sockets/sockets.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-03-16 09:09:50 UTC
  • mfrom: (1.1.18 upstream) (0.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100316090950-e36m0pzranoixifd
Tags: 5.3.2-1ubuntu1
* Merge from debian unstable: 
  - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in
      universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
  - Dropped debian/patches/libedit_is_editline.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/sockets/sockets.c
2
2
   +----------------------------------------------------------------------+
3
3
   | PHP Version 5                                                        |
4
4
   +----------------------------------------------------------------------+
5
 
   | Copyright (c) 1997-2009 The PHP Group                                |
 
5
   | Copyright (c) 1997-2010 The PHP Group                                |
6
6
   +----------------------------------------------------------------------+
7
7
   | This source file is subject to version 3.01 of the PHP license,      |
8
8
   | that is bundled with this package in the file LICENSE, and is        |
19
19
   +----------------------------------------------------------------------+
20
20
 */
21
21
 
22
 
/* $Id: sockets.c 289417 2009-10-09 14:22:29Z pajoye $ */
 
22
/* $Id: sockets.c 294029 2010-01-25 23:12:42Z johannes $ */
23
23
 
24
24
#ifdef HAVE_CONFIG_H
25
25
#include "config.h"
41
41
# include "php_sockets.h"
42
42
# include "win32/sockets.h"
43
43
# define IS_INVALID_SOCKET(a)   (a->bsd_socket == INVALID_SOCKET)
 
44
# ifdef EPROTONOSUPPORT
 
45
#  undef EPROTONOSUPPORT
 
46
# endif
 
47
# ifdef ECONNRESET
 
48
#  undef ECONNRESET
 
49
# endif
44
50
# define EPROTONOSUPPORT        WSAEPROTONOSUPPORT
45
51
# define ECONNRESET             WSAECONNRESET
46
52
# ifdef errno
104
110
                                                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, errn, php_strerror(errn TSRMLS_CC))
105
111
 
106
112
static int le_socket;
107
 
#define le_socket_name "Socket"
 
113
#define le_socket_name php_sockets_le_socket_name
108
114
 
109
115
/* {{{ arginfo */
110
116
ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_select, 0, 0, 4)