subject:"\[PHP\-CVS\] cvs\: php4 \/ configure.in"

[PHP-CVS] cvs: php4 / configure.in

2001-04-23 Thread Jani Taskinen


sniper  Mon Apr 23 00:32:36 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Fixed bugs: #10194, #9177. 
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.237 php4/configure.in:1.238
--- php4/configure.in:1.237 Sun Apr 22 23:00:43 2001
+++ php4/configure.in   Mon Apr 23 00:32:35 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.237 2001/04/23 06:00:43 rasmus Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.238 2001/04/23 07:32:35 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -240,10 +240,6 @@
 
 fi
 
-AC_CHECK_LIB(crypt, crypt, [
- PHP_ADD_LIBRARY(crypt)
- AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) ], [])
-
 AC_CHECK_LIB(dl, dlopen,[PHP_ADD_LIBRARY(dl)])
 
 dnl The sin may be in a library which need not be specifed
@@ -600,6 +596,12 @@
 if test $PHP_PHP_STREAMS = yes; then
   AC_DEFINE(HAVE_PHP_STREAM, 1, [Whether to use php streams])
 fi
+
+AC_CHECK_LIB(crypt, crypt, [
+ PHP_ADD_LIBRARY(crypt)
+ AC_DEFINE(HAVE_LIBCRYPT,1,[ ]) 
+ AC_DEFINE(HAVE_CRYPT,1,[ ]) 
+], [])
 
 divert(5)
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-04-22 Thread Rasmus Lerdorf


rasmus  Sun Apr 22 23:00:43 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Uh, weird typo.  Wonder when that crept in.
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.236 php4/configure.in:1.237
--- php4/configure.in:1.236 Sat Apr 21 18:16:25 2001
+++ php4/configure.in   Sun Apr 22 23:00:43 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.236 2001/04/22 01:16:25 ssb Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.237 2001/04/23 06:00:43 rasmus Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -252,7 +252,7 @@
 
 dnl Only include libbind if inet_aton is not found in 
 dnl libresolv.
-AC_CHECK_LIB(resolv, inet_aton. [], [
+AC_CHECK_LIB(resolv, inet_aton, [], [
   AC_CHECK_LIB(bind, inet_aton, [], [
 AC_CHECK_LIB(bind, __inet_aton)
   ])



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-04-17 Thread Wez Furlong


wez Tue Apr 17 10:01:33 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Added --enable-php-streams option for experimental file abstraction
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.233 php4/configure.in:1.234
--- php4/configure.in:1.233 Mon Apr  9 08:47:16 2001
+++ php4/configure.in   Tue Apr 17 10:01:33 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.233 2001/04/09 15:47:16 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.234 2001/04/17 17:01:33 wez Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -599,6 +599,14 @@
   PEAR_DIR=pear
 fi
 
+# temporary until streams are better integrated
+PHP_ARG_ENABLE(php-streams,whether to enable php streams,
+[  --enable-php-streamsInclude experimental php streams.
+  Do not use unless you are testing the code!])
+
+if test "$PHP_PHP_STREAMS" = "yes"; then
+  AC_DEFINE(HAVE_PHP_STREAM, 1, [Whether to use php streams])
+fi
 
 divert(5)
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-04-09 Thread Sascha Schumann


sas Mon Apr  9 04:35:10 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Fix current CVS breakage
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.231 php4/configure.in:1.232
--- php4/configure.in:1.231 Sun Apr  8 15:30:16 2001
+++ php4/configure.in   Mon Apr  9 04:35:10 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.231 2001/04/08 22:30:16 ssb Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.232 2001/04/09 11:35:10 sas Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -603,6 +603,7 @@
 # reading config stubs
 esyscmd(./scripts/config-stubs ext)
 
+test "$PHP_SAPI" != "cgi"  PHP_FAST_OUTPUT(sapi/cgi/Makefile)
 PHP_FAST_OUTPUT(sapi/$PHP_SAPI/Makefile)
 
 AC_MSG_CHECKING(whether to enable versioning)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-04-06 Thread Jon Parise


jon Fri Apr  6 09:01:20 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Fix expansion of PEAR_INSTALLDIR.
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.229 php4/configure.in:1.230
--- php4/configure.in:1.229 Wed Apr  4 13:52:43 2001
+++ php4/configure.in   Fri Apr  6 09:01:20 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.229 2001/04/04 20:52:43 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.230 2001/04/06 16:01:20 jon Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -717,9 +717,9 @@
   PEAR_INSTALLDIR="$prefix/lib/php"
 fi
 
-EXTENSION_DIR="\${PEAR_INSTALLDIR}/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO"
+EXTENSION_DIR="${PEAR_INSTALLDIR}/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO"
 
-INCLUDE_PATH=".:\${PEAR_INSTALLDIR}"
+INCLUDE_PATH=".:${PEAR_INSTALLDIR}"
 
 PHP_BUILD_RPATH
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in /main php_version.h

2001-04-04 Thread Jani Taskinen


sniper  Wed Apr  4 13:52:44 2001 EDT

  Modified files:  
/php4   configure.in 
/php4/main  php_version.h 
  Log:
  This branch is 4.0.6-dev..
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.228 php4/configure.in:1.229
--- php4/configure.in:1.228 Tue Apr  3 13:59:44 2001
+++ php4/configure.in   Wed Apr  4 13:52:43 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.228 2001/04/03 20:59:44 wsanchez Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.229 2001/04/04 20:52:43 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -51,7 +51,7 @@
 dnl ## Diversion 5 is the last one.  Here we generate files and clean up.
 
 dnl ## This is where the version number is changed from now on!
-AM_INIT_AUTOMAKE(php, 4.0.5-dev, nodefine)
+AM_INIT_AUTOMAKE(php, 4.0.6-dev, nodefine)
 
 PHP_VERSION=$VERSION
 echo "/* automatically generated by configure */"  php_version.h.new
Index: php4/main/php_version.h
diff -u php4/main/php_version.h:1.44 php4/main/php_version.h:1.45
--- php4/main/php_version.h:1.44Sat Dec  2 00:21:10 2000
+++ php4/main/php_version.h Wed Apr  4 13:52:44 2001
@@ -1,3 +1,3 @@
 /* automatically generated by configure */
 /* edit configure.in to change version number */
-#define PHP_VERSION "4.0.5-dev"
+#define PHP_VERSION "4.0.6-dev"



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-03-28 Thread Jani Taskinen


sniper  Wed Mar 28 14:30:22 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Make file() work again. 
  # For some reason if libbind is linked with PHP the file() function 
  # won't work with URLs. Do we even need libbind?
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.226 php4/configure.in:1.227
--- php4/configure.in:1.226 Tue Mar 27 12:34:22 2001
+++ php4/configure.in   Wed Mar 28 14:30:21 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.226 2001/03/27 20:34:22 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.227 2001/03/28 22:30:21 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -250,14 +250,13 @@
 dnl as well as res_search resides in libsocket
 AC_CHECK_LIB(m, sin)
 
-AC_CHECK_LIB(bind, inet_aton, [
-  PHP_ADD_LIBRARY(bind)
-  AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], [
-AC_CHECK_LIB(bind, __inet_aton, [], [
-  AC_CHECK_LIB(resolv, inet_aton)
-])
+dnl Only include libbind if inet_aton is not found in 
+dnl libresolv.
+AC_CHECK_LIB(resolv, inet_aton. [], [
+  AC_CHECK_LIB(bind, inet_aton, [], [
+AC_CHECK_LIB(bind, __inet_aton)
   ])
-
+])
 
 dnl The res_search may be in libsocket as well, and if it is
 dnl make sure to check for dn_skipname in libresolv, or if res_search



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-03-26 Thread Jani Taskinen


sniper  Mon Mar 26 13:34:59 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Fixed the problem with libbind (again).
  
Index: php4/configure.in
diff -u php4/configure.in:1.224 php4/configure.in:1.225
--- php4/configure.in:1.224 Thu Mar 22 20:56:51 2001
+++ php4/configure.in   Mon Mar 26 13:34:59 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.224 2001/03/23 04:56:51 svanegmond Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.225 2001/03/26 21:34:59 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -253,9 +253,10 @@
 AC_CHECK_LIB(bind, inet_aton, [
   AC_ADD_LIBRARY(bind)
   AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], [
-AC_CHECK_LIB(resolv, inet_aton)
+AC_CHECK_LIB(bind, __inet_aton, [], [
+  AC_CHECK_LIB(resolv, inet_aton)
+])
   ])
-AC_CHECK_LIB(bind, __inet_aton)
 
 
 dnl The res_search may be in libsocket as well, and if it is



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-03-22 Thread Stephen van Egmond


svanegmond  Thu Mar 22 20:56:51 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Added configuration for detecting the BeOS thread implementation 
  (which will be used once I get my patches into Zend to use bthreads).
  
  Also, a check for a library distributed with the new BeOS networking
  environment.
  
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.223 php4/configure.in:1.224
--- php4/configure.in:1.223 Mon Mar 19 03:03:29 2001
+++ php4/configure.in   Thu Mar 22 20:56:51 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.223 2001/03/19 11:03:29 joosters Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.224 2001/03/23 04:56:51 svanegmond Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -107,7 +107,8 @@
 *bsdi*)
 BSD_MAKEFILE=yes;;
 *beos*)
-   LIBS="$LIBS -lbe -lroot"
+   beos_threads=1
+   LIBS="$LIBS -lbe -lroot";;
 esac
 
 AM_PROG_CC_STDC
@@ -253,7 +254,9 @@
   AC_ADD_LIBRARY(bind)
   AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], [
 AC_CHECK_LIB(resolv, inet_aton)
-  ]) 
+  ])
+AC_CHECK_LIB(bind, __inet_aton)
+
 
 dnl The res_search may be in libsocket as well, and if it is
 dnl make sure to check for dn_skipname in libresolv, or if res_search



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-03-10 Thread Jani Taskinen


