date:20021020

[PHP-CVS-DAILY] cvs: Zend / ChangeLog

2002-10-20 Thread changelog

changelog   Sun Oct 20 20:34:42 2002 EDT

  Modified files:  
/Zend   ChangeLog 
  Log:
  ChangeLog update
  
  
Index: Zend/ChangeLog
diff -u Zend/ChangeLog:1.90 Zend/ChangeLog:1.91
--- Zend/ChangeLog:1.90 Fri Oct 18 20:33:13 2002
+++ Zend/ChangeLog  Sun Oct 20 20:34:42 2002
@@ -1,3 +1,11 @@
+2002-10-20  Masaki Fujimoto  [EMAIL PROTECTED]
+
+* zend_highlight.c
+  zend_highlight.h
+  zend_multibyte.c
+  zend_multibyte.h:
+fixed highlight related bugs (in case shift_jis input/output filters are enabled)
+
 2002-10-18  Andi Gutmans  [EMAIL PROTECTED]
 
 * zend_execute.c: - Cleanup
@@ -515,7 +523,7 @@
 
 2002-05-13  Sterling Hughes  [EMAIL PROTECTED]
 
-* zend_qsort.c: add $Id: ChangeLog,v 1.90 2002/10/19 00:33:13 changelog Exp $ tag
+* zend_qsort.c: add $Id: ChangeLog,v 1.91 2002/10/21 00:34:42 changelog Exp $ tag
 
 2002-05-13  Derick Rethans  [EMAIL PROTECTED]

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2002-10-20 Thread changelog

changelog   Sun Oct 20 20:34:56 2002 EDT

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
  
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.129 ZendEngine2/ChangeLog:1.130
--- ZendEngine2/ChangeLog:1.129 Sat Oct 19 20:33:02 2002
+++ ZendEngine2/ChangeLog   Sun Oct 20 20:34:56 2002
@@ -1,3 +1,14 @@
+2002-10-20  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* zend_object_handlers.c: looks like this message should go
+
+* zend_compile.c: Fix private handling
+
+2002-10-20  Sebastian Bergmann  [EMAIL PROTECTED]
+
+* zend_highlight.c
+  zend_highlight.h: Sync zend_html_puts parameter list with Zend Engine 1.
+
 2002-10-19  Andi Gutmans  [EMAIL PROTECTED]
 
 * zend_compile.h: - Fix compile warning.

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

2002-10-20 Thread Wez Furlong

wez Sun Oct 20 09:46:00 2002 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Add the actual ftok check for Derick :-)
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.383 php4/configure.in:1.384
--- php4/configure.in:1.383 Thu Oct 10 15:07:11 2002
+++ php4/configure.in   Sun Oct 20 09:45:59 2002
 -1,4 +1,4 
-dnl ## $Id: configure.in,v 1.383 2002/10/10 19:07:11 andrei Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.384 2002/10/20 13:45:59 wez Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
 -424,6 +424,7 
 cuserid \
 crypt \
 flock \
+ftok \
 gai_strerror \
 gcvt \
 getlogin \



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

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

2002-10-20 Thread Derick Rethans

On Sun, 20 Oct 2002, Wez Furlong wrote:

 wez   Sun Oct 20 09:46:00 2002 EDT
 
   Modified files:  
 /php4 configure.in 
   Log:
   Add the actual ftok check for Derick :-)

thanks :)

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 /ext/mbstring php_mbregex.c

2002-10-20 Thread Moriyoshi Koizumi

moriyoshi   Sun Oct 20 11:11:05 2002 EDT

  Modified files:  
/php4/ext/mbstring  php_mbregex.c 
  Log:
  Changed mb_regex_set_options() more informative
  
  
Index: php4/ext/mbstring/php_mbregex.c
diff -u php4/ext/mbstring/php_mbregex.c:1.15 php4/ext/mbstring/php_mbregex.c:1.16
--- php4/ext/mbstring/php_mbregex.c:1.15Thu Oct 10 13:00:36 2002
+++ php4/ext/mbstring/php_mbregex.c Sun Oct 20 11:11:04 2002
 -16,7 +16,7 
+--+
  */
 
