subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_2\) \/ NEWS \/ext\/sockets sockets.c"

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sockets sockets.c

2009-05-20 Thread Arnaud Le Blanc

lbarnaudWed May 20 09:06:32 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/socketssockets.c 
/php-srcNEWS 
  Log:
  MFH: Fixed bug #48326 (constant MSG_DONTWAIT not defined)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.24r2=1.171.2.9.2.25diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.24 
php-src/ext/sockets/sockets.c:1.171.2.9.2.25
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.24Sun May 10 01:07:01 2009
+++ php-src/ext/sockets/sockets.c   Wed May 20 09:06:31 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.171.2.9.2.24 2009/05/10 01:07:01 felipe Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.25 2009/05/20 09:06:31 lbarnaud Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -484,6 +484,9 @@
REGISTER_LONG_CONSTANT(SOCK_RDM,  SOCK_RDM,   
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_OOB,   MSG_OOB,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_WAITALL,   MSG_WAITALL,CONST_CS | 
CONST_PERSISTENT);
+#ifdef MSG_DONTWAIT
+   REGISTER_LONG_CONSTANT(MSG_DONTWAIT,  MSG_DONTWAIT,   CONST_CS | 
CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT(MSG_PEEK,  MSG_PEEK,   
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_DONTROUTE, MSG_DONTROUTE,  CONST_CS | 
CONST_PERSISTENT);
 #ifdef MSG_EOR
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1514r2=1.2027.2.547.2.1515diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1514 php-src/NEWS:1.2027.2.547.2.1515
--- php-src/NEWS:1.2027.2.547.2.1514Mon May 18 18:46:06 2009
+++ php-src/NEWSWed May 20 09:06:31 2009
@@ -16,6 +16,7 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48326 (constant MSG_DONTWAIT not defined). (Arnaud)
 - Fixed bug #48313 (fgetcsv() does not return null for empty rows). (Ilia)
 - Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not update stream
   position of plain files). (Arnaud)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sockets sockets.c /ext/sockets/tests ipv4loop.phpt ipv6loop.phpt /ext/standard url_scanner_ex.c /main/streams xp_socket.c

2008-07-16 Thread Jani Taskinen

janiWed Jul 16 14:10:50 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/socketssockets.c 
/php-src/ext/sockets/tests  ipv4loop.phpt ipv6loop.phpt 
/php-src/ext/standard   url_scanner_ex.c 
/php-src/main/streams   xp_socket.c 
  Log:
  MFH:- Fixed bug #44127 (UNIX abstract namespace socket connect does not work)
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1175r2=1.2027.2.547.2.1176diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1175 php-src/NEWS:1.2027.2.547.2.1176
--- php-src/NEWS:1.2027.2.547.2.1175Tue Jul 15 14:58:58 2008
+++ php-src/NEWSWed Jul 16 14:10:49 2008
@@ -9,7 +9,8 @@
 - Fixed a crash inside PDO when trying instantiate PDORow manually. (Felipe)
 - Fixed build failure of ext/mysqli with libmysql 6.0 - missing rpl
   functions. (Andrey)
-- Fixed a regression when using strip_tags() and  is within an attribute. 
(Scott)
+- Fixed a regression when using strip_tags() and  is within an attribute.
+  (Scott)
 
 - Fixed bug #45486 (mb_send_mail(); header 'Content-Type: text/plain; 
charset=' 
   parsing incorrect). (Felipe)
@@ -42,6 +43,8 @@
 - Fixed bug #44716 (Progress notifications incorrect). (Hannes)
 - Fixed bug #44712 (stream_context_set_params segfaults on invalid arguments).
   (Hannes)
+- Fixed bug #44127 (UNIX abstract namespace socket connect does not work).
+  (Jani)
 - Fixed bug #41348 (OCI8: allow compilation with Oracle 8.1). (Chris Jones)
 
 01 May 2008, PHP 5.2.6
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.18r2=1.171.2.9.2.19diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.18 
php-src/ext/sockets/sockets.c:1.171.2.9.2.19
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.18Tue Jul 15 11:20:06 2008
+++ php-src/ext/sockets/sockets.c   Wed Jul 16 14:10:50 2008
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.171.2.9.2.18 2008/07/15 11:20:06 felipe Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.19 2008/07/16 14:10:50 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1170,8 +1170,8 @@
memset(s_un, 0, sizeof(struct sockaddr_un));
 