sniper  Sat Mar 10 19:46:25 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Check for inet_aton only if libbind is not found (or inet_aton is not in 
  libbind). Fixes bug: #8814
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.220 php4/configure.in:1.221
--- php4/configure.in:1.220 Tue Mar  6 08:51:53 2001
+++ php4/configure.in   Sat Mar 10 19:46:24 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.220 2001/03/06 16:51:53 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.221 2001/03/11 03:46:24 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -251,9 +251,9 @@
 
 AC_CHECK_LIB(bind, inet_aton, [
   AC_ADD_LIBRARY(bind)
-  AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], []) 
-
-AC_CHECK_LIB(resolv, inet_aton)
+  AC_DEFINE(HAVE_LIBBIND,1,[Whether you have bind]) ], [
+AC_CHECK_LIB(resolv, inet_aton)
+  ]) 
 
 dnl The res_search may be in libsocket as well, and if it is
 dnl make sure to check for dn_skipname in libresolv, or if res_search



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in /build build2.mk

2001-03-06 Thread Sascha Schumann


sas Tue Mar  6 08:51:53 2001 EDT

  Modified files:  
/php4   configure.in 
/php4/build build2.mk 
  Log:
  Replace AM_PROG_LEX with a separated call to AC_PROG_LEX and AC_DECL_YYTEXT.
  The latter is only called, if lex was found, so that PHP configures now
  on setups without (f)lex.
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.219 php4/configure.in:1.220
--- php4/configure.in:1.219 Mon Feb 26 10:14:27 2001
+++ php4/configure.in   Tue Mar  6 08:51:53 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.219 2001/02/26 18:14:27 andi Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.220 2001/03/06 16:51:53 sas Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -116,7 +116,10 @@
 AC_PROG_CC_C_O
 AC_PROG_LN_S
 
-AM_PROG_LEX
+AC_PROG_LEX
+if test -n "$LEX"; then
+  AC_DECL_YYTEXT
+fi
 
 dnl ## Make flex scanners use const if they can, even if __STDC__ is not
 dnl ## true, for compilers like Sun's that only set __STDC__ true in
Index: php4/build/build2.mk
diff -u php4/build/build2.mk:1.17 php4/build/build2.mk:1.18
--- php4/build/build2.mk:1.17   Wed Feb  7 16:49:24 2001
+++ php4/build/build2.mkTue Mar  6 08:51:53 2001
@@ -14,7 +14,7 @@
 #  | Authors: Sascha Schumann [EMAIL PROTECTED]|
 #  +--+
 #
-# $Id: build2.mk,v 1.17 2001/02/08 00:49:24 sas Exp $ 
+# $Id: build2.mk,v 1.18 2001/03/06 16:51:53 sas Exp $ 
 #
 
 include generated_lists