-/* $Id: php_mbregex.c,v 1.15 2002/10/10 17:00:36 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.16 2002/10/20 15:11:04 moriyoshi Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
 -169,6 +169,73 
return res;
 }
 
+static size_t 
+_php_mb_regex_get_option_string(char *str, size_t len, int option)
+{
+   size_t len_left = len;
+   size_t len_req = 0;
+   char *p = str;
+
+
+   if ((option  MBRE_OPTION_IGNORECASE) != 0) {
+   if (len_left  0) {
+   --len_left;
+   *(p++) = 'i';
+   }
+   ++len_req;  
+   }
+
+   if ((option  MBRE_OPTION_EXTENDED) != 0) {
+   if (len_left  0) {
+   --len_left;
+   *(p++) = 'x';
+   }
+   ++len_req;  
+   }
+
+   if ((option  MBRE_OPTION_POSIXLINE) == MBRE_OPTION_POSIXLINE) {
+   if (len_left  0) {
+   --len_left;
+   *(p++) = 'p';
+   }
+   ++len_req;  
+   } else {
+   if ((option  MBRE_OPTION_MULTILINE) != 0) {
+   if (len_left  0) {
+   --len_left;
+   *(p++) = 'm';
+   }
+   ++len_req;  
+   }
+
+   if ((option  MBRE_OPTION_SINGLELINE) != 0) {
+   if (len_left  0) {
+   --len_left;
+   *(p++) = 's';
+   }
+   ++len_req;  
+   }
+   }   
+   if ((option  MBRE_OPTION_LONGEST) != 0) {
+   if (len_left  0) {
+   --len_left;
+   *(p++) = 'l';
+   }
+   ++len_req;  
+   }
+   if (len_left  0) {
+   --len_left;
+   *(p++) = '\0';
+   }
+
+   ++len_req;  
+   if (len  len_req) {
+   return len_req;
+   }
+
+   return 0;
+}
+
 static void
 _php_mb_regex_init_options(const char *parg, int narg, int *option, int *eval) 
 {
 -974,18 +1041,28 
 }
 /* }}} */
 
-/* {{{ proto bool mb_regex_set_options([string options])
-   Set the default options for mbregex functions */
+/* {{{ proto string mb_regex_set_options([string options])
+   Set or get the default options for mbregex functions */
 PHP_FUNCTION(mb_regex_set_options)
 {
-   char *string;
+   int opt;
+   char *string = NULL;
int string_len;
-   if ( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, s,
+   char buf[16];
+
+   if ( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, |s,
string, string_len ) == FAILURE ) {
RETURN_FALSE;
}
-   php_mb_regex_set_options_by_string( (const char*)string, string_len TSRMLS_CC);
-   RETURN_TRUE;
+   if (string != NULL) {
+   opt = php_mb_regex_set_options_by_string( (const char*)string,
+ string_len TSRMLS_CC );
+   } else {
+   opt = MBSTRG(regex_default_options);
+   }
+   _php_mb_regex_get_option_string(buf, sizeof(buf), opt);
+
+   RETVAL_STRING(buf, 1);
 }
 /* }}} */
 



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

Re: [PHP-CVS] cvs: php4 /ext/standard basic_functions.c ftok.c php_ftok.h

2002-10-20 Thread Derick Rethans

On Sun, 20 Oct 2002, Wez Furlong wrote:

 Add ftok into the big list of functions in configure.in, and
 the build system should define HAVE_FTOK.
 
 (I think).

done (I think :).

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 /ext/standard basic_functions.c ftok.c php_ftok.h

2002-10-20 Thread Derick Rethans

derick  Sun Oct 20 06:18:20 2002 EDT

  Modified files:  
/php4/ext/standard  basic_functions.c ftok.c php_ftok.h 
  Log:
  - Remove #ifdefs around ftok function so that it is also available when
none of the IPC extensions are enabled.
  
  
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.530 
php4/ext/standard/basic_functions.c:1.531
--- php4/ext/standard/basic_functions.c:1.530   Thu Oct 17 18:44:43 2002
+++ php4/ext/standard/basic_functions.c Sun Oct 20 06:18:19 2002
 -17,7 +17,7 
+--+
  */
 
-/* $Id: basic_functions.c,v 1.530 2002/10/17 22:44:43 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.531 2002/10/20 10:18:19 derick Exp $ */
 
 #include php.h
 #include php_streams.h
 -832,9 +832,7 
 PHP_FE(version_compare,   
 NULL)
 
/* functions from ftok.c*/
-#if HAVE_SYSVSEM || HAVE_SYSVSHM  || HAVE_SHMOP
PHP_FE(ftok,NULL)
-#endif 
 
PHP_FE(str_rot13, NULL)
 
Index: php4/ext/standard/ftok.c
diff -u php4/ext/standard/ftok.c:1.6 php4/ext/standard/ftok.c:1.7
--- php4/ext/standard/ftok.c:1.6Fri Aug 23 21:19:28 2002
+++ php4/ext/standard/ftok.cSun Oct 20 06:18:20 2002
 -16,12 +16,10 
