wez Sat Nov 29 07:02:41 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard fsock.c
/php-src/main network.c php_network.h streams.c
Log:
fix zts build...
Index: php-src/ext/standard/fsock.c
diff -u php-src/ext/standard/fsock.c:1.106.2.10 php-src/ext/standard/fsock.c:1.106.2.11
--- php-src/ext/standard/fsock.c:1.106.2.10 Thu Aug 28 12:01:49 2003
+++ php-src/ext/standard/fsock.c Sat Nov 29 07:02:40 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.106.2.10 2003/08/28 16:01:49 sas Exp $ */
+/* $Id: fsock.c,v 1.106.2.11 2003/11/29 12:02:40 wez Exp $ */
/* converted to PHP Streams and moved much code to main/network.c [wez] */
@@ -160,7 +160,7 @@
switch(php_stream_from_persistent_id(hashkey, &stream TSRMLS_CC)) {
case PHP_STREAM_PERSISTENT_SUCCESS:
- if (_php_network_is_stream_alive(stream)) {
+ if (_php_network_is_stream_alive(stream TSRMLS_CC)) {
php_stream_to_zval(stream, return_value);
} else {
/* it died; we need to replace it */
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.83.2.21 php-src/main/network.c:1.83.2.22
--- php-src/main/network.c:1.83.2.21 Fri Nov 28 17:11:34 2003
+++ php-src/main/network.c Sat Nov 29 07:02:40 2003
@@ -16,7 +16,7 @@
| Streams work by Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.83.2.21 2003/11/28 22:11:34 wez Exp $ */
+/* $Id: network.c,v 1.83.2.22 2003/11/29 12:02:40 wez Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1133,7 +1133,7 @@
}
/* private API; don't use in extensions */
-int _php_network_is_stream_alive(php_stream *stream)
+int _php_network_is_stream_alive(php_stream *stream TSRMLS_DC)
{
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
int alive = 1;
Index: php-src/main/php_network.h
diff -u php-src/main/php_network.h:1.37.2.3 php-src/main/php_network.h:1.37.2.4
--- php-src/main/php_network.h:1.37.2.3 Fri Jun 27 12:42:51 2003
+++ php-src/main/php_network.h Sat Nov 29 07:02:40 2003
@@ -15,7 +15,7 @@
| Author: Stig Venaas <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_network.h,v 1.37.2.3 2003/06/27 16:42:51 sniper Exp $ */
+/* $Id: php_network.h,v 1.37.2.4 2003/11/29 12:02:40 wez Exp $ */
#ifndef _PHP_NETWORK_H
#define _PHP_NETWORK_H
@@ -156,7 +156,7 @@
/* }}} */
/* private API; don't use in extensions */
-int _php_network_is_stream_alive(php_stream *stream);
+int _php_network_is_stream_alive(php_stream *stream TSRMLS_DC);
#ifdef HAVE_OPENSSL_EXT
PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate,
SSL_METHOD *method, php_stream *session_stream TSRMLS_DC);
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.85 php-src/main/streams.c:1.125.2.86
--- php-src/main/streams.c:1.125.2.85 Fri Nov 28 17:48:31 2003
+++ php-src/main/streams.c Sat Nov 29 07:02:40 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.85 2003/11/28 22:48:31 wez Exp $ */
+/* $Id: streams.c,v 1.125.2.86 2003/11/29 12:02:40 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -660,7 +660,7 @@
return 0;
if (!stream->eof && php_stream_is(stream, PHP_STREAM_IS_SOCKET)) {
- stream->eof = !_php_network_is_stream_alive(stream);
+ stream->eof = !_php_network_is_stream_alive(stream TSRMLS_CC);
}
return stream->eof;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