s_un.sun_family = AF_UNIX;
-   snprintf(s_un.sun_path, 108, %s, addr);
-   retval = connect(php_sock-bsd_socket, (struct sockaddr 
*) s_un, SUN_LEN(s_un));
+   memcpy(s_un.sun_path, addr, addr_len);
+   retval = connect(php_sock-bsd_socket, (struct sockaddr 
*) s_un, (socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + addr_len);
break;
 
default:
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv4loop.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/ext/sockets/tests/ipv4loop.phpt
diff -u php-src/ext/sockets/tests/ipv4loop.phpt:1.1 
php-src/ext/sockets/tests/ipv4loop.phpt:1.1.6.1
--- php-src/ext/sockets/tests/ipv4loop.phpt:1.1 Thu Apr 17 23:09:17 2003
+++ php-src/ext/sockets/tests/ipv4loop.phpt Wed Jul 16 14:10:50 2008
@@ -3,7 +3,7 @@
 --SKIPIF--
 ?php
if (!extension_loaded('sockets')) {
-   die('skip sockets extenion not available.');
+   die('skip sockets extension not available.');
}
 ?
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.2.6.1r2=1.2.6.2diff_format=u
Index: php-src/ext/sockets/tests/ipv6loop.phpt
diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1 
php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.2
--- php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1 Mon Feb 12 14:49:04 2007
+++ php-src/ext/sockets/tests/ipv6loop.phpt Wed Jul 16 14:10:50 2008
@@ -3,7 +3,7 @@
 --SKIPIF--
 ?php
if (!extension_loaded('sockets')) {
-   die('skip sockets extenion not available.');
+   die('skip sockets extension not available.');
}
if (!defined(AF_INET6)) {
die('skip no IPv6 support');
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.95.2.4.2.6r2=1.95.2.4.2.7diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.6 
php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.7
--- php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.6  Wed Mar 12 11:27:42 2008
+++ php-src/ext/standard/url_scanner_ex.c   Wed Jul 16 14:10:50 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Wed Oct 10 12:28:46 2007 */
+/* Generated by re2c 0.13.5 on Wed Jul  2 12:48:53 2008 */
 #line 1 ext/standard/url_scanner_ex.re
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.95.2.4.2.6 2008/03/12 11:27:42 felipe Exp $ */
+/* $Id:

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sockets sockets.c

2008-02-20 Thread Felipe Pena

felipe  Thu Feb 21 02:34:50 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/socketssockets.c 
/php-srcNEWS 
  Log:
  Fixed Bug #44197 (socket array keys lost on socket_select)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.15r2=1.171.2.9.2.16diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.15 
php-src/ext/sockets/sockets.c:1.171.2.9.2.16
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.15Mon Dec 31 07:20:11 2007
+++ php-src/ext/sockets/sockets.c   Thu Feb 21 02:34:50 2008
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.171.2.9.2.15 2007/12/31 07:20:11 sebastian Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.16 2008/02/21 02:34:50 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -584,7 +584,10 @@
zval**dest_element;
php_socket  *php_sock;
HashTable   *new_hash;
-   int num = 0;
+   char*key;
+   int num;
+   ulong   num_key;
+   uintkey_len;
 
if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0;
 
@@ -599,7 +602,14 @@
 
if (PHP_SAFE_FD_ISSET(php_sock-bsd_socket, fds)) {
/* Add fd to new array */
-   zend_hash_next_index_insert(new_hash, (void *)element, 
sizeof(zval *), (void **)dest_element);
+   switch 
(zend_hash_get_current_key_ex(Z_ARRVAL_P(sock_array), key, key_len, num_key, 
0, NULL)) {
+   case HASH_KEY_IS_STRING:
+   zend_hash_add(new_hash, key, key_len, 
(void *)element, sizeof(zval *), (void **)dest_element);
+   break;
+   case HASH_KEY_IS_LONG:
+   zend_hash_index_update(new_hash, 
num_key, (void *)element, sizeof(zval *), (void **)dest_element);
+   break;
+   }
if (dest_element) zval_add_ref(dest_element);
}
num++;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1087r2=1.2027.2.547.2.1088diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1087 php-src/NEWS:1.2027.2.547.2.1088
--- php-src/NEWS:1.2027.2.547.2.1087Wed Feb 20 22:08:18 2008
+++ php-src/NEWSThu Feb 21 02:34:50 2008
@@ -11,6 +11,7 @@
 - Upgraded PCRE to version 7.6 (Nuno)
 
 
+- Fixed Bug #44197 (socket array keys lost on socket_select). (Felipe)
 - Fixed Bug #44191 (preg_grep messes up array index). (Felipe)
 - Fixed bug #44184 (Double free of loop-variable on exception). (Dmitry)
 - Fixed bug #44171 (Invalid FETCH_COLUMN index does not raise an error). (Ilia)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sockets sockets.c

2007-07-24 Thread Jani Taskinen

janiTue Jul 24 11:35:08 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/socketssockets.c 
  Log:
  MFH:- Added missing MSG_EOR and MSG_EOF constants
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.849r2=1.2027.2.547.2.850diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.849 php-src/NEWS:1.2027.2.547.2.850
--- php-src/NEWS:1.2027.2.547.2.849 Tue Jul 24 09:27:46 2007
+++ php-src/NEWSTue Jul 24 11:35:08 2007
@@ -30,6 +30,7 @@
 - Added missing error check inside bcpowmod(). (Ilia)
 - Added CURLOPT_PRIVATE  CURLINFO_PRIVATE constants. 
   (Andrey A. Belashkov, Tony)
+- Added missing MSG_EOR and MSG_EOF constants to sockets extension. (Jani)
 
 - Implemented FR #41884 (ReflectionClass::getDefaultProperties() does not 
handle 
   static attributes). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.12r2=1.171.2.9.2.13diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.12 
