[BACK]Return to network.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / main

Diff for /embedaddon/php/main/network.c between versions 1.1.1.1 and 1.1.1.4

version 1.1.1.1, 2012/02/21 23:48:05 version 1.1.1.4, 2014/06/15 20:04:01
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                |   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 148  static const char *php_gai_strerror(int code) Line 148  static const char *php_gai_strerror(int code)
   
 /* {{{ php_network_freeaddresses  /* {{{ php_network_freeaddresses
  */   */
static void php_network_freeaddresses(struct sockaddr **sal)PHPAPI void php_network_freeaddresses(struct sockaddr **sal)
 {  {
         struct sockaddr **sap;          struct sockaddr **sap;
   
Line 163  static void php_network_freeaddresses(struct sockaddr  Line 163  static void php_network_freeaddresses(struct sockaddr 
 /* {{{ php_network_getaddresses  /* {{{ php_network_getaddresses
  * Returns number of addresses, 0 for none/error   * Returns number of addresses, 0 for none/error
  */   */
static int php_network_getaddresses(const char *host, int socktype, struct sockaddr ***sal, char **error_string TSRMLS_DC)PHPAPI int php_network_getaddresses(const char *host, int socktype, struct sockaddr ***sal, char **error_string TSRMLS_DC)
 {  {
         struct sockaddr **sap;          struct sockaddr **sap;
         int n;          int n;
Line 1058  PHPAPI php_stream *_php_stream_sock_open_host(const ch Line 1058  PHPAPI php_stream *_php_stream_sock_open_host(const ch
   
         reslen = spprintf(&res, 0, "tcp://%s:%d", host, port);          reslen = spprintf(&res, 0, "tcp://%s:%d", host, port);
   
        stream = php_stream_xport_create(res, reslen, ENFORCE_SAFE_MODE | REPORT_ERRORS,        stream = php_stream_xport_create(res, reslen, REPORT_ERRORS,
                         STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, persistent_id, timeout, NULL, NULL, NULL);                          STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, persistent_id, timeout, NULL, NULL, NULL);
   
         efree(res);          efree(res);
Line 1076  PHPAPI int php_set_sock_blocking(int socketd, int bloc Line 1076  PHPAPI int php_set_sock_blocking(int socketd, int bloc
         /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */          /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */
         flags = !block;          flags = !block;
         if (ioctlsocket(socketd, FIONBIO, &flags) == SOCKET_ERROR) {          if (ioctlsocket(socketd, FIONBIO, &flags) == SOCKET_ERROR) {
                 char *error_string;  
   
                 error_string = php_socket_strerror(WSAGetLastError(), NULL, 0);  
                 php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", error_string);  
                 efree(error_string);  
                 ret = FAILURE;                  ret = FAILURE;
         }          }
 #else  #else
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>