cvs: php4 /main network.c /win32 php4dllts.dsp
| From: | Wez Furlong | Date: | Fri, 21 Feb 2003 14:06:56 +0000 |
| Subject: | cvs: php4 /main network.c /win32 php4dllts.dsp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19075@lists.php.net to get a copy of this message | ||
wez Fri Feb 21 09:06:56 2003 EDT
Modified files:
/php4/main network.c
/php4/win32 php4dllts.dsp
Log:
Add comment about thread-safety of gethostbyname on win32.
Set the correct path to the win32 config.h file in the .dsp file.
Index: php4/main/network.c
diff -u php4/main/network.c:1.89 php4/main/network.c:1.90
--- php4/main/network.c:1.89 Wed Feb 19 03:40:18 2003
+++ php4/main/network.c Fri Feb 21 09:06:55 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.89 2003/02/19 08:40:18 sniper Exp $ */
+/* $Id: network.c,v 1.90 2003/02/21 14:06:55 wez Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -223,7 +223,9 @@
struct in_addr in;
if (!inet_aton(host, &in)) {
- /* XXX NOT THREAD SAFE */
+ /* XXX NOT THREAD SAFE
+ * (but it *is* thread safe under win32)
+ */
host_info = gethostbyname(host);
if (host_info == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_network_getaddresses: gethostbyname
failed");
Index: php4/win32/php4dllts.dsp
diff -u php4/win32/php4dllts.dsp:1.105 php4/win32/php4dllts.dsp:1.106
--- php4/win32/php4dllts.dsp:1.105 Mon Feb 17 01:28:07 2003
+++ php4/win32/php4dllts.dsp Fri Feb 21 09:06:55 2003
@@ -270,7 +270,7 @@
# End Source File
# Begin Source File
-SOURCE=..\ext\standard\config.w32.h
+SOURCE=..\main\config.w32.h
# End Source File
# Begin Source File
@@ -1876,6 +1876,10 @@
# End Source File
# Begin Source File
+SOURCE=..\ext\standard\php_sunfuncs.h
+# End Source File
+# Begin Source File
+
SOURCE=..\ext\standard\php_syslog.h
# End Source File
# Begin Source File
@@ -1897,10 +1901,6 @@
# Begin Source File
SOURCE=..\ext\standard\sha1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\ext\standard\php_sunfuncs.h
# End Source File
# Begin Source File