[PHP-CVS] cvs: php4 / Makefile.global acinclude.m4 configure.in /sapi/apache apMakefile.tmpl config.m4 libphp4.module.in libphp5.module.in mod_php4.c mod_php4.exp mod_php4.h mod_php5.c mod_php5.exp mod_php5.h php.sym php_apache_http.h /sapi/apache2filter config.m4 php.sym php_apache.h sapi_apache2.c /sapi/apache2handler config.m4 php.sym php_apache.h sapi_apache2.c

2003-03-28 Thread Sterling Hughes 
sterlingFri Mar 28 23:52:46 2003 EDT

  Added files: 
/php4/sapi/apache   libphp5.module.in mod_php5.c mod_php5.exp 
mod_php5.h 

  Removed files:   
/php4/sapi/apache   libphp4.module.in mod_php4.c mod_php4.exp 
mod_php4.h 

  Modified files:  
/php4   Makefile.global acinclude.m4 configure.in 
/php4/sapi/apache   apMakefile.tmpl config.m4 php.sym 
php_apache_http.h 
/php4/sapi/apache2filterconfig.m4 php.sym php_apache.h 
sapi_apache2.c 
/php4/sapi/apache2handler   config.m4 php.sym php_apache.h 
sapi_apache2.c 
  Log:
  update php module name to php5, not php4.
  apache, apache2* and cli/cgi work. 
  sapi module maintainers should fix up their sapis, as I don't run 
  any servers with php outside of apache.
  
  Index: php4/Makefile.global
diff -u php4/Makefile.global:1.43 php4/Makefile.global:1.44
--- php4/Makefile.global:1.43   Mon Feb 10 13:58:49 2003
+++ php4/Makefile.globalFri Mar 28 23:52:46 2003
@@ -10,22 +10,22 @@
 
 build-modules: $(PHP_MODULES)
 
-libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) 
$(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 
-libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-   $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@  cp $@ libs/libphp4.so
+libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+   $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@  cp $@ libs/libphp5.so
 
 install: $(install_targets)
 
-install-sapi: libphp4.la
+install-sapi: libphp5.la
@echo Installing PHP SAPI module
-   [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp libphp4.la 
$(phptempdir)/libphp4.la /dev/null 21
+   [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp libphp5.la 
$(phptempdir)/libphp5.la /dev/null 21
[EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-   [EMAIL PROTECTED] test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+   [EMAIL PROTECTED] test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \
for i in 0.0.0 0.0 0; do \
-   if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; 
then \
-   $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i 
$(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
+   if test -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i; 
then \
+   $(LN_S) $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i 
$(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \
break; \
fi; \
done; \
@@ -57,10 +57,10 @@
find . -name \*.la -o -name \*.a | xargs rm -f 
find . -name \*.so | xargs rm -f
find . -name .libs -a -type d|xargs rm -rf
-   rm -f libphp4.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
+   rm -f libphp5.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-   rm -f config.cache config.log config.status Makefile.objects 
Makefile.fragments libtool main/php_config.h stamp-h php4.spec 
sapi/apache/libphp4.module buildmk.stamp
+   rm -f config.cache config.log config.status Makefile.objects 
Makefile.fragments libtool main/php_config.h stamp-h php5.spec 
sapi/apache/libphp5.module buildmk.stamp
egrep define'.*include/php' configure|sed 's/.*//'|xargs rm -f
find . -name Makefile | xargs rm -f
 
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.233 php4/acinclude.m4:1.234
--- php4/acinclude.m4:1.233 Tue Mar 25 08:43:13 2003
+++ php4/acinclude.m4   Fri Mar 28 23:52:46 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.233 2003/03/25 13:43:13 sniper Exp $
+dnl $Id: acinclude.m4,v 1.234 2003/03/29 04:52:46 sterling Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -781,7 +781,7 @@
 dnl
 AC_DEFUN([PHP_BUILD_SHARED],[
   PHP_BUILD_PROGRAM
-  OVERALL_TARGET=libphp4.la
+  OVERALL_TARGET=libphp5.la
   php_build_target=shared
   
   php_c_pre=$shared_c_pre
@@ -798,7 +798,7 @@
 dnl
 AC_DEFUN([PHP_BUILD_STATIC],[
   PHP_BUILD_PROGRAM
-  OVERALL_TARGET=libphp4.la
+  OVERALL_TARGET=libphp5.la
   php_build_target=static
 ])
 
@@ -807,7 +807,7 @@
 dnl
 AC_DEFUN([PHP_BUILD_BUNDLE],[
   PHP_BUILD_PROGRAM
-  OVERALL_TARGET=libs/libphp4.bundle
+  OVERALL_TARGET=libs/libphp5.bundle
   php_build_target=static
 ])

[PHP-CVS] cvs: php4 / Makefile.global

2003-01-02 Thread Derick Rethans 
derick  Thu Jan  2 08:01:34 2003 EDT

  Modified files:  
/php4   Makefile.global 
  Log:
  - Fix make test when CC was set to something with a parameter
  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.41 php4/Makefile.global:1.42
--- php4/Makefile.global:1.41   Mon Dec  9 10:32:17 2002
+++ php4/Makefile.globalThu Jan  2 08:01:33 2003
@@ -49,7 +49,7 @@
 test: $(SAPI_CLI_PATH)
@TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 TEST_PHP_SRCDIR=$(top_srcdir) \
-CC=$(CC) \
+CC=$(CC) \
$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' $(top_srcdir)/run-tests.php $(TESTS)
 
 clean:



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

[PHP-CVS] cvs: php4 / Makefile.global

2002-12-09 Thread Sascha Schumann 
sas Mon Dec  9 10:32:17 2002 EDT

  Modified files:  
/php4   Makefile.global 
  Log:
  Use $(INSTALL) rather than cp to install modules.
  
  $(INSTALL) will usually unlink the target file first, so that in-memory
  instances of the old file don't get simply overwritten (and crash and burn).
  
  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.40 php4/Makefile.global:1.41
--- php4/Makefile.global:1.40   Tue Nov 12 12:40:38 2002
+++ php4/Makefile.globalMon Dec  9 10:32:17 2002
@@ -37,7 +37,7 @@
$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)  \
echo Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/  \
rm -f modules/*.la  \
-   cp modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) /dev/null 21 || true
+   $(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) /dev/null 21 || true
 
 install-tester:
@echo Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/



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

[PHP-CVS] cvs: php4 / Makefile.global

2002-11-12 Thread Sascha Schumann 
sas Tue Nov 12 12:40:38 2002 EDT

  Modified files:  
/php4   Makefile.global 
  Log:
  Add missing $(INSTALL_ROOT)
  
  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.39 php4/Makefile.global:1.40
--- php4/Makefile.global:1.39   Thu Oct 31 09:01:58 2002
+++ php4/Makefile.globalTue Nov 12 12:40:38 2002
 -41,7 +41,7 
 
 install-tester:
echo Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/
-   $(mkinstalldirs) $(PEAR_INSTALLDIR)
+   $(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
$(INSTALL) -m 755 $(top_srcdir)/run-tests.php 
$(INSTALL_ROOT)$(PEAR_INSTALLDIR)
 
 install-su: install-pear install-tester



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

Re: [PHP-CVS] cvs: php4 / Makefile.global

2002-11-12 Thread Tal Peer 
Sascha Schumann wrote:

sas		Tue Nov 12 12:40:38 2002 EDT

  Modified files:  
/php4	Makefile.global 
  Log:
  Add missing $(INSTALL_ROOT)


Does this fix #18568?


  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.39 php4/Makefile.global:1.40
--- php4/Makefile.global:1.39	Thu Oct 31 09:01:58 2002
+++ php4/Makefile.global	Tue Nov 12 12:40:38 2002
@@ -41,7 +41,7 @@
 
 install-tester:
 	@echo Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/
-	@$(mkinstalldirs) $(PEAR_INSTALLDIR)
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
 	@$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
 
 install-su: install-pear install-tester





--
Tal Peer
[EMAIL PROTECTED]


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

[PHP-CVS] cvs: php4 / Makefile.global run-tests.php

2002-10-31 Thread Yasuo Ohgaki 
yohgaki Thu Oct 31 08:52:58 2002 EDT

  Modified files:  
/php4   Makefile.global run-tests.php 
  Log:
  Fixed more ini settings.
  # Derick. Be responsible to your change and opinion.
  # These are settings I know that should be set. 
  # There may be other settingis must be set to make 
  # run-tests.php work as expected.
  
  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.37 php4/Makefile.global:1.38
--- php4/Makefile.global:1.37   Tue Oct 29 10:22:41 2002
+++ php4/Makefile.globalThu Oct 31 08:52:58 2002
 -50,7 +50,7 
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 TEST_PHP_SRCDIR=$(top_srcdir) \
 CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' $(top_srcdir)/run-tests.php $(TESTS)
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
+'safe_mode=0' -d 'safe_mode=0' -d 'output_buffering=Off' -d 'auto_prepend_file=' -d 
+'auto_append_file=' -d 'output_handler=' -d 'register_argv=1' -d 'disable_functions=' 
+$(top_srcdir)/run-tests.php $(TESTS)
 
 clean:
find . -name \*.lo -o -name \*.o | xargs rm -f
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.102 php4/run-tests.php:1.103
--- php4/run-tests.php:1.102Wed Oct 30 13:36:39 2002
+++ php4/run-tests.php  Thu Oct 31 08:52:58 2002
 -44,8 +44,9 
 
 $cwd = getcwd();
 set_time_limit(0);
-ob_implicit_flush();
 error_reporting(E_ALL);
+ini_set('magic_quotes_runtime', 0);
+ini_set('memory_limit', '8M');
 
 if (ini_get('safe_mode')) {
echo  SAFE_MODE_WARNING



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

[PHP-CVS] cvs: php4 / Makefile.global run-tests.php

2002-10-31 Thread Derick Rethans 
derick  Thu Oct 31 09:02:00 2002 EDT

  Modified files:  
/php4   Makefile.global run-tests.php 
  Log:
  Discuss first!
  
  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.38 php4/Makefile.global:1.39
--- php4/Makefile.global:1.38   Thu Oct 31 08:52:58 2002
+++ php4/Makefile.globalThu Oct 31 09:01:58 2002
 -50,7 +50,7 
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 TEST_PHP_SRCDIR=$(top_srcdir) \
 CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'safe_mode=0' -d 'output_buffering=Off' -d 'auto_prepend_file=' -d 
'auto_append_file=' -d 'output_handler=' -d 'register_argv=1' -d 'disable_functions=' 
$(top_srcdir)/run-tests.php $(TESTS)
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
+'safe_mode=0' $(top_srcdir)/run-tests.php $(TESTS)
 
 clean:
find . -name \*.lo -o -name \*.o | xargs rm -f
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.103 php4/run-tests.php:1.104
--- php4/run-tests.php:1.103Thu Oct 31 08:52:58 2002
+++ php4/run-tests.php  Thu Oct 31 09:01:58 2002
 -44,9 +44,8 
 
 $cwd = getcwd();
 set_time_limit(0);
+ob_implicit_flush();
 error_reporting(E_ALL);
-ini_set('magic_quotes_runtime', 0);
-ini_set('memory_limit', '8M');
 
 if (ini_get('safe_mode')) {
echo  SAFE_MODE_WARNING



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

Re: [PHP-CVS] cvs: php4 / Makefile.global run-tests.php

2002-10-31 Thread Yasuo Ohgaki 
Marcus Boerger wrote:

You forgot -d 'zlib.output_compression='
and have doubled -d 'safe_mode=0'


Thanks. Copy  paste mistake :)

I think
-d 'zlib.output_compression='
isn't needed since it's not a web client.

--
Yasuo Ohgaki



and thanks i will add the missing valued to run-test.php
when fetching the version from the test executable.

marcus

At 14:52 31.10.2002, Yasuo Ohgaki wrote:


yohgaki Thu Oct 31 08:52:58 2002 EDT

  Modified files:
/php4   Makefile.global run-tests.php
  Log:
  Fixed more ini settings.
  # Derick. Be responsible to your change and opinion.
  # These are settings I know that should be set.
  # There may be other settingis must be set to make
  # run-tests.php work as expected.


Index: php4/Makefile.global
diff -u php4/Makefile.global:1.37 php4/Makefile.global:1.38
--- php4/Makefile.global:1.37   Tue Oct 29 10:22:41 2002
+++ php4/Makefile.globalThu Oct 31 08:52:58 2002
 -50,7 +50,7 
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 
'open_basedir=' -d 'safe_mode=0' $(top_srcdir)/run-tests.php $(TESTS)
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 
'open_basedir=' -d 'safe_mode=0' -d 'safe_mode=0' -d 
'output_buffering=Off' -d 'auto_prepend_file=' -d 'auto_append_file=' 
-d 'output_handler=' -d 'register_argv=1' -d 'disable_functions=' 
$(top_srcdir)/run-tests.php $(TESTS)

 clean:
find . -name \*.lo -o -name \*.o | xargs rm -f
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.102 php4/run-tests.php:1.103
--- php4/run-tests.php:1.102Wed Oct 30 13:36:39 2002
+++ php4/run-tests.php  Thu Oct 31 08:52:58 2002
 -44,8 +44,9 

 $cwd = getcwd();
 set_time_limit(0);
-ob_implicit_flush();
 error_reporting(E_ALL);
+ini_set('magic_quotes_runtime', 0);
+ini_set('memory_limit', '8M');

 if (ini_get('safe_mode')) {
echo  SAFE_MODE_WARNING



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








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

Re: [PHP-CVS] cvs: php4 / Makefile.global

2002-10-23 Thread Derick Rethans 
On Wed, 23 Oct 2002, Yasuo Ohgaki wrote:

 Derick Rethans wrote:
  On Wed, 23 Oct 2002, Yasuo Ohgaki wrote:
  
  
 yohgaki Tue Oct 22 21:21:04 2002 EDT
 
   Modified files:  
 /php4   Makefile.global 
   Log:
   Fixed buffring issue again.
  
  
  WTF are you doing?
  
  Derick
 
 Do you know what you are doing?

Yes I do know what you were trying to explain, but I again do not agree 
with your reasoning.

Derick

--

---
 Derick Rethans   http://derickrethans.nl/ 
 JDI Media Solutions
--[ if you hold a unix shell to your ear, do you hear the c? ]-


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

Re: [PHP-CVS] cvs: php4 / Makefile.global

2002-10-23 Thread Derick Rethans 
On Wed, 23 Oct 2002, Yasuo Ohgaki wrote:

 Derick Rethans wrote:
  Yes I do know what you were trying to explain, but I again do not agree 
  with your reasoning.
 
 Ok, but it's not compelling since you are one of them
 that didn't aware of the result of the change.
 
[snip unrelated issue]
 
 I can think of many good reasons that we are better to use
 specific ini, but I don't see good enough reason not to.
 
 run-tests.php is supposed to used by many people. Therefore,
 run-tests.php should be better if it's robust as possible.
 
 Why we need to ask troubles?

I tell you that I am aware of the issue that the tests suite may result 
in sometimes different results because of this, and that's supposed to 
be like that to be able to test as much different combinations as 
possible (like Ilia said in [2]). Although I agree with Jon's [1] post 
that some settings should be hardcoded used ini_set().

[1] http://marc.theaimsgroup.com/?l=php-cvsm=103525648428370w=2
[2] http://marc.theaimsgroup.com/?l=php-cvsm=103533697806578w=2

Now revert that change please, as your opinion is clearly shared by the 
least amount of people.

Derick

--

---
 Derick Rethans   http://derickrethans.nl/ 
 JDI Media Solutions
--[ if you hold a unix shell to your ear, do you hear the c? ]-


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

Re: [PHP-CVS] cvs: php4 / Makefile.global

2002-10-23 Thread Yasuo Ohgaki 
Derick Rethans wrote:

On Wed, 23 Oct 2002, Yasuo Ohgaki wrote:
I tell you that I am aware of the issue that the tests suite may result 
in sometimes different results because of this, and that's supposed to 
be like that to be able to test as much different combinations as 
possible (like Ilia said in [2]). Although I agree with Jon's [1] post 
that some settings should be hardcoded used ini_set().

[1] http://marc.theaimsgroup.com/?l=php-cvsm=103525648428370w=2
[2] http://marc.theaimsgroup.com/?l=php-cvsm=103533697806578w=2

Hi Ilia and Jon,

Do you still think specifying ini used _for_ run-tests.php
is bad thing? I hope I've explained enough.

I think you don't care, do you?


To Derick,

You don't have problem with your php.ini, but I do.
Could you leave it alone? There is nothing to loose
here.

--
Yasuo Ohgaki


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

[PHP-CVS] cvs: php4 / Makefile.global

2002-10-23 Thread Derick Rethans 
derick  Wed Oct 23 04:46:50 2002 EDT

  Modified files:  
/php4   Makefile.global 
  Log:
  - Remove this messed up thing AGAIN
  #- Yasuo: touch it and I'll fly over applying a YART on you.
  
  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.34 php4/Makefile.global:1.35
--- php4/Makefile.global:1.34   Tue Oct 22 21:21:04 2002
+++ php4/Makefile.globalWed Oct 23 04:46:49 2002
 -49,7 +49,7 
 test: $(SAPI_CLI_PATH)
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 TEST_PHP_SRCDIR=$(top_srcdir) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -c $(top_srcdir)/php.ini-dist 
$(top_srcdir)/run-tests.php $(TESTS)
+   $(top_builddir)/$(SAPI_CLI_PATH) $(top_srcdir)/run-tests.php 
+$(TESTS)
 
 clean:
find . -name \*.lo -o -name \*.o | xargs rm -f



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

[PHP-CVS] cvs: php4 / Makefile.global

2002-10-22 Thread Yasuo Ohgaki 
yohgaki Tue Oct 22 21:21:04 2002 EDT

  Modified files:  
/php4   Makefile.global 
  Log:
  Fixed buffring issue again.
  
  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.33 php4/Makefile.global:1.34
--- php4/Makefile.global:1.33   Tue Oct 22 14:53:56 2002
+++ php4/Makefile.globalTue Oct 22 21:21:04 2002
 -49,7 +49,7 
 test: $(SAPI_CLI_PATH)
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 TEST_PHP_SRCDIR=$(top_srcdir) \
-   $(top_builddir)/$(SAPI_CLI_PATH) $(top_srcdir)/run-tests.php 
$(TESTS)
+   $(top_builddir)/$(SAPI_CLI_PATH) -c $(top_srcdir)/php.ini-dist 
+$(top_srcdir)/run-tests.php $(TESTS)
 
 clean:
find . -name \*.lo -o -name \*.o | xargs rm -f



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

Re: [PHP-CVS] cvs: php4 / Makefile.global

2002-10-22 Thread Derick Rethans 
On Wed, 23 Oct 2002, Yasuo Ohgaki wrote:

 yohgaki   Tue Oct 22 21:21:04 2002 EDT
 
   Modified files:  
 /php4 Makefile.global 
   Log:
   Fixed buffring issue again.

WTF are you doing?

Derick

--

---
 Derick Rethans   http://derickrethans.nl/ 
 JDI Media Solutions
--[ if you hold a unix shell to your ear, do you hear the c? ]-


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

[PHP-CVS] cvs: php4 / Makefile.global

2002-10-21 Thread Yasuo Ohgaki 
yohgaki Mon Oct 21 20:03:49 2002 EDT

  Modified files:  
/php4   Makefile.global 
  Log:
  Hmm. -c options was there, but removed.
  It is _needed_ for php.ini users uses buffer by default.
  
  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.30 php4/Makefile.global:1.31
--- php4/Makefile.global:1.30   Tue Oct  8 03:57:29 2002
+++ php4/Makefile.globalMon Oct 21 20:03:49 2002
 -48,7 +48,7 
 
 test: $(SAPI_CLI_PATH)
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
-   $(top_builddir)/$(SAPI_CLI_PATH) $(top_srcdir)/run-tests.php 
$(TESTS)
+   $(top_builddir)/$(SAPI_CLI_PATH) -c $(top_srcdir)/php.ini-dist 
+$(top_srcdir)/run-tests.php $(TESTS)
 
 clean:
find . -name \*.lo -o -name \*.o | xargs rm -f



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

[PHP-CVS] cvs: php4 / Makefile.global

2002-10-21 Thread Jani Taskinen 
sniper  Mon Oct 21 20:18:26 2002 EDT

  Modified files:  
/php4   Makefile.global 
  Log:
  - Revert the undiscussed change.
  #
  # Yasuo, don't you think there was a reason to drop this???
  # Please, discuss these things before you go and change something.
  #
  
  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.31 php4/Makefile.global:1.32
--- php4/Makefile.global:1.31   Mon Oct 21 20:03:49 2002
+++ php4/Makefile.globalMon Oct 21 20:18:26 2002
 -48,7 +48,7 
 
 test: $(SAPI_CLI_PATH)
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -c $(top_srcdir)/php.ini-dist 
$(top_srcdir)/run-tests.php $(TESTS)
+   $(top_builddir)/$(SAPI_CLI_PATH) $(top_srcdir)/run-tests.php 
+$(TESTS)
 
 clean:
find . -name \*.lo -o -name \*.o | xargs rm -f



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

[PHP-CVS] cvs: php4 / Makefile.global

2002-09-29 Thread Sascha Schumann 

sas Sun Sep 29 12:25:24 2002 EDT

  Modified files:  
/php4   Makefile.global 
  Log:
  Fix some typos
  
  
Index: php4/Makefile.global
diff -u php4/Makefile.global:1.26 php4/Makefile.global:1.27
--- php4/Makefile.global:1.26   Sun Sep 29 12:22:47 2002
+++ php4/Makefile.globalSun Sep 29 12:25:23 2002
 -46,14 +46,14 
 
 install-su: install-pear install-tester
 
-test: $(SAPI_CLI_PHP)
-   TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PHP) \
-   $(top_builddir)/$(SAPI_CLI_PHP) -c php.ini-dist 
$(top_srcdir)/run-tests.php $(TESTS)
+test: $(SAPI_CLI_PATH)
+   TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+   $(top_builddir)/$(SAPI_CLI_PATH) -c php.ini-dist 
+$(top_srcdir)/run-tests.php $(TESTS)
 
 clean:
find . -name \*.lo -o -name \*.o -o -name \*.la -o -name \*.a -o -name \*.so| 
xargs rm -f
find . -name .libs -a -type d|xargs rm -rf
-   rm -f libphp4.la $(SAPI_CLI_PHP) $(SAPI_CGI_PHP) modules/* libs/*
+   rm -f libphp4.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
rm -f config.cache config.log config.status Makefile.objects 
Makefile.fragments libtool main/php_config.h stamp-h php4.spec 
sapi/apache/libphp4.module buildmk.stamp



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

Re: [PHP-CVS] cvs: php4 / Makefile.global acinclude.m4 configure.in /main php_embed.c php_embed.h /sapi/cgi Makefile.frag config.m4 /sapi/cliMakefile.frag config.m4 /sapi/embed config.m4 php_embed.c

2002-09-29 Thread derick 

Hi,

can you now build all three sapis at once like you could before?

Derick


On Sun, 29 Sep 2002, Sascha Schumann wrote:

 sas   Sun Sep 29 12:22:50 2002 EDT
 
   Added files: 
 /php4/sapi/cgiMakefile.frag 
 /php4/sapi/cliMakefile.frag 
 /php4/sapi/embed  config.m4 php_embed.c php_embed.h 
 /php4/sapi/fastcgiMakefile.frag 
 
   Removed files:   
 /php4/mainphp_embed.c php_embed.h 
 
   Modified files:  
 /php4 Makefile.global acinclude.m4 configure.in 
 /php4/sapi/cgiconfig.m4 
 /php4/sapi/cliconfig.m4 
 /php4/sapi/fastcgiconfig.m4 
 /php4/win32   phpembed.dsp 
   Log:
   Follow Yasuo's suggestion and build sapi program's under the sapi-specific
   directory.
   
   Move sapi-specific makefile fragments to their respective directory.
   
   Create an embed sapi module which resides in its own dir now.
   
   

--

---
 Derick Rethans   http://derickrethans.nl/ 
 JDI Media Solutions
--[ if you hold a unix shell to your ear, do you hear the c? ]-


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

Re: [PHP-CVS] cvs: php4 / Makefile.global acinclude.m4 configure.in /main php_embed.c php_embed.h /sapi/cgi Makefile.frag config.m4 /sapi/cliMakefile.frag config.m4 /sapi/embed config.m4 php_embe

2002-09-29 Thread Sascha Schumann 

 That might be, but this doesn't answer my question :) Wouldn't it be
 very useful of the PHP lib gets compiled/installed on every compile just
 like CLI? I think it would be very useful that lib, CLI and the SAPI of
 choice are compiled at the same time. This was also Edin's reasoning to
 implement it like he did.

I disagree.  There is nothing special about the embedded SAPI
module and thus it does not get special treatment, including
poluting all kind of files.

The Unix build chain has been crafted around the idea that
there is one specific target with an explicit set of
requirements (especially regarding type of linkage).

The CLI SAPI module is a target which does not care how its
modules were compiled.  This is not the same case with the
embedded SAPI module where the target is a library.

We could come up with an extension to the build chain which
allows us to build multiple SAPI modules in a single build
tree.  This extension would have to analyze the requirements
of a set of activated SAPI modules and would then choose the
best build target (shared, static) for the set.

- Sascha


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

[PHP-CVS] cvs: php4 / Makefile.global configure.in /main php_embed.c php_embed.h /win32 phpembed.dsp

2002-09-28 Thread Edin Kadribasic 

edink   Sat Sep 28 22:45:25 2002 EDT

  Added files: 
/php4/main  php_embed.c php_embed.h 
/php4/win32 phpembed.dsp 

  Modified files:  
/php4   Makefile.global configure.in 
  Log:
  Added php/embed toolkit for embedding PHP engine into C/C++ applications.
  See my post to php-dev on the subject.
  
  

Index: php4/Makefile.global
diff -u php4/Makefile.global:1.24 php4/Makefile.global:1.25
--- php4/Makefile.global:1.24   Thu Aug 15 20:36:05 2002
+++ php4/Makefile.globalSat Sep 28 22:45:24 2002
@@ -22,8 +22,15 @@
 sapi/cli/php: $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
$(BUILD_CLI)
 
-install: $(install_targets) 
+libphp.la: $(PHP_LIB_OBJS)
+   $(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) 
+$(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_LIB_OBJS) $(EXTRA_LIBS) 
+$(ZEND_EXTRA_LIBS) -o $@
+
+libphp.so: $(PHP_LIB_OBJS)
+   $(LIBTOOL) --mode=link $(CC) -shared -export-dynamic $(COMMON_FLAGS) 
+$(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
+$(PHP_LIB_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@  cp $@ .libs
 
+libs: libphp.la libphp.so
+
+install: $(install_targets) 
 
 install-cli: sapi/cli/php
@echo Installing PHP CLI binary:$(INSTALL_ROOT)$(bindir)/
@@ -62,7 +69,7 @@
$(top_builddir)/sapi/cli/php -c php.ini-dist 
$(top_srcdir)/run-tests.php $(TESTS)
 
 clean:
-   find . -name \*.lo -o -name \*.o -o -name \*.la -o -name \*.a| xargs rm -f
+   find . -name \*.lo -o -name \*.o -o -name \*.la -o -name \*.a -o -name \*.so| 
+xargs rm -f
find . -name .libs -a -type d|xargs rm -rf
rm -f libphp4.la php sapi/cli/php modules/* libs/*
 
Index: php4/configure.in
diff -u php4/configure.in:1.372 php4/configure.in:1.373
--- php4/configure.in:1.372 Fri Sep  6 13:18:16 2002
+++ php4/configure.in   Sat Sep 28 22:45:24 2002
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.372 2002/09/06 17:18:16 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.373 2002/09/29 02:45:24 edink Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1077,6 +1077,12 @@
 fi
 
 PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag)
+
+
+PHP_ADD_SOURCES_X(main, php_embed.c,, PHP_LIB_OBJS)
+PHP_LIB_OBJS=$PHP_GLOBAL_OBJS $PHP_LIB_OBJS main/internal_functions_cli.lo
+PHP_SUBST(PHP_LIB_OBJS)
+
 
 PHP_ADD_BUILD_DIR(main)
 PHP_ADD_BUILD_DIR(regex)

Index: php4/main/php_embed.c
+++ php4/main/php_embed.c
/*
   +--+
   | PHP Version 4|
   +--+
   | Copyright (c) 1997-2002 The PHP Group|
   +--+
   | This source file is subject to version 2.02 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
   | available at through the world-wide-web at   |
   | http://www.php.net/license/2_02.txt. |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to  |
   | [EMAIL PROTECTED] so we can mail you a copy immediately.   |
   +--+
   | Author: Edin Kadrinasic [EMAIL PROTECTED]  |
   +--+
*/
/* $Id: php_embed.c,v 1.1 2002/09/29 02:45:25 edink Exp $ */

#include php_embed.h

#ifdef PHP_WIN32
#include io.h
#include fcntl.h
#endif

static char* php_embed_read_cookies(TSRMLS_D)
{
return NULL;
}

static int php_embed_deactivate(TSRMLS_D)
{
fflush(stdout);
return SUCCESS;
}

static inline size_t php_embed_single_write(const char *str, uint str_length)
{
#ifdef PHP_WRITE_STDOUT
long ret;

ret = write(STDOUT_FILENO, str, str_length);
if (ret = 0) return 0;
return ret;
#else
size_t ret;

ret = fwrite(str, 1, MIN(str_length, 16384), stdout);
return ret;
#endif
}


static int php_embed_ub_write(const char *str, uint str_length TSRMLS_DC)
{
const char *ptr = str;
uint remaining = str_length;
size_t ret;

while (remaining  0) {
ret = php_embed_single_write(ptr, remaining);
if (!ret) {
php_handle_aborted_connection();
}
ptr += ret;
remaining -= ret;
}

return str_length;
}

static void php_embed_flush(void *server_context)
{
if (fflush(stdout)==EOF) {
php_handle_aborted_connection();
}
}

static void