+--+
 */
 
-/* $Id: ftok.c,v 1.6 2002/08/24 01:19:28 helly Exp $ */
+/* $Id: ftok.c,v 1.7 2002/10/20 10:18:20 derick Exp $ */
 
 #include php.h
 
-#if HAVE_SYSVSEM || HAVE_SYSVSHM  || HAVE_SHMOP
-
 #include sys/types.h

 #include sys/ipc.h
 
 -55,8 +53,6 
 RETURN_LONG(k);
 }
 /* }}} */
-
-#endif
 
 /*
  * Local variables:
Index: php4/ext/standard/php_ftok.h
diff -u php4/ext/standard/php_ftok.h:1.3 php4/ext/standard/php_ftok.h:1.4
--- php4/ext/standard/php_ftok.h:1.3Thu Feb 28 03:26:46 2002
+++ php4/ext/standard/php_ftok.hSun Oct 20 06:18:20 2002
 -16,15 +16,11 
+--+
 */
 
-/* $Id: php_ftok.h,v 1.3 2002/02/28 08:26:46 sebastian Exp $ */
+/* $Id: php_ftok.h,v 1.4 2002/10/20 10:18:20 derick Exp $ */
 
 #ifndef PHP_FTOK_H
 #define PHP_FTOK_H
 
-#if HAVE_SYSVSEM || HAVE_SYSVSHM  || HAVE_SHMOP
-
 PHP_FUNCTION(ftok);
-
-#endif
 
 #endif /* PHP_FTOK_H */



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

Re: [PHP-CVS] cvs: php4 /ext/standard basic_functions.c ftok.c php_ftok.h

2002-10-20 Thread Derick Rethans

On Sun, 20 Oct 2002, Wez Furlong wrote:

 It might be a good idea to check for ftok in configure
 and protect it with HAVE_FTOK, just in case.

Yup, but how? :)

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 /ext/standard basic_functions.c ftok.c php_ftok.h

2002-10-20 Thread Wez Furlong

Hey Derick,

It might be a good idea to check for ftok in configure
and protect it with HAVE_FTOK, just in case.

--Wez.

On 10/20/02, Derick Rethans [EMAIL PROTECTED] wrote:
 derickSun Oct 20 06:18:20 2002 EDT
 
   Modified files:  
 /php4/ext/standardbasic_functions.c ftok.c php_ftok.h 
   Log:
   - Remove #ifdefs around ftok function so that it is also available when
 none of the IPC extensions are enabled.
   
   
 Index: php4/ext/standard/basic_functions.c
 diff -u php4/ext/standard/basic_functions.c:1.530 
php4/ext/standard/basic_functions.c:1.531
 --- php4/ext/standard/basic_functions.c:1.530 Thu Oct 17 18:44:43 2002
 +++ php4/ext/standard/basic_functions.c   Sun Oct 20 06:18:19 2002
 @@ -17,7 +17,7 @@
 +--+
   */
  
 -/* $Id: basic_functions.c,v 1.530 2002/10/17 22:44:43 iliaa Exp $ */
 +/* $Id: basic_functions.c,v 1.531 2002/10/20 10:18:19 derick Exp $ */
  
  #include php.h
  #include php_streams.h
 @@ -832,9 +832,7 @@
  PHP_FE(version_compare, 
 NULL)
  
   /* functions from ftok.c*/
 -#if HAVE_SYSVSEM || HAVE_SYSVSHM  || HAVE_SHMOP
   PHP_FE(ftok,NULL)
 -#endif   
  
   PHP_FE(str_rot13, NULL)
  
 Index: php4/ext/standard/ftok.c
 diff -u php4/ext/standard/ftok.c:1.6 php4/ext/standard/ftok.c:1.7
 --- php4/ext/standard/ftok.c:1.6  Fri Aug 23 21:19:28 2002
 +++ php4/ext/standard/ftok.c  Sun Oct 20 06:18:20 2002
 @@ -16,12 +16,10 @@
 +--+
  */
  
 -/* $Id: ftok.c,v 1.6 2002/08/24 01:19:28 helly Exp $ */
 +/* $Id: ftok.c,v 1.7 2002/10/20 10:18:20 derick Exp $ */
  
  #include php.h
  
 -#if HAVE_SYSVSEM || HAVE_SYSVSHM  || HAVE_SHMOP
 -
  #include sys/types.h  
  
  #include sys/ipc.h
  
 @@ -55,8 +53,6 @@
  RETURN_LONG(k);
  }
  /* }}} */
 -
 -#endif
  
  /*
   * Local variables:
 Index: php4/ext/standard/php_ftok.h
 diff -u php4/ext/standard/php_ftok.h:1.3 php4/ext/standard/php_ftok.h:1.4
 --- php4/ext/standard/php_ftok.h:1.3  Thu Feb 28 03:26:46 2002
 +++ php4/ext/standard/php_ftok.h  Sun Oct 20 06:18:20 2002
 @@ -16,15 +16,11 @@
 +--+
  */
  
 -/* $Id: php_ftok.h,v 1.3 2002/02/28 08:26:46 sebastian Exp $ */
 +/* $Id: php_ftok.h,v 1.4 2002/10/20 10:18:20 derick Exp $ */
  
  #ifndef PHP_FTOK_H
  #define PHP_FTOK_H
  
 -#if HAVE_SYSVSEM || HAVE_SYSVSHM  || HAVE_SHMOP
 -
  PHP_FUNCTION(ftok);
 -
 -#endif
  
  #endif /* PHP_FTOK_H */
 
 
 
 -- 
 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 /ext/standard basic_functions.c ftok.c php_ftok.h

