sniper Mon Feb 14 03:25:30 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src php.ini-dist php.ini-recommended
/php-src/ext/sockets php_sockets.h
Log:
MFH: nuke unused code + non-existing ini option
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.215.2.6&r2=1.215.2.7&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.215.2.6 php-src/php.ini-dist:1.215.2.7
--- php-src/php.ini-dist:1.215.2.6 Sun Nov 28 08:22:11 2004
+++ php-src/php.ini-dist Mon Feb 14 03:25:30 2005
@@ -1088,10 +1088,6 @@
; Default proxy password.
;pfpro.proxypassword =
-[Sockets]
-; Use the system read() function instead of the php_read() wrapper.
-sockets.use_system_read = On
-
[com]
; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
;com.typelib_file =
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.159.2.6&r2=1.159.2.7&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.159.2.6
php-src/php.ini-recommended:1.159.2.7
--- php-src/php.ini-recommended:1.159.2.6 Sun Nov 28 08:22:11 2004
+++ php-src/php.ini-recommended Mon Feb 14 03:25:30 2005
@@ -1146,10 +1146,6 @@
; Default proxy password.
;pfpro.proxypassword =
-[Sockets]
-; Use the system read() function instead of the php_read() wrapper.
-sockets.use_system_read = On
-
[com]
; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
;com.typelib_file =
http://cvs.php.net/diff.php/php-src/ext/sockets/php_sockets.h?r1=1.34&r2=1.34.2.1&ty=u
Index: php-src/ext/sockets/php_sockets.h
diff -u php-src/ext/sockets/php_sockets.h:1.34
php-src/ext/sockets/php_sockets.h:1.34.2.1
--- php-src/ext/sockets/php_sockets.h:1.34 Thu Jan 8 12:32:48 2004
+++ php-src/ext/sockets/php_sockets.h Mon Feb 14 03:25:30 2005
@@ -22,7 +22,7 @@
#ifndef PHP_SOCKETS_H
#define PHP_SOCKETS_H
-/* $Id: php_sockets.h,v 1.34 2004/01/08 17:32:48 sniper Exp $ */
+/* $Id: php_sockets.h,v 1.34.2.1 2005/02/14 08:25:30 sniper Exp $ */
#if HAVE_SOCKETS
@@ -82,10 +82,6 @@
int error;
} php_socket;
-typedef struct {
- zend_bool use_system_read;
-} php_sockets_globals;
-
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
static int php_open_listen_sock(php_socket **php_sock, int port, int backlog
TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