@@ -54,14 +54,13 @@
fi; \
done
@test -f want_dependencies || flag=-i; \
-   automake -a $$flag $(AMFLAGS) $(makefile_files) \
-   || true 2
+   automake -a $$flag $(AMFLAGS) $(makefile_files) 21 | $(SUPPRESS_WARNINGS)
@for i in $(LT_TARGETS); do mv $$i.bak $$i; done
 
 aclocal.m4: configure.in acinclude.m4 dynlib.m4
aclocal
 
-SUPPRESS_WARNINGS = (egrep -v '(warning: AC_TRY_RUN called without default to allow 
cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX)'||true)
+SUPPRESS_WARNINGS = (egrep -v '(warning: AC_TRY_RUN called without default to allow 
+cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|.*AM_PROG_LEX.*)'||true)

 $(config_h_in): configure acconfig.h
 # explicitly remove target since autoheader does not seem to work 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in /ext/gettext php_gettext.h /ext/icap php_icap.c /ext/imap php_imap.h /ext/mcal php_mcal.c /ext/mcrypt php_mcrypt.h /ext/mhash php_mhash.h /ext/midgard php_midgard.h /ext/ovrimos php_ovrimos.h /main internal_functions.c.in internal_functions_win32.c php.h /sapi/cgi cgi_main.c

2001-02-26 Thread Andi Gutmans


andiMon Feb 26 10:14:32 2001 EDT

  Modified files:  
/php4   configure.in 
/php4/ext/gettext   php_gettext.h 
/php4/ext/icap  php_icap.c 
/php4/ext/imap  php_imap.h 
/php4/ext/mcal  php_mcal.c 
/php4/ext/mcryptphp_mcrypt.h 
/php4/ext/mhash php_mhash.h 
/php4/ext/midgard   php_midgard.h 
/php4/ext/ovrimos   php_ovrimos.h 
/php4/main  internal_functions.c.in internal_functions_win32.c php.h 
/php4/sapi/cgi  cgi_main.c 
  Log:
  - Finally rename modules.h to zend_modules.h for consistency (first try
was 2000-03-11).
  - Remove the first_arg_force_ref[]; and friends extern from php.h as they
are included via zend_API.h
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.218 php4/configure.in:1.219
--- php4/configure.in:1.218 Wed Feb 14 21:21:27 2001
+++ php4/configure.in   Mon Feb 26 10:14:27 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.218 2001/02/15 05:21:27 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.219 2001/02/26 18:14:27 andi Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -699,7 +699,7 @@
   PART2=non-zts
 fi
 
-ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/modules.h|sed 
's/#define ZEND_MODULE_API_NO //'`
+ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' 
+$srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
 
 EXTENSION_DIR="$prefix/lib/php/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO"
 
Index: php4/ext/gettext/php_gettext.h
diff -u php4/ext/gettext/php_gettext.h:1.10 php4/ext/gettext/php_gettext.h:1.11
--- php4/ext/gettext/php_gettext.h:1.10 Sun Feb 25 22:06:56 2001
+++ php4/ext/gettext/php_gettext.h  Mon Feb 26 10:14:28 2001
@@ -16,14 +16,14 @@
+--+
 */
 
-/* $Id: php_gettext.h,v 1.10 2001/02/26 06:06:56 andi Exp $ */
+/* $Id: php_gettext.h,v 1.11 2001/02/26 18:14:28 andi Exp $ */
 
 #ifndef PHP_GETTEXT_H
 #define PHP_GETTEXT_H
 
 #if HAVE_LIBINTL
 #ifndef INIT_FUNC_ARGS
-#include "modules.h"
+#include "zend_modules.h"
 #endif
 
 extern zend_module_entry php_gettext_module_entry;
Index: php4/ext/icap/php_icap.c
diff -u php4/ext/icap/php_icap.c:1.21 php4/ext/icap/php_icap.c:1.22
--- php4/ext/icap/php_icap.c:1.21   Wed Oct 25 10:43:51 2000
+++ php4/ext/icap/php_icap.cMon Feb 26 10:14:28 2001
@@ -45,7 +45,7 @@
 #include stdarg.h
 #include "cal.h"
 #include "php_icap.h"
-#include "modules.h"
+#include "zend_modules.h"
 #include "ext/standard/info.h"
 #include "ext/standard/basic_functions.h"
 #ifdef PHP_WIN32
Index: php4/ext/imap/php_imap.h
diff -u php4/ext/imap/php_imap.h:1.7 php4/ext/imap/php_imap.h:1.8
--- php4/ext/imap/php_imap.h:1.7Mon Feb 26 07:17:12 2001
+++ php4/ext/imap/php_imap.hMon Feb 26 10:14:28 2001
@@ -15,7 +15,7 @@
  #include "rfc822.h" 
 #endif
 
-#include "modules.h"
+#include "zend_modules.h"
 
 extern zend_module_entry imap_module_entry;
 #define imap_module_ptr imap_module_entry
Index: php4/ext/mcal/php_mcal.c
diff -u php4/ext/mcal/php_mcal.c:1.40 php4/ext/mcal/php_mcal.c:1.41
--- php4/ext/mcal/php_mcal.c:1.40   Sun Feb 25 22:07:01 2001
+++ php4/ext/mcal/php_mcal.cMon Feb 26 10:14:28 2001
@@ -34,7 +34,7 @@
 #include stdarg.h
 #include "mcal.h"
 #include "php_mcal.h"
-#include "modules.h"
+#include "zend_modules.h"
 #include "ext/standard/info.h"
 #include "ext/standard/basic_functions.h"
 #ifdef PHP_WIN32
Index: php4/ext/mcrypt/php_mcrypt.h
diff -u php4/ext/mcrypt/php_mcrypt.h:1.15 php4/ext/mcrypt/php_mcrypt.h:1.16
--- php4/ext/mcrypt/php_mcrypt.h:1.15   Sun Aug 13 04:53:04 2000
+++ php4/ext/mcrypt/php_mcrypt.hMon Feb 26 10:14:29 2001
@@ -9,7 +9,7 @@
 
 #if PHP_API_VERSION  19990421
 #define  zend_module_entry zend_module_entry
-#include "modules.h"
+#include "zend_modules.h"
 #include "internal_functions.h"
 #endif
 
Index: php4/ext/mhash/php_mhash.h
diff -u php4/ext/mhash/php_mhash.h:1.6 php4/ext/mhash/php_mhash.h:1.7
--- php4/ext/mhash/php_mhash.h:1.6  Wed Oct 25 11:09:23 2000
+++ php4/ext/mhash/php_mhash.h  Mon Feb 26 10:14:29 2001
@@ -5,7 +5,7 @@
 
 #if PHP_API_VERSION  19990421
 #define  zend_module_entry zend_module_entry
-#include "modules.h"
+#include "zend_modules.h"
 #include "internal_functions.h"
 #endif
 
Index: php4/ext/midgard/php_midgard.h
diff -u php4/ext/midgard/php_midgard.h:1.6 php4/ext/midgard/php_midgard.h:1.7
--- php4/ext/midgard/php_midgard.h:1.6  Sat Feb 24 13:12:11 2001
+++ php4/ext/midgard/php_midgard.h  Mon Feb 26 10:14:29 2001
@@ -1,4 +1,4 @@
-/* $Id: php_midgard.h,v 1.6 2001/02/24 21:12:11 davidg Exp $
+/* $Id: php_midgard.h,v 1.7 2001/02/26 18:14:29 andi Exp $
 Copyright (C) 1999 Jukka Zitting [EMAIL PROTECTED]
 Copyright (C) 2000 The Midgard Project ry
 Copyright (C) 2000 Emile Heyns, Aurora SA [EMAIL PROTECTED]
@@ -31,7 +31,7 @@
 #include php.h
 #include midgard/midgard.h
 #include midgard/apache.h

Re: [PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.cdir.c php_dir.h

2001-02-15 Thread Derick Rethans


On Thu, 15 Feb 2001, Sascha Schumann wrote:

   There might be more systems which do not support chroot, so we check
   for the existence of it.

   Additionally, if chroot is not supported, the warn_not_available function
   is invoked now.

Thanx Sascha, I hope it's now really fixed :)

Derick Rethans

-
  PHP: Scripting the Web - www.php.net - [EMAIL PROTECTED]
-


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.c dir.c php_dir.h

2001-02-14 Thread Sascha Schumann


sas Wed Feb 14 21:21:28 2001 EDT

  Modified files:  
/php4   configure.in 
/php4/ext/standard  php_dir.h dir.c basic_functions.c 
  Log:
  There might be more systems which do not support chroot, so we check
  for the existence of it.
  
  Additionally, if chroot is not supported, the warn_not_available function
  is invoked now.
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.217 php4/configure.in:1.218
--- php4/configure.in:1.217 Mon Feb  5 16:03:44 2001
+++ php4/configure.in   Wed Feb 14 21:21:27 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.217 2001/02/06 00:03:44 svanegmond Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.218 2001/02/15 05:21:27 sas Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -358,6 +358,7 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(
 asctime_r \
+chroot \
 crypt \
 ctime_r \
 cuserid \
Index: php4/ext/standard/php_dir.h
diff -u php4/ext/standard/php_dir.h:1.13 php4/ext/standard/php_dir.h:1.14
--- php4/ext/standard/php_dir.h:1.13Wed Feb 14 16:43:44 2001
+++ php4/ext/standard/php_dir.h Wed Feb 14 21:21:27 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_dir.h,v 1.13 2001/02/15 00:43:44 derick Exp $ */
+/* $Id: php_dir.h,v 1.14 2001/02/15 05:21:27 sas Exp $ */
 
 #ifndef PHP_DIR_H
 #define PHP_DIR_H
@@ -28,7 +28,7 @@
 PHP_FUNCTION(opendir);
 PHP_FUNCTION(closedir);
 PHP_FUNCTION(chdir);
-#if !defined(ZEND_WIN32)!defined(ZTS)
+#if defined(HAVE_CHROOT)  !defined(ZTS)
 PHP_FUNCTION(chroot);
 #endif
 PHP_FUNCTION(getcwd);
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.55 php4/ext/standard/dir.c:1.56
--- php4/ext/standard/dir.c:1.55Wed Feb 14 16:43:44 2001
+++ php4/ext/standard/dir.c Wed Feb 14 21:21:27 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.55 2001/02/15 00:43:44 derick Exp $ */
+/* $Id: dir.c,v 1.56 2001/02/15 05:21:27 sas Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -223,7 +223,7 @@
 
 /* }}} */
 
-#if !defined(ZEND_WIN32)!defined(ZTS)
+#if defined(HAVE_CHROOT)  !defined(ZTS)
 /* {{{ proto int chroot(string directory)
Change root directory */
 
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.304 
php4/ext/standard/basic_functions.c:1.305
--- php4/ext/standard/basic_functions.c:1.304   Wed Feb 14 16:43:44 2001
+++ php4/ext/standard/basic_functions.c Wed Feb 14 21:21:27 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.304 2001/02/15 00:43:44 derick Exp $ */
+/* $Id: basic_functions.c,v 1.305 2001/02/15 05:21:27 sas Exp $ */
 
 #include "php.h"
 #include "php_main.h"
@@ -465,8 +465,10 @@
PHP_FE(opendir, NULL)
PHP_FE(closedir,NULL)
PHP_FE(chdir,   NULL)
-#if !defined(ZEND_WIN32)!defined(ZTS)
+#if defined(HAVE_CHROOT)  !defined(ZTS)
PHP_FE(chroot,  NULL)
+#else
+   PHP_FALIAS(chroot, warn_not_available, NULL)
 #endif
PHP_FE(getcwd,  NULL)
PHP_FE(rewinddir,   NULL)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Re: [PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.c dir.c php_dir.h

2001-02-14 Thread Andi Gutmans


ZTS is 0 or 1 but always defined.
So that needs to be changed. I'd do it but I'm very late for something and 
need to run.
Andi


At 05:21 AM 2/15/2001 +, Sascha Schumann wrote:
sas Wed Feb 14 21:21:28 2001 EDT

   Modified files:
 /php4   configure.in
 /php4/ext/standard  php_dir.h dir.c basic_functions.c
   Log:
   There might be more systems which do not support chroot, so we check
   for the existence of it.

   Additionally, if chroot is not supported, the warn_not_available function
   is invoked now.


Index: php4/configure.in
diff -u php4/configure.in:1.217 php4/configure.in:1.218
--- php4/configure.in:1.217 Mon Feb  5 16:03:44 2001
+++ php4/configure.in   Wed Feb 14 21:21:27 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.217 2001/02/06 00:03:44 svanegmond Exp $ -*- 
sh -*-
+dnl ## $Id: configure.in,v 1.218 2001/02/15 05:21:27 sas Exp $ -*- sh -*-
  dnl ## Process this file with autoconf to produce a configure script.

  divert(1)
@@ -358,6 +358,7 @@
  AC_FUNC_VPRINTF
  AC_CHECK_FUNCS(
  asctime_r \
+chroot \
  crypt \
  ctime_r \
  cuserid \
Index: php4/ext/standard/php_dir.h
diff -u php4/ext/standard/php_dir.h:1.13 php4/ext/standard/php_dir.h:1.14
--- php4/ext/standard/php_dir.h:1.13Wed Feb 14 16:43:44 2001
+++ php4/ext/standard/php_dir.h Wed Feb 14 21:21:27 2001
@@ -17,7 +17,7 @@
 +--+
   */

-/* $Id: php_dir.h,v 1.13 2001/02/15 00:43:44 derick Exp $ */
+/* $Id: php_dir.h,v 1.14 2001/02/15 05:21:27 sas Exp $ */

  #ifndef PHP_DIR_H
  #define PHP_DIR_H
@@ -28,7 +28,7 @@
  PHP_FUNCTION(opendir);
  PHP_FUNCTION(closedir);
  PHP_FUNCTION(chdir);
-#if !defined(ZEND_WIN32)!defined(ZTS)
+#if defined(HAVE_CHROOT)  !defined(ZTS)
  PHP_FUNCTION(chroot);
  #endif
  PHP_FUNCTION(getcwd);
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.55 php4/ext/standard/dir.c:1.56
--- php4/ext/standard/dir.c:1.55Wed Feb 14 16:43:44 2001
+++ php4/ext/standard/dir.c Wed Feb 14 21:21:27 2001
@@ -17,7 +17,7 @@
 +--+
   */

-/* $Id: dir.c,v 1.55 2001/02/15 00:43:44 derick Exp $ */
+/* $Id: dir.c,v 1.56 2001/02/15 05:21:27 sas Exp $ */

  /* {{{ includes/startup/misc */

@@ -223,7 +223,7 @@

  /* }}} */

-#if !defined(ZEND_WIN32)!defined(ZTS)
+#if defined(HAVE_CHROOT)  !defined(ZTS)
  /* {{{ proto int chroot(string directory)
 Change root directory */

Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.304 
php4/ext/standard/basic_functions.c:1.305
--- php4/ext/standard/basic_functions.c:1.304   Wed Feb 14 16:43:44 2001
+++ php4/ext/standard/basic_functions.c Wed Feb 14 21:21:27 2001
@@ -17,7 +17,7 @@
 +--+
   */

-/* $Id: basic_functions.c,v 1.304 2001/02/15 00:43:44 derick Exp $ */
+/* $Id: basic_functions.c,v 1.305 2001/02/15 05:21:27 sas Exp $ */

  #include "php.h"
  #include "php_main.h"
@@ -465,8 +465,10 @@
 PHP_FE(opendir, NULL)
 PHP_FE(closedir,NULL)
 PHP_FE(chdir,   NULL)
-#if !defined(ZEND_WIN32)!defined(ZTS)
+#if defined(HAVE_CHROOT)  !defined(ZTS)
 PHP_FE(chroot,  NULL)
+#else
+   PHP_FALIAS(chroot, warn_not_available, NULL)
  #endif
 PHP_FE(getcwd,  NULL)
 PHP_FE(rewinddir,   NULL)



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Re: [PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.cdir.c php_dir.h

2001-02-14 Thread Sascha Schumann


On Thu, 15 Feb 2001, Andi Gutmans wrote:

 ZTS is 0 or 1 but always defined.

No, it is not.  See Zend/Zend.m4, around line 150.

- Sascha


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-02-05 Thread Stephen van Egmond


svanegmond  Mon Feb  5 16:03:44 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Added tests for arpa/nameser.h and resolv.h, which don't exist on the BeOS.
  
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.216 php4/configure.in:1.217
--- php4/configure.in:1.216 Sat Jan 27 16:16:55 2001
+++ php4/configure.in   Mon Feb  5 16:03:44 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.216 2001/01/28 00:16:55 jdonagher Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.217 2001/02/06 00:03:44 svanegmond Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -283,6 +283,7 @@
 AC_CHECK_HEADERS(
 alloca.h \
 arpa/inet.h \
+arpa/nameser.h \
 crypt.h \
 fcntl.h \
 grp.h \
@@ -291,6 +292,7 @@
 locale.h \
 netinet/in.h \
 pwd.h \
+resolv.h \
 signal.h \
 stdarg.h \
 stdlib.h \



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-01-27 Thread John Donagher


jdonagher   Sat Jan 27 13:05:41 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  
  PR:
  Submitted by:
  Reviewed by:
  Obtained from:
  Add configure warning message when compiling --with-pfpro
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.214 php4/configure.in:1.215
--- php4/configure.in:1.214 Sun Jan 21 09:26:43 2001
+++ php4/configure.in   Sat Jan 27 13:05:40 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.214 2001/01/21 17:26:43 rasmus Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.215 2001/01/27 21:05:40 jdonagher Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -920,6 +920,29 @@
 | If you are unable to fix this, send the file debug.log to the  |
 | [EMAIL PROTECTED] mailing list and include appropiate  |
 | information about your setup.  |
+X
+  fi
+
+  if test "$PHP_PFPRO" != "no" ; then
+cat X
+++
+|*** WARNING *** |
+||
+| The Verisign/Signio Payflow Pro extension may cause an SSL-enabled |
+| webserver to fail to start or behave erratically during operation. |
+| The extension itself is complete and fully operational, but|
+| Verisign provides a closed SDK which implements its own SSL, which |
+| may or may not cause conflicts with the SSL implementation in your |
+| own webserver. |
+||
+| Similarly, linking the CURL extension against CURL libraries with  |
+| SSL enabled can result in the same problem.|
+||
+| Verisign has been contacted about this problem yet refuses to  |
+| acknowledge it even with a response, let alone a more compliant|
+| SDK. If you are a Verisign customer and wish to use this extension |
+| in the aforementioned configuration, you are urged to contact them |
+| and press them for a better SDK.   |
 X
   fi
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2001-01-27 Thread John Donagher


jdonagher   Sat Jan 27 16:16:55 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  
  PR:
  Remove --with-pfpro warning. Verisign has released a beta SDK which corrects
  the problem.
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.215 php4/configure.in:1.216
--- php4/configure.in:1.215 Sat Jan 27 13:05:40 2001
+++ php4/configure.in   Sat Jan 27 16:16:55 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.215 2001/01/27 21:05:40 jdonagher Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.216 2001/01/28 00:16:55 jdonagher Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -920,29 +920,6 @@
 | If you are unable to fix this, send the file debug.log to the  |
 | [EMAIL PROTECTED] mailing list and include appropiate  |
 | information about your setup.  |
-X
-  fi
-
-  if test "$PHP_PFPRO" != "no" ; then
-cat X
-++
-|*** WARNING *** |
-||
-| The Verisign/Signio Payflow Pro extension may cause an SSL-enabled |
-| webserver to fail to start or behave erratically during operation. |
-| The extension itself is complete and fully operational, but|
-| Verisign provides a closed SDK which implements its own SSL, which |
-| may or may not cause conflicts with the SSL implementation in your |
-| own webserver. |
-||
-| Similarly, linking the CURL extension against CURL libraries with  |
-| SSL enabled can result in the same problem.|
-||
-| Verisign has been contacted about this problem yet refuses to  |
-| acknowledge it even with a response, let alone a more compliant|
-| SDK. If you are a Verisign customer and wish to use this extension |
-| in the aforementioned configuration, you are urged to contact them |
-| and press them for a better SDK.   |
 X
   fi
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in /ext/mysql/libmysql libmysql.c /ext/standard basic_functions.c dns.c file.c filestat.c fsock.c ftp_fopen_wrapper.c http_fopen_wrapper.c mail.c syslog.c /main fopen-wrappers.c network.c php_open_temporary_file.c

2001-01-21 Thread Rasmus Lerdorf


rasmus  Sun Jan 21 09:26:44 2001 EDT

  Modified files:  
/php4   configure.in 
/php4/ext/mysql/libmysqllibmysql.c 
/php4/ext/standard  basic_functions.c dns.c file.c filestat.c 
fsock.c ftp_fopen_wrapper.c http_fopen_wrapper.c 
mail.c syslog.c 
/php4/main  fopen-wrappers.c network.c php_open_temporary_file.c 
  Log:
  @BeOS patch from [EMAIL PROTECTED] modified somewhat by Rasmus
  BeOS patch from [EMAIL PROTECTED] modified somewhat by Rasmus
  
  

Index: php4/configure.in
diff -u php4/configure.in:1.213 php4/configure.in:1.214
--- php4/configure.in:1.213 Wed Jan 17 04:32:45 2001
+++ php4/configure.in   Sun Jan 21 09:26:43 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.213 2001/01/17 12:32:45 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.214 2001/01/21 17:26:43 rasmus Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -106,6 +106,8 @@
 CPPFLAGS="$CPPFLAGS -traditional-cpp";;
 *bsdi*)
 BSD_MAKEFILE=yes;;
+*beos*)
+   LIBS="$LIBS -lbe -lroot"
 esac
 
 AM_PROG_CC_STDC
@@ -294,6 +296,7 @@
 stdlib.h \
 string.h \
 syslog.h \
+sysexits.h \
 sys/file.h \
 sys/mman.h \
 sys/resource.h \
@@ -301,6 +304,7 @@
 sys/socket.h \
 sys/statfs.h \
 sys/statvfs.h \
+sys/sysexits.h \
 sys/time.h \
 sys/types.h \
 sys/varargs.h \
@@ -360,6 +364,8 @@
 gcvt \
 getlogin \
 gethostbyaddr \
+getprotobyname \
+getprotobynumber \
 getrusage \
 gettimeofday \
 gmtime_r \
Index: php4/ext/mysql/libmysql/libmysql.c
diff -u php4/ext/mysql/libmysql/libmysql.c:1.5 php4/ext/mysql/libmysql/libmysql.c:1.6
--- php4/ext/mysql/libmysql/libmysql.c:1.5  Fri Oct 20 15:26:48 2000
+++ php4/ext/mysql/libmysql/libmysql.c  Sun Jan 21 09:26:43 2001
@@ -25,7 +25,9 @@
 #if !defined(MSDOS)  !defined(__WIN__)
 #include sys/socket.h
 #include netinet/in.h
+#ifdef HAVE_ARPA_INET_H
 #include arpa/inet.h
+#endif
 #include netdb.h
 #ifdef HAVE_SELECT_H
 #  include select.h
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.299 
php4/ext/standard/basic_functions.c:1.300
--- php4/ext/standard/basic_functions.c:1.299   Wed Jan 17 12:37:48 2001
+++ php4/ext/standard/basic_functions.c Sun Jan 21 09:26:43 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.299 2001/01/17 20:37:48 elixer Exp $ */
+/* $Id: basic_functions.c,v 1.300 2001/01/21 17:26:43 rasmus Exp $ */
 
 #include "php.h"
 #include "php_main.h"
@@ -34,7 +34,9 @@
 #include time.h
 #include stdio.h
 #include netdb.h
+#if HAVE_ARPA_INET_H
 #include arpa/inet.h
+#endif
 #if HAVE_UNISTD_H
 #include unistd.h
 #endif
@@ -233,13 +235,19 @@
PHP_FE(mt_srand,   
 NULL)
PHP_FE(mt_getrandmax,   NULL)
PHP_FE(getservbyname, NULL)
+#if HAVE_GETSERVBYPORT
PHP_FE(getservbyport, NULL)
+#endif
+#if HAVE_GETPROTOBYNAME
PHP_FE(getprotobyname, NULL)
+#endif
+#if HAVE_GETPROTOBYNUMBER
PHP_FE(getprotobynumber, NULL)
+#endif
PHP_FE(gethostbyaddr,   NULL)
PHP_FE(gethostbyname,   NULL)
PHP_FE(gethostbynamel,  NULL)
-#if !defined(PHP_WIN32)||HAVE_BINDLIB
+#if HAVE_BINDLIB  !(defined(__BEOS__)||defined(PHP_WIN32))
PHP_FE(checkdnsrr, 
 NULL)
PHP_FE(getmxrr,
 second_and_third_args_force_ref)
 #else
@@ -429,7 +437,7 @@
PHP_FALIAS(socket_set_timeout, warn_not_available,  NULL)
 #endif
PHP_FE(socket_get_status,   NULL)
-#if !defined(PHP_WIN32) || defined(ZTS)
+#if (!defined(PHP_WIN32)  !defined(__BEOS__)) || defined(ZTS)
PHP_FE(realpath,NULL)
 #else
PHP_FALIAS(realpath,warn_not_available, NULL)
@@ -2196,6 +2204,7 @@
 
 /* {{{ proto string getservbyport(int port, string protocol)
Returns service name associated with port. Protocol must be "tcp" or "udp". */
+#if HAVE_GETSERVBYPORT
 PHP_FUNCTION(getservbyport)
 {
pval **port,**proto;
@@ -2214,11 +2223,13 @@
 
RETURN_STRING(serv-s_name,1);
 }
+#endif
 /* }}} */
 
 
 /* {{{ proto int getprotobyname(string name)
Returns protocol number associated with name as per /etc/protocols */
+#if HAVE_GETPROTOBYNAME
 PHP_FUNCTION(getprotobyname)
 {
pval **name;
@@ -2240,11 +2251,13 @@
 
RETURN_LONG(ent-p_proto);
 }
+#endif
 /* }}} */
 
 
 /* {{{ proto string getprotobynumber(int proto)
Returns protocol name associated with protocol number proto */
+#if HAVE_GETPROTOBYNUMBER
 PHP_FUNCTION(getprotobynumber)
 {
pval

[PHP-CVS] cvs: php4 / configure.in

2001-01-16 Thread Sean Bright


elixer  Tue Jan 16 17:15:11 2001 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Updated configure.in to look for strcoll()
  # Woopsie.
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.211 php4/configure.in:1.212
--- php4/configure.in:1.211 Sun Jan 14 08:36:29 2001
+++ php4/configure.in   Tue Jan 16 17:15:11 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.211 2001/01/14 16:36:29 elixer Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.212 2001/01/17 01:15:11 elixer Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -391,6 +391,7 @@
 statvfs \
 std_syslog \
 strcasecmp \
+strcoll \
 strdup \
 strerror \
 strftime \



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.c php_string.h string.c /main config.w32.h

2001-01-14 Thread Sean Bright


elixer  Sun Jan 14 08:36:31 2001 EDT

  Modified files:  
/php4   configure.in 
/php4/ext/standard  basic_functions.c php_string.h string.c 
/php4/main  config.w32.h 
  Log:
  
  
  Added localeconv() function.  Operates similarly to localeconv() defined in
  locale.h.  Should work well under non-ZTS as well as ZTS.
  
  
  

Index: php4/configure.in
diff -u php4/configure.in:1.210 php4/configure.in:1.211
--- php4/configure.in:1.210 Sat Jan 13 03:48:47 2001
+++ php4/configure.in   Sun Jan 14 08:36:29 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.210 2001/01/13 11:48:47 venaas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.211 2001/01/14 16:36:29 elixer Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -379,6 +379,7 @@
 regcomp \
 setitimer \
 setlocale \
+localeconv \
 setsockopt \
 setvbuf \
 shutdown \
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.296 
php4/ext/standard/basic_functions.c:1.297
--- php4/ext/standard/basic_functions.c:1.296   Sat Jan 13 15:49:44 2001
+++ php4/ext/standard/basic_functions.c Sun Jan 14 08:36:30 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.296 2001/01/13 23:49:44 zeev Exp $ */
+/* $Id: basic_functions.c,v 1.297 2001/01/14 16:36:30 elixer Exp $ */
 
 #include "php.h"
 #include "php_main.h"
@@ -182,6 +182,7 @@
PHP_FE(explode,
 NULL)
PHP_FE(implode,
 NULL)
PHP_FE(setlocale,  
 NULL)
+   PHP_FE(localeconv, 
+ NULL)
PHP_FE(soundex,
 NULL)
PHP_FE(levenshtein,
 NULL)
PHP_FE(chr,
 NULL)
@@ -713,6 +714,9 @@
PHP_MINIT(pack)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(browscap)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(lcg)(INIT_FUNC_ARGS_PASSTHRU);
+#ifdef ZTS
+   PHP_MINIT(localeconv)(INIT_FUNC_ARGS_PASSTHRU);
+#endif
 
 #if HAVE_CRYPT
PHP_MINIT(crypt)(INIT_FUNC_ARGS_PASSTHRU);
@@ -769,6 +773,9 @@
PHP_MSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 #endif
PHP_MSHUTDOWN(file)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+#ifdef ZTS
+   PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+#endif
 
return SUCCESS;
 }
Index: php4/ext/standard/php_string.h
diff -u php4/ext/standard/php_string.h:1.31 php4/ext/standard/php_string.h:1.32
--- php4/ext/standard/php_string.h:1.31 Tue Jan  9 07:11:23 2001
+++ php4/ext/standard/php_string.h  Sun Jan 14 08:36:30 2001
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: php_string.h,v 1.31 2001/01/09 15:11:23 hirokawa Exp $ */
+/* $Id: php_string.h,v 1.32 2001/01/14 16:36:30 elixer Exp $ */
 
 /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
 
@@ -65,6 +65,7 @@
 PHP_FUNCTION(ord);
 PHP_FUNCTION(nl2br);
 PHP_FUNCTION(setlocale);
+PHP_FUNCTION(localeconv);
 PHP_FUNCTION(stristr);
 PHP_FUNCTION(chunk_split);
 PHP_FUNCTION(parse_str);
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.182 php4/ext/standard/string.c:1.183
--- php4/ext/standard/string.c:1.182Tue Jan  9 07:11:23 2001
+++ php4/ext/standard/string.c  Sun Jan 14 08:36:30 2001
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.182 2001/01/09 15:11:23 hirokawa Exp $ */
+/* $Id: string.c,v 1.183 2001/01/14 16:36:30 elixer Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -36,6 +36,9 @@
 #include "php_globals.h"
 #include "basic_functions.h"
 #include "php_smart_str.h"
+#ifdef ZTS
+#include "TSRM.h"
+#endif
 
 #define STR_PAD_LEFT   0
 #define STR_PAD_RIGHT  1
@@ -53,6 +56,17 @@
REGISTER_LONG_CONSTANT("PATHINFO_BASENAME", PHP_PATHINFO_BASENAME, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PATHINFO_EXTENSION", PHP_PATHINFO_EXTENSION, CONST_CS 
| CONST_PERSISTENT);
 
+#ifdef HAVE_LOCALECONV
+   /* If last members of struct lconv equal CHAR_MAX, no grouping is done */  
+ 
+
+/* This is bad, but since we are going to be hardcoding in the POSIX stuff anyway... 
+*/
+# ifndef HAVE_LIMITS_H
+# define CHAR_MAX 127
+# endif
+
+   REGISTER_LONG_CONSTANT("CHAR_MAX", CHAR_MAX, CONST_CS | CONST_PERSISTENT);
+#endif
+
 #ifdef HAVE_LOCALE_H
REGISTER_LONG_CONSTANT("LC_CTYPE", LC_CTYPE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("LC_NUMERIC", LC_NUMERIC,

Re: [PHP-CVS] cvs: php4 / configure.in /main network.c

2001-01-13 Thread Zeev Suraski


All those EAI things, where are they coming from?  They don't exist in 
Windows (apparently)

At 13:48 13/1/2001, Stig Venaas wrote:
venaas  Sat Jan 13 03:48:47 2001 EDT

   Modified files:
 /php4   configure.in
 /php4/main  network.c
   Log:
   Simplified code a bit, added detailed error reporting, and fixed a bug
   when getaddrinfo returned a non-IP family before IP families


Index: php4/configure.in
diff -u php4/configure.in:1.209 php4/configure.in:1.210
--- php4/configure.in:1.209 Tue Jan  9 17:34:40 2001
+++ php4/configure.in   Sat Jan 13 03:48:47 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.209 2001/01/10 01:34:40 ssb Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.210 2001/01/13 11:48:47 venaas Exp $ -*- sh -*-
  dnl ## Process this file with autoconf to produce a configure script.

  divert(1)
@@ -356,6 +356,7 @@
  ctime_r \
  cuserid \
  flock \
+gai_strerror \
  gcvt \
  getlogin \
  gethostbyaddr \
Index: php4/main/network.c
diff -u php4/main/network.c:1.10 php4/main/network.c:1.11
--- php4/main/network.c:1.10Thu Oct 19 05:18:02 2000
+++ php4/main/network.c Sat Jan 13 03:48:47 2001
@@ -15,7 +15,7 @@
 | Authors: Stig Venaas [EMAIL PROTECTED] |
 +--+
   */
-/* $Id: network.c,v 1.10 2000/10/19 12:18:02 venaas Exp $ */
+/* $Id: network.c,v 1.11 2001/01/13 11:48:47 venaas Exp $ */

  #include "php.h"

@@ -59,6 +59,44 @@
  # define SOCK_CONN_ERR -1
  #endif

+#ifdef HAVE_GAI_STRERROR
+#  define PHP_GAI_STRERROR(x) (gai_strerror(x))
+#else
+#  define PHP_GAI_STRERROR(x) (php_gai_strerror(x))
+static char *php_gai_strerror(int code) {
+static struct {
+int code;
+const char *msg;
+} values[] = {
+#  ifdef EAI_ADDRFAMILY
+{EAI_ADDRFAMILY, "Address family for hostname not 
supported"},
+#  endif
+{EAI_AGAIN, "Temporary failure in name resolution"},
+{EAI_BADFLAGS, "Bad value for ai_flags"},
+{EAI_FAIL, "Non-recoverable failure in name resolution"},
+{EAI_FAMILY, "ai_family not supported"},
+{EAI_MEMORY, "Memory allocation failure"},
+#  ifdef EAI_NODATA
+{EAI_NODATA, "No address associated with hostname"},
+#  endif
+{EAI_NONAME, "Name or service not known"},
+{EAI_SERVICE, "Servname not supported for ai_socktype"},
+{EAI_SOCKTYPE, "ai_socktype not supported"},
+{EAI_SYSTEM, "System error"},
+{0, NULL}
+};
+int i;
+
+for (i = 0; values[i].msg != NULL; i++) {
+if (values[i].code == code) {
+return (char *)values[i].msg;
+}
+}
+
+return "Unknown error";
+}
+#endif
+
  static void php_network_freeaddresses(struct sockaddr **sal)
  {
 struct sockaddr **sap;
@@ -73,53 +111,47 @@
  static int php_network_getaddresses(const char *host, struct sockaddr 
 ***sal)
  {
 struct sockaddr **sap;
-
-if (host != NULL) {
+
+   if (host == NULL) {
+   return -1;
+   }
+
+   {
  #ifdef HAVE_GETADDRINFO
-struct addrinfo hints, *res, *sai;
+   struct addrinfo hints, *res, *sai;
 int n;

-memset( hints, '\0', sizeof(hints) );
-hints.ai_family = AF_UNSPEC;
-if (getaddrinfo(host, NULL, hints, res))
-return -1;
-sai = res;
-   for (n=2; (sai = sai-ai_next) != NULL; n++);
-   *sal = emalloc(n * sizeof(*sal));
-   if (*sal == NULL)
+   memset(hints, '\0', sizeof(hints));
+   hints.ai_family = AF_UNSPEC;
+   if (n = getaddrinfo(host, NULL, hints, res)) {
+   php_error(E_WARNING, "php_network_getaddresses: 
getaddrinfo failed: %s", PHP_GAI_STRERROR(n));
 return -1;
+   }

-sai = res;
+   sai = res;
+   for (n=2; (sai = sai-ai_next) != NULL; n++);
+   *sal = emalloc(n * sizeof(*sal));
+   sai = res;
 sap = *sal;
-do {
-switch (sai-ai_family) {
+   do {
+   switch (sai-ai_family) {
  #  ifdef HAVE_IPV6
-case AF_INET6: {
+   case AF_INET6:
 *sap = emalloc(sizeof(struct sockaddr_in6));
-   if (*sap == NULL) {
-   freeaddrinfo(res);
-   goto errexit;
-   }
 *(struct sockaddr_in6 *)*sap =
 *((struct sockaddr_in6 
 *)sai-ai_addr);
-

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in /main php_version.h

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in /build build2.mk

Re: [PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.cdir.c php_dir.h

[PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.c dir.c php_dir.h

Re: [PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.c dir.c php_dir.h

Re: [PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.cdir.c php_dir.h

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in /ext/mysql/libmysql libmysql.c /ext/standard basic_functions.c dns.c file.c filestat.c fsock.c ftp_fopen_wrapper.c http_fopen_wrapper.c mail.c syslog.c /main fopen-wrappers.c network.c php_open_temporary_file.c

[PHP-CVS] cvs: php4 / configure.in

[PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.c php_string.h string.c /main config.w32.h

Re: [PHP-CVS] cvs: php4 / configure.in /main network.c

23 matches

Site Navigation

Mail list logo

Footer information