2002-10-20 Thread Wez Furlong

Add ftok into the big list of functions in configure.in, and
the build system should define HAVE_FTOK.

(I think).

--Wez.

On 10/20/02, Derick Rethans [EMAIL PROTECTED] wrote:
 On Sun, 20 Oct 2002, Wez Furlong wrote:
 
  It might be a good idea to check for ftok in configure
  and protect it with HAVE_FTOK, just in case.
 
 Yup, but how? :)
 
 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 /ext/mbstring mbstring.c

2002-10-20 Thread Moriyoshi Koizumi

moriyoshi   Sun Oct 20 03:16:21 2002 EDT

  Modified files:  
/php4/ext/mbstring  mbstring.c 
  Log:
  ZTS fixes
  
  
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.106 php4/ext/mbstring/mbstring.c:1.107
--- php4/ext/mbstring/mbstring.c:1.106  Sat Oct 19 22:57:39 2002
+++ php4/ext/mbstring/mbstring.cSun Oct 20 03:16:20 2002
 -17,7 +17,7 
+--+
  */
 
-/* $Id: mbstring.c,v 1.106 2002/10/20 02:57:39 fujimoto Exp $ */
+/* $Id: mbstring.c,v 1.107 2002/10/20 07:16:20 moriyoshi Exp $ */
 
 /*
  * PHP4 Multibyte String module mbstring (currently only for Japanese)
 -754,7 +754,9 
 PHP_MINIT_FUNCTION(mbstring)
 {
 #ifdef ZTS
-   ts_allocate_id(mbstring_globals_id, sizeof(zend_mbstring_globals), 
(ts_allocate_ctor) php_mbstring_init_globals, (ts_allocate_dtor) 
mbstring_globals_dtor);
+   ts_allocate_id(mbstring_globals_id, sizeof(zend_mbstring_globals),
+   (ts_allocate_ctor) php_mbstring_init_globals,
+   (ts_allocate_dtor) mbstring_globals_dtor);
 #else
php_mbstring_init_globals(mbstring_globals TSRMLS_CC);
 #endif
 -3498,7 +3500,7 
string.no_language = MBSTRG(current_language);
string.val = (char*)arg_string;
string.len = arg_length;
-   ret = mbfl_identify_encoding_name(string, elist, size);
+   ret = mbfl_identify_encoding_name(string, elist, size TSRMLS_CC);
if (list != NULL) {
efree((void *)list);
}
 -3540,19 +3542,19 
string.len = from_length;
 
/* initialize converter */
-   convd = mbfl_buffer_converter_new(from_encoding, to_encoding, string.len);
+   convd = mbfl_buffer_converter_new(from_encoding, to_encoding, string.len 
+TSRMLS_CC);
if (convd == NULL)
return -1;
-   mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode));
-   mbfl_buffer_converter_illegal_substchar(convd, 
MBSTRG(current_filter_illegal_substchar));
+   mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode) 
+TSRMLS_CC);
+   mbfl_buffer_converter_illegal_substchar(convd, 
+MBSTRG(current_filter_illegal_substchar) TSRMLS_CC);
 
/* do it */
-   ret = mbfl_buffer_converter_feed_result(convd, string, result);
+   ret = mbfl_buffer_converter_feed_result(convd, string, result TSRMLS_CC);
if (ret != NULL) {
*to = ret-val;
*to_length = ret-len;
}
-   mbfl_buffer_converter_delete(convd);
+   mbfl_buffer_converter_delete(convd TSRMLS_CC);
 
return ret ? 0 : -1;
 }



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