php-src/ext/sockets/sockets.c:1.171.2.9.2.13
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.12Sun Jul 22 23:01:20 2007
+++ php-src/ext/sockets/sockets.c   Tue Jul 24 11:35:08 2007
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.171.2.9.2.12 2007/07/22 23:01:20 jani Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.13 2007/07/24 11:35:08 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -68,6 +68,12 @@
 #endif
 #endif
 
+#ifndef MSG_EOF
+#ifdef MSG_FIN
+#define MSG_EOF MSG_FIN
+#endif
+#endif
+
 #ifndef SUN_LEN
 #define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)-sun_path) + 
strlen((su)-sun_path))
 #endif
@@ -480,6 +486,12 @@
REGISTER_LONG_CONSTANT(MSG_WAITALL,   MSG_WAITALL,CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_PEEK,  MSG_PEEK,   
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_DONTROUTE, MSG_DONTROUTE,  CONST_CS | 
CONST_PERSISTENT);
+#ifdef MSG_EOR
+   REGISTER_LONG_CONSTANT(MSG_EOR,   MSG_EOR,
CONST_CS | CONST_PERSISTENT);
+#endif
+#ifdef MSG_EOF
+   REGISTER_LONG_CONSTANT(MSG_EOF,   MSG_EOF,
CONST_CS | CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT(SO_DEBUG,  SO_DEBUG,   
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SO_REUSEADDR,  SO_REUSEADDR,   CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SO_KEEPALIVE,  SO_KEEPALIVE,   CONST_CS | 
CONST_PERSISTENT);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sockets sockets.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sockets sockets.c /ext/sockets/tests ipv4loop.phpt ipv6loop.phpt /ext/standard url_scanner_ex.c /main/streams xp_socket.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sockets sockets.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sockets sockets.c

4 matches

Site Navigation

Mail list logo

Footer information