[PHP-CVS] cvs: php4 /ext/mbstring mbstring.c

2002-10-20 Thread Moriyoshi Koizumi

moriyoshi   Sun Oct 20 22:24:06 2002 EDT

  Modified files:  
/php4/ext/mbstring  mbstring.c 
  Log:
  Changed the dafault option for consistency
  
  
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.108 php4/ext/mbstring/mbstring.c:1.109
--- php4/ext/mbstring/mbstring.c:1.108  Sun Oct 20 21:44:59 2002
+++ php4/ext/mbstring/mbstring.cSun Oct 20 22:24:06 2002
 -17,7 +17,7 
+--+
  */
 
-/* $Id: mbstring.c,v 1.108 2002/10/21 01:44:59 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.109 2002/10/21 02:24:06 moriyoshi Exp $ */
 
 /*
  * PHP4 Multibyte String module mbstring (currently only for Japanese)
 -885,7 +885,7 
}
}
 #if HAVE_MBREGEX
-   MBSTRG(regex_default_options) = 0;
+   MBSTRG(regex_default_options) = MBRE_OPTION_POSIXLINE;
 #endif
 
return SUCCESS;



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

[PHP-CVS] cvs: php4 /ext/mbstring/tests 027.inc 027.phpt

2002-10-20 Thread Moriyoshi Koizumi

moriyoshi   Sun Oct 20 22:27:51 2002 EDT

  Added files: 
/php4/ext/mbstring/tests027.inc 027.phpt 
  Log:
  Added a new test case to confirm the inconsistent regex behaviour reported
  on [EMAIL PROTECTED] (10830)
  
  

Index: php4/ext/mbstring/tests/027.inc
+++ php4/ext/mbstring/tests/027.inc
?php
$a=aaa\n;

var_dump( mb_ereg(^[^]+$,$a) );
var_dump( ereg(^[^]+$,$a) );
?

Index: php4/ext/mbstring/tests/027.phpt
+++ php4/ext/mbstring/tests/027.phpt
--TEST--
[EMAIL PROTECTED] #10830 
--SKIPIF--
?php include('skipif.inc'); ?
function_exists('mb_ereg') or die(SKIP);
--POST--
--GET--
--FILE--
?php include('027.inc'); ?
--EXPECT--
bool(false)
bool(false)



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

Re: [PHP-CVS] cvs: php4 / acinclude.m4 configure.in /sapi/cgi config.m4 config9.m4

2002-10-20 Thread Jon Parise

On Mon, Oct 21, 2002 at 03:12:27AM -, Jani Taskinen wrote:

 -  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.

Did you originally intend to remove both of these lines?

-- 
Jon Parise ([EMAIL PROTECTED]) :: The PHP Project (http://www.php.net/)

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

Re: [PHP-CVS] cvs: php4 / acinclude.m4 configure.in /sapi/cgiconfig.m4 config9.m4

2002-10-20 Thread Jani Taskinen

On Sun, 20 Oct 2002, Jon Parise wrote:

On Mon, Oct 21, 2002 at 03:12:27AM -, Jani Taskinen wrote:

 -  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.

Did you originally intend to remove both of these lines?

Yes. :)

--Jani


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

[PHP-CVS] cvs: php4 /ext/domxml config.m4 /ext/gd config.m4 /ext/mysql config.m4 /ext/pdf config.m4

2002-10-20 Thread Jani Taskinen

sniper  Sun Oct 20 22:46:15 2002 EDT

  Modified files:  
/php4/ext/domxmlconfig.m4 
/php4/ext/gdconfig.m4 
/php4/ext/mysql config.m4 
/php4/ext/pdf   config.m4 
  Log:
  - Prevent resetting the PHP_*_DIR variables if already set.
  
  
  
Index: php4/ext/domxml/config.m4
diff -u php4/ext/domxml/config.m4:1.41 php4/ext/domxml/config.m4:1.42
--- php4/ext/domxml/config.m4:1.41  Wed Sep  4 14:47:22 2002
+++ php4/ext/domxml/config.m4   Sun Oct 20 22:46:11 2002
 -1,5 +1,5 
 dnl
-dnl $Id: config.m4,v 1.41 2002/09/04 18:47:22 sniper Exp $
+dnl $Id: config.m4,v 1.42 2002/10/21 02:46:11 sniper Exp $
 dnl
 
 AC_DEFUN(PHP_DOM_CHECK_VERSION,[
 -22,6 +22,11 
 PHP_ARG_WITH(dom, for DOM support,
 [  --with-dom[=DIR]Include DOM support (requires libxml = 2.4.14).
   DIR is the libxml install directory.])
+
+if test -z $PHP_ZLIB_DIR; then
+  PHP_ARG_WITH(zlib-dir, for the location of libz,
+  [  --with-zlib-dir[=DIR] DOMXML: Set the path to libz install prefix.], no, no)
+fi
 
 if test $PHP_DOM != no; then
 
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.116 php4/ext/gd/config.m4:1.117
--- php4/ext/gd/config.m4:1.116 Sat Oct 19 09:27:53 2002
+++ php4/ext/gd/config.m4   Sun Oct 20 22:46:12 2002
 -1,5 +1,5 
 dnl
-dnl $Id: config.m4,v 1.116 2002/10/19 13:27:53 sniper Exp $
+dnl $Id: config.m4,v 1.117 2002/10/21 02:46:12 sniper Exp $
 dnl
 
 dnl
 -9,14 +9,20 
 PHP_ARG_WITH(gd, for GD support,
 [  --with-gd[=DIR] Include GD support (DIR is GD's install dir).])
 
-PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
-[  --with-jpeg-dir=DIR   GD: Set the path to libjpeg install prefix.], no, no)
+if test -z $PHP_JPEG_DIR; then
+  PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
+  [  --with-jpeg-dir=DIR   GD: Set the path to libjpeg install prefix.], no, no)
+fi
 
-PHP_ARG_WITH(png-dir, for the location of libpng,
-[  --with-png-dir=DIRGD: Set the path to libpng install prefix.], no, no)
+if test -z $PHP_PNG_DIR; then
+  PHP_ARG_WITH(png-dir, for the location of libpng,
+  [  --with-png-dir=DIRGD: Set the path to libpng install prefix.], no, no)
+fi
 
-PHP_ARG_WITH(zlib-dir, for the location of libz, 
-[  --with-zlib-dir[=DIR] GD: Set the path to libz install prefix.], no, no)
+if test -z $PHP_ZLIB_DIR; then
+  PHP_ARG_WITH(zlib-dir, for the location of libz, 
+  [  --with-zlib-dir[=DIR] GD: Set the path to libz install prefix.], no, no)
+fi
 
 PHP_ARG_WITH(xpm-dir, for the location of libXpm,
 [  --with-xpm-dir=DIRGD: Set the path to libXpm install prefix.], no, no)
Index: php4/ext/mysql/config.m4
diff -u php4/ext/mysql/config.m4:1.53 php4/ext/mysql/config.m4:1.54
--- php4/ext/mysql/config.m4:1.53   Wed Sep  4 14:47:23 2002
+++ php4/ext/mysql/config.m4Sun Oct 20 22:46:12 2002
 -1,5 +1,5 
 dnl
-dnl $Id: config.m4,v 1.53 2002/09/04 18:47:23 sniper Exp $
+dnl $Id: config.m4,v 1.54 2002/10/21 02:46:12 sniper Exp $
 dnl
 
 sinclude(ext/mysql/libmysql/acinclude.m4)
 -48,8 +48,14 
   If unspecified, the bundled MySQL library will be used.], 
yes)
 
 PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
-[  --with-mysql-sock[=DIR] Location of the MySQL unix socket pointer.
-  If unspecified, the default locations are searched.], no, 
no)
+[  --with-mysql-sock[=DIR]   MySQL: Location of the MySQL unix socket pointer.
+If unspecified, the default locations are searched.], no, 
+no)
+
+if test -z $PHP_ZLIB_DIR; then
+  PHP_ARG_WITH(zlib-dir, for the location of libz, 
+  [  --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix.], no, no)
+fi
+
 
 if test $PHP_MYSQL != no; then
   AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
Index: php4/ext/pdf/config.m4
diff -u php4/ext/pdf/config.m4:1.34 php4/ext/pdf/config.m4:1.35
--- php4/ext/pdf/config.m4:1.34 Thu Oct 17 00:21:52 2002
+++ php4/ext/pdf/config.m4  Sun Oct 20 22:46:13 2002
 -1,22 +1,28 
 dnl
-dnl $Id: config.m4,v 1.34 2002/10/17 04:21:52 sniper Exp $
+dnl $Id: config.m4,v 1.35 2002/10/21 02:46:13 sniper Exp $
 dnl
 
 PHP_ARG_WITH(pdflib,for PDFlib support,
 [  --with-pdflib[=DIR] Include PDFlib support.])
 
-PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, 
-[  --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory.
+if test -z $PHP_JPEG_DIR; then
+  PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, 
+  [  --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory.
  (OPTIONAL for PDFlib v4)], no, no)
+fi
 
-PHP_ARG_WITH(png-dir, for the location of libpng, 
-[  --with-png-dir[=DIR]  PDFLIB: define libpng install directory.
+if test -z $PHP_PNG_DIR; then
+  PHP_ARG_WITH(png-dir, for the location of libpng, 
+  [  --with-png-dir[=DIR]  PDFLIB: define libpng install directory.
  (OPTIONAL for

[PHP-CVS] cvs: php4 / acinclude.m4

2002-10-20 Thread Jani Taskinen

sniper  Sun Oct 20 23:31:52 2002 EDT

  Modified files:  
/php4   acinclude.m4 
  Log:
  remove the remains of that comment.
  
  
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.213 php4/acinclude.m4:1.214
--- php4/acinclude.m4:1.213 Sun Oct 20 23:12:27 2002
+++ php4/acinclude.m4   Sun Oct 20 23:31:52 2002
 -1,4 +1,4 
-dnl $Id: acinclude.m4,v 1.213 2002/10/21 03:12:27 sniper Exp $
+dnl $Id: acinclude.m4,v 1.214 2002/10/21 03:31:52 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
 -1777,7 +1777,6 
 }
   _max=0
   _count=0
-  # along with /bin/sed that truncates output.
   for _sed in $_sed_list; do
 test ! -f ${_sed}  break
 cat /dev/null  $tmp/sed.in



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

[PHP-CVS] cvs: php4 / acinclude.m4 configure.in /sapi/cgi config.m4 config9.m4

2002-10-20 Thread Jani Taskinen

sniper  Sun Oct 20 23:12:27 2002 EDT

  Added files: 
/php4/sapi/cgi  config9.m4 

  Removed files:   
/php4/sapi/cgi  config.m4 

  Modified files:  
/php4   acinclude.m4 configure.in 
  Log:
  - Moved CGI specific lines from configure.in to sapi/cgi/config9.m4
which is 'executed' last of the SAPI config.m4's.
  - Added --disable-cgi option. (was possible only with above change)
  - Made the sed check to not test for the possibly working sed on Solaris
since that would make the test quite useless. (compile would still fail)
  
  # That sed check is not enabled yet..need to know whether we fail
  # during configure or just put out a warning about possible non-working
  # sed. As even plain ./configure doesn't work in most cases, I think
  # it would be better to just fail during configure and let the users
  # fix their paths/install GNU sed.
  
  
  
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.212 php4/acinclude.m4:1.213
--- php4/acinclude.m4:1.212 Wed Oct 16 12:21:13 2002
+++ php4/acinclude.m4   Sun Oct 20 23:12:27 2002
 -1,4 +1,4 
-dnl $Id: acinclude.m4,v 1.212 2002/10/16 16:21:13 sniper Exp $
+dnl $Id: acinclude.m4,v 1.213 2002/10/21 03:12:27 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
 -1777,9 +1777,8 
 }
   _max=0
   _count=0
-  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
   # along with /bin/sed that truncates output.
-  for _sed in $_sed_list /usr/xpg4/bin/sed; do
+  for _sed in $_sed_list; do
 test ! -f ${_sed}  break
 cat /dev/null  $tmp/sed.in
 _count=0
 -1811,6 +1810,7 
   AC_MSG_ERROR([Could not find working sed on this system. Please install GNU sed.])
 else
   SED=$ac_cv_path_sed
+  PHP_SUBST(SED)
   AC_MSG_RESULT([$SED])
 fi
 ])
Index: php4/configure.in
diff -u php4/configure.in:1.384 php4/configure.in:1.385
--- php4/configure.in:1.384 Sun Oct 20 09:45:59 2002
+++ php4/configure.in   Sun Oct 20 23:12:27 2002
 -1,4 +1,4 
-dnl ## $Id: configure.in,v 1.384 2002/10/20 13:45:59 wez Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.385 2002/10/21 03:12:27 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
 -127,6 +127,9 
 dnl check for -R, etc. switch
 PHP_RUNPATH_SWITCH
 
+dnl check for working sed (disabled for now, waiting for comments)
+dnl PHP_PROG_SED
+
 AC_PROG_RANLIB
 AC_PROG_LN_S
 AC_PROG_AWK
 -223,10 +226,7 
 
 esyscmd(./scripts/config-stubs sapi)
 
-if test $PHP_SAPI = default; then
-  PHP_SELECT_SAPI(cgi, program, cgi_main.c getopt.c,,'$(SAPI_CGI_PATH)')
-fi
-
+dnl Show which main SAPI was selected
 AC_MSG_CHECKING([for chosen SAPI module])
 AC_MSG_RESULT([$PHP_SAPI])
 

Index: php4/sapi/cgi/config9.m4
+++ php4/sapi/cgi/config9.m4
dnl
dnl $Id: config9.m4,v 1.1 2002/10/21 03:12:27 sniper Exp $
dnl

AC_ARG_ENABLE(cgi,
[  --disable-cgi   Disable building CGI version of PHP],
[
  PHP_SAPI_CGI=$enableval
],[
  PHP_SAPI_CGI=yes
])

AC_ARG_ENABLE(force-cgi-redirect,
[  --enable-force-cgi-redirect
   Enable the security check for internal server
   redirects.  You should use this if you are
   running the CGI version with Apache.],
[
  PHP_FORCE_CGI_REDIRECT=$enableval
],[
  PHP_FORCE_CGI_REDIRECT=no
])

AC_ARG_ENABLE(discard-path,
[  --enable-discard-path   If this is enabled, the PHP CGI binary
  can safely be placed outside of the
  web tree and people will not be able
  to circumvent .htaccess security.],
[
  PHP_DISCARD_PATH=$enableval
],[
  PHP_DISCARD_PATH=no
])


AC_DEFUN(PHP_TEST_WRITE_STDOUT,[
  AC_CACHE_CHECK(whether writing to stdout works,ac_cv_write_stdout,[
AC_TRY_RUN([
#ifdef HAVE_UNISTD_H
#include unistd.h
#endif

#define TEXT This is the test message -- 

main()
{
  int n;

  n = write(1, TEXT, sizeof(TEXT)-1);
  return (!(n == sizeof(TEXT)-1));
}
],[
  ac_cv_write_stdout=yes
],[
  ac_cv_write_stdout=no
],[
  ac_cv_write_stdout=no
])
  ])
  if test $ac_cv_write_stdout = yes; then
AC_DEFINE(PHP_WRITE_STDOUT, 1, [whether write(2) works])
  fi
])


if test $PHP_SAPI = default; then
  AC_MSG_CHECKING(for CGI build)
  if test $PHP_SAPI_CGI != no; then
AC_MSG_RESULT(yes)

PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag)
SAPI_CGI_PATH=sapi/cgi/php-cgi
PHP_SUBST(SAPI_CGI_PATH)

PHP_TEST_WRITE_STDOUT

AC_MSG_CHECKING(whether to force Apache CGI redirect)
if test $PHP_FORCE_CGI_REDIRECT = yes; then
  REDIRECT=1
else
  REDIRECT=0
fi
AC_DEFINE_UNQUOTED(FORCE_CGI_REDIRECT,$REDIRECT,[ ])
AC_MSG_RESULT($PHP_FORCE_CGI_REDIRECT)


AC_MSG_CHECKING(whether to discard path_info + path_translated)
if test $PHP_DISCARD_PATH = yes; then
  DISCARD_PATH=1
else
  DISCARD_PATH=0
fi
AC_DEFINE_UNQUOTED(DISCARD_PATH,

[PHP-CVS-DAILY] cvs: Zend / ChangeLog

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

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

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

[PHP-CVS] cvs: php4 /ext/mbstring php_mbregex.c

Re: [PHP-CVS] cvs: php4 /ext/standard basic_functions.c ftok.c php_ftok.h

[PHP-CVS] cvs: php4 /ext/standard basic_functions.c ftok.c php_ftok.h

Re: [PHP-CVS] cvs: php4 /ext/standard basic_functions.c ftok.c php_ftok.h

Re: [PHP-CVS] cvs: php4 /ext/standard basic_functions.c ftok.c php_ftok.h

Re: [PHP-CVS] cvs: php4 /ext/standard basic_functions.c ftok.c php_ftok.h

[PHP-CVS] cvs: php4 /ext/mbstring mbstring.c

[PHP-CVS] cvs: php4 /ext/mbstring mbstring.c

[PHP-CVS] cvs: php4 /ext/mbstring/tests 027.inc 027.phpt

Re: [PHP-CVS] cvs: php4 / acinclude.m4 configure.in /sapi/cgi config.m4 config9.m4

Re: [PHP-CVS] cvs: php4 / acinclude.m4 configure.in /sapi/cgiconfig.m4 config9.m4

[PHP-CVS] cvs: php4 /ext/domxml config.m4 /ext/gd config.m4 /ext/mysql config.m4 /ext/pdf config.m4

[PHP-CVS] cvs: php4 / acinclude.m4

[PHP-CVS] cvs: php4 / acinclude.m4 configure.in /sapi/cgi config.m4 config9.m4

18 matches

Site Navigation

Mail list logo

Footer information