date:20030120

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

2003-01-20 Thread changelog

changelog   Mon Jan 20 20:33:08 2003 EDT

  Modified files:  
/php4   ChangeLog 
  Log:
  ChangeLog update
  
Index: php4/ChangeLog
diff -u php4/ChangeLog:1.1241 php4/ChangeLog:1.1242
--- php4/ChangeLog:1.1241   Sun Jan 19 20:31:57 2003
+++ php4/ChangeLog  Mon Jan 20 20:33:07 2003
@@ -1,3 +1,48 @@
+2003-01-20  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/imap/php_imap.c
+  ext/imap/php_imap.h:
+  quota function fixes. Thanks Wez.
+
+* ext/imap/php_imap.c:
+  Changed php_error to php_error_docref.
+  Removed pointless memory allocation checks.
+  Memory leak fix inside quota functions.
+
+2003-01-20  Moriyoshi Koizumi  [EMAIL PROTECTED]
+
+* ext/pcre/php_pcre.c:
+  Fixed bug #21758
+
+2003-01-20  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/msession/msession.c:
+  Restore php_error - php_error_docref patch.
+
+2003-01-20  Sascha Schumann  [EMAIL PROTECTED]
+
+* README.TESTING:
+  test commit
+
+2003-01-20  Derick Rethans  [EMAIL PROTECTED]
+
+* ext/standard/credits.c:
+  - Add credits for Magnus
+
+2003-01-20  Jani Taskinen  [EMAIL PROTECTED]
+
+* ext/gd/config.m4:
+  Add test for png.h
+
+2003-01-20  Mark L. Woodward  [EMAIL PROTECTED]
+
+* ext/msession/README
+  ext/msession/msession.c
+  ext/msession/php_msession.h
+  ext/msession/reqclient.h:
+  Updated for Msession 1.2.
+  Includes new APIs
+
 2003-01-19  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * ext/oracle/oracle.c:

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

2003-01-20 Thread Jani Taskinen

sniper  Mon Jan 20 05:39:29 2003 EDT

  Modified files:  
/php4/ext/gdconfig.m4 
  Log:
  Add test for png.h
  
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.126 php4/ext/gd/config.m4:1.127
--- php4/ext/gd/config.m4:1.126 Sat Dec 14 04:33:37 2002
+++ php4/ext/gd/config.m4   Mon Jan 20 05:39:29 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.126 2002/12/14 09:33:37 sniper Exp $
+dnl $Id: config.m4,v 1.127 2003/01/20 10:39:29 sniper Exp $
 dnl
 
 dnl
@@ -83,7 +83,11 @@
 if test $PHP_ZLIB_DIR = no; then
   AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=DIR])
 fi
-
+
+if test ! -f $GD_PNG_DIR/include/png.h; then
+  AC_MSG_ERROR([png.h not found.])
+fi
+
 PHP_CHECK_LIBRARY(png,png_write_image,
 [
   PHP_ADD_INCLUDE($GD_PNG_DIR/include)



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd config.m4

2003-01-20 Thread Jani Taskinen

sniper  Mon Jan 20 05:39:40 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/gdconfig.m4 
  Log:
  MFH
  
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.120.2.6 php4/ext/gd/config.m4:1.120.2.7
--- php4/ext/gd/config.m4:1.120.2.6 Sat Dec 14 04:32:49 2002
+++ php4/ext/gd/config.m4   Mon Jan 20 05:39:39 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.120.2.6 2002/12/14 09:32:49 sniper Exp $
+dnl $Id: config.m4,v 1.120.2.7 2003/01/20 10:39:39 sniper Exp $
 dnl
 
 dnl
@@ -83,7 +83,11 @@
 if test $PHP_ZLIB_DIR = no; then
   AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=DIR])
 fi
-
+
+if test ! -f $GD_PNG_DIR/include/png.h; then
+  AC_MSG_ERROR([png.h not found.])
+fi
+
 PHP_CHECK_LIBRARY(png,png_write_image,
 [
   PHP_ADD_INCLUDE($GD_PNG_DIR/include)



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

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

2003-01-20 Thread Derick Rethans

derick  Mon Jan 20 07:34:14 2003 EDT

  Modified files:  
/php4/ext/standard  credits.c 
  Log:
  - Add credits for Magnus
  
Index: php4/ext/standard/credits.c
diff -u php4/ext/standard/credits.c:1.25 php4/ext/standard/credits.c:1.26
--- php4/ext/standard/credits.c:1.25Sat Jan 18 17:33:56 2003
+++ php4/ext/standard/credits.c Mon Jan 20 07:34:07 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: credits.c,v 1.25 2003/01/18 22:33:56 derick Exp $ */
+/* $Id: credits.c,v 1.26 2003/01/20 12:34:07 derick Exp $ */
 
 #include php.h
 #include info.h
@@ -96,7 +96,7 @@
if (flag  PHP_CREDITS_QA) {
php_info_print_table_start();
php_info_print_table_header(1, PHP 5.0 Quality Assurance Team);
-   php_info_print_table_row(1, Ilia Alshanetsky, Joerg Behrens, Stefan 
Esser, Moriyoshi Koizumi, Sebastian Nohn, Derick Rethans, Melvyn Sopacua, Jani 
Taskinen);
+   php_info_print_table_row(1, Ilia Alshanetsky, Joerg Behrens, Stefan 
+Esser, Moriyoshi Koizumi, Magnus Maatta, Sebastian Nohn, Derick Rethans, Melvyn 
+Sopacua, Jani Taskinen);
php_info_print_table_end();
}
 



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

[PHP-CVS] cvs: php4 / README.TESTING

2003-01-20 Thread Sascha Schumann

sas Mon Jan 20 10:07:20 2003 EDT

  Modified files:  
/php4   README.TESTING 
  Log:
  test commit
  
Index: php4/README.TESTING
diff -u php4/README.TESTING:1.19 php4/README.TESTING:1.20
--- php4/README.TESTING:1.19Sun Jan 19 09:22:19 2003
+++ php4/README.TESTING Mon Jan 20 10:07:20 2003
@@ -1,6 +1,6 @@
 [IMPORTANT NOTICE]
 --
- Do _not_ ask to developers why some or all tests are failed under
+ Please do not ask developers why some or all tests are failing in
 your environment! Let us know if you find why it fails. Thank you.
 
 



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

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

2003-01-20 Thread Moriyoshi Koizumi

moriyoshi   Mon Jan 20 11:45:22 2003 EDT

  Modified files:  
/php4/ext/pcre  php_pcre.c 
  Log:
  Fixed bug #21758
  
  
Index: php4/ext/pcre/php_pcre.c
diff -u php4/ext/pcre/php_pcre.c:1.136 php4/ext/pcre/php_pcre.c:1.137
--- php4/ext/pcre/php_pcre.c:1.136  Sat Jan 18 19:45:43 2003
+++ php4/ext/pcre/php_pcre.cMon Jan 20 11:45:21 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_pcre.c,v 1.136 2003/01/19 00:45:43 iliaa Exp $ */
+/* $Id: php_pcre.c,v 1.137 2003/01/20 16:45:21 moriyoshi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1044,7 +1044,7 @@
zend_get_parameters_ex(ZEND_NUM_ARGS(), regex, replace, subject, 
limit) == FAILURE) {
WRONG_PARAM_COUNT;
}
-   if (Z_TYPE_PP(replace) == IS_ARRAY  Z_TYPE_PP(regex) != IS_ARRAY) {
+   if (!is_callable_replace  Z_TYPE_PP(replace) == IS_ARRAY  Z_TYPE_PP(regex) 
+!= IS_ARRAY) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Parameter mismatch, 
pattern is a string while replacement in an array.);
RETURN_FALSE;
}



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/pcre php_pcre.c

2003-01-20 Thread Moriyoshi Koizumi

moriyoshi   Mon Jan 20 11:46:35 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/pcre  php_pcre.c 
  Log:
  MFH: fixed bug #21758
  
  
Index: php4/ext/pcre/php_pcre.c
diff -u php4/ext/pcre/php_pcre.c:1.132.2.3 php4/ext/pcre/php_pcre.c:1.132.2.4
--- php4/ext/pcre/php_pcre.c:1.132.2.3  Sat Jan 18 15:49:02 2003
+++ php4/ext/pcre/php_pcre.cMon Jan 20 11:46:34 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_pcre.c,v 1.132.2.3 2003/01/18 20:49:02 iliaa Exp $ */
+/* $Id: php_pcre.c,v 1.132.2.4 2003/01/20 16:46:34 moriyoshi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1044,7 +1044,7 @@
zend_get_parameters_ex(ZEND_NUM_ARGS(), regex, replace, subject, 
limit) == FAILURE) {
WRONG_PARAM_COUNT;
}
-   if (Z_TYPE_PP(replace) == IS_ARRAY  Z_TYPE_PP(regex) != IS_ARRAY) {
+   if (!is_callable_replace  Z_TYPE_PP(replace) == IS_ARRAY  Z_TYPE_PP(regex) 
+!= IS_ARRAY) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Parameter mismatch, 
pattern is a string while replacement in an array.);
RETURN_FALSE;
}



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

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

2003-01-20 Thread Ilia Alshanetsky

iliaa   Mon Jan 20 14:41:59 2003 EDT

  Modified files:  
/php4/ext/imap  php_imap.c 
  Log:
  Changed php_error to php_error_docref.
  Removed pointless memory allocation checks.
  Memory leak fix inside quota functions.
  
  
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.152 php4/ext/imap/php_imap.c:1.153
--- php4/ext/imap/php_imap.c:1.152  Sat Jan 18 02:00:47 2003
+++ php4/ext/imap/php_imap.cMon Jan 20 14:41:58 2003
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.152 2003/01/18 07:00:47 sniper Exp $ */
+/* $Id: php_imap.c,v 1.153 2003/01/20 19:41:58 iliaa Exp $ */
 
 #define IMAP41
 
@@ -609,7 +609,7 @@
if (EG(error_reporting)  E_NOTICE) {
ecur = IMAPG(imap_errorstack);
while (ecur != NIL) {
-   php_error(E_NOTICE, %s(): %s (errflg=%d), 
get_active_function_name(TSRMLS_C), ecur-LTEXT, ecur-errflg);
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE, %s 
+(errflg=%d), ecur-LTEXT, ecur-errflg);
ecur = ecur-next;
}
}
@@ -621,7 +621,7 @@
if (EG(error_reporting)  E_NOTICE) {
acur = IMAPG(imap_alertstack);
while (acur != NIL) {
-   php_error(E_NOTICE, %s(): %s, 
get_active_function_name(TSRMLS_C), acur-LTEXT);
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE, %s, 
+acur-LTEXT);
acur = acur-next;
}
}
@@ -698,7 +698,7 @@
imap_stream = mail_open(NIL, Z_STRVAL_PP(mailbox), flags);
 
if (imap_stream == NIL) {
-   php_error(E_WARNING, %s(): Couldn't open stream %s, 
get_active_function_name(TSRMLS_C), Z_STRVAL_PP(mailbox));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't open stream %s, 
+Z_STRVAL_PP(mailbox));
efree(IMAPG(imap_user)); IMAPG(imap_user) = 0;
efree(IMAPG(imap_password)); IMAPG(imap_password) = 0;
RETURN_FALSE;
@@ -750,7 +750,7 @@
}
imap_stream = mail_open(imap_le_struct-imap_stream, Z_STRVAL_PP(mailbox), 
flags);
if (imap_stream == NIL) {
-   php_error(E_WARNING, %s(): Couldn't re-open stream, 
get_active_function_name(TSRMLS_C));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't re-open stream);
RETURN_FALSE;
}
imap_le_struct-imap_stream = imap_stream;
@@ -857,19 +857,16 @@
 
convert_to_string_ex(qroot);
 
-   MAKE_STD_ZVAL(IMAPG(quota_return));
-   array_init(IMAPG(quota_return));
+   array_init(return_value);
+   *IMAPG(quota_return) = *return_value;
 
/* set the callback for the GET_QUOTA function */
mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota);
if(!imap_getquota(imap_le_struct-imap_stream, Z_STRVAL_PP(qroot))) {
-   php_error(E_WARNING, %s(): c-client imap_getquota failed, 
get_active_function_name(TSRMLS_C));
-   FREE_ZVAL(IMAPG(quota_return));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, c-client imap_getquota 
+failed);
+   zval_dtor(return_value);
RETURN_FALSE;
}
-
-   *return_value = *IMAPG(quota_return);
-   FREE_ZVAL(IMAPG(quota_return));
 }
 /* }}} */
 
@@ -888,19 +885,16 @@
 
convert_to_string_ex(mbox);
 
-   MAKE_STD_ZVAL(IMAPG(quota_return));
-   array_init(IMAPG(quota_return));
+   array_init(return_value);
+   *IMAPG(quota_return) = *return_value;
 
/* set the callback for the GET_QUOTAROOT function */
mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota);
if(!imap_getquotaroot(imap_le_struct-imap_stream, Z_STRVAL_PP(mbox))) {
-   php_error(E_WARNING, %s(): c-client imap_getquotaroot failed, 
get_active_function_name(TSRMLS_C));
-   FREE_ZVAL(IMAPG(quota_return));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, c-client 
+imap_getquotaroot failed);
+   zval_dtor(return_value);
RETURN_FALSE;
}
-
-   *return_value = *IMAPG(quota_return);
-   FREE_ZVAL(IMAPG(quota_return));
 }
 /* }}} */
 
@@ -1081,7 +1075,7 @@
msgindex = Z_LVAL_PP(msgno);
}
if ((msgindex  1) || ((unsigned) msgindex  
imap_le_struct-imap_stream-nmsgs)) {
-   php_error(E_WARNING, %s(): Bad message number, 
get_active_function_name(TSRMLS_C));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Bad message number);
RETURN_FALSE;
}
 
@@ -1454,7 +1448,7 @@
}

if (!Z_LVAL_PP(msgno) || Z_LVAL_PP(msgno)

[PHP-CVS] cvs: php4 /ext/imap php_imap.c php_imap.h

2003-01-20 Thread Ilia Alshanetsky

iliaa   Mon Jan 20 16:28:10 2003 EDT

  Modified files:  
/php4/ext/imap  php_imap.c php_imap.h 
  Log:
  quota function fixes. Thanks Wez.
  
  
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.153 php4/ext/imap/php_imap.c:1.154
--- php4/ext/imap/php_imap.c:1.153  Mon Jan 20 14:41:58 2003
+++ php4/ext/imap/php_imap.cMon Jan 20 16:28:09 2003
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.153 2003/01/20 19:41:58 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.154 2003/01/20 21:28:09 iliaa Exp $ */
 
 #define IMAP41
 
@@ -338,8 +338,11 @@
  */
 void mail_getquota(MAILSTREAM *stream, char *qroot, QUOTALIST *qlist)
 {
-   zval *t_map;
+   zval *t_map, *return_value;
TSRMLS_FETCH();
+   
+   return_value = *IMAPG(quota_return);
+
 /* put parsing code here */
for(; qlist; qlist = qlist-next) {
MAKE_STD_ZVAL(t_map);
@@ -347,13 +350,13 @@
if (strncmp(qlist-name, STORAGE, 7) == 0)
{
/* this is to add backwards compatibility */
-   add_assoc_long_ex(IMAPG(quota_return), usage, 
sizeof(usage), qlist-usage);
-   add_assoc_long_ex(IMAPG(quota_return), limit, 
sizeof(limit), qlist-limit);
+   add_assoc_long_ex(return_value, usage, sizeof(usage), 
+qlist-usage);
+   add_assoc_long_ex(return_value, limit, sizeof(limit), 
+qlist-limit);
}
 
add_assoc_long_ex(t_map, usage, sizeof(usage), qlist-usage);
add_assoc_long_ex(t_map, limit, sizeof(limit), qlist-limit);
-   add_assoc_zval_ex(IMAPG(quota_return), qlist-name, 
strlen(qlist-name)+1, t_map);
+   add_assoc_zval_ex(return_value, qlist-name, strlen(qlist-name)+1, 
+t_map);
}
 }
 /* }}} */
@@ -858,7 +861,7 @@
convert_to_string_ex(qroot);
 
array_init(return_value);
-   *IMAPG(quota_return) = *return_value;
+   IMAPG(quota_return) = return_value;
 
/* set the callback for the GET_QUOTA function */
mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota);
@@ -886,7 +889,7 @@
convert_to_string_ex(mbox);
 
array_init(return_value);
-   *IMAPG(quota_return) = *return_value;
+   IMAPG(quota_return) = return_value;
 
/* set the callback for the GET_QUOTAROOT function */
mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota);
Index: php4/ext/imap/php_imap.h
diff -u php4/ext/imap/php_imap.h:1.26 php4/ext/imap/php_imap.h:1.27
--- php4/ext/imap/php_imap.h:1.26   Tue Dec 31 11:06:45 2002
+++ php4/ext/imap/php_imap.hMon Jan 20 16:28:09 2003
@@ -27,7 +27,7 @@
+--+
  */
 
-/* $Id: php_imap.h,v 1.26 2002/12/31 16:06:45 sebastian Exp $ */
+/* $Id: php_imap.h,v 1.27 2003/01/20 21:28:09 iliaa Exp $ */
 
 #ifndef PHP_IMAP_H
 #define PHP_IMAP_H
@@ -200,7 +200,7 @@
unsigned long status_uidnext;
unsigned long status_uidvalidity;
 #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
-   zval *quota_return;
+   zval **quota_return;
 #endif
 ZEND_END_MODULE_GLOBALS(imap)
 



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

Re: [PHP-CVS] cvs: php4 /ext/standard file.c

2003-01-20 Thread Jani Taskinen

 
MFH?

On Sat, 18 Jan 2003, Derick Rethans wrote:

derick Sat Jan 18 08:55:58 2003 EDT

  Modified files:  
/php4/ext/standard file.c 
  Log:
  - Fixed memleak in fscanf().
  
  
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.292 php4/ext/standard/file.c:1.293
--- php4/ext/standard/file.c:1.292 Sat Jan 11 18:05:19 2003
+++ php4/ext/standard/file.c   Sat Jan 18 08:55:58 2003
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.292 2003/01/11 23:05:19 moriyoshi Exp $ */
+/* $Id: file.c,v 1.293 2003/01/18 13:55:58 derick Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -1518,6 +1518,7 @@
 
   buf = php_stream_get_line((php_stream *) what, NULL, 0, len);
   if (buf == NULL) {
+  efree(args);
   RETURN_FALSE;
   }
 





-- 
- For Sale! -


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

Re: [PHP-CVS] cvs: php4 /ext/standard file.c

2003-01-20 Thread Jani Taskinen


MFH?


On Sat, 18 Jan 2003, Wez Furlong wrote:

wezSat Jan 18 09:10:22 2003 EDT

  Modified files:  
/php4/ext/standard file.c 
  Log:
  Fix potential problem for 64-bit architectures.
  
  
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.293 php4/ext/standard/file.c:1.294
--- php4/ext/standard/file.c:1.293 Sat Jan 18 08:55:58 2003
+++ php4/ext/standard/file.c   Sat Jan 18 09:10:22 2003
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.293 2003/01/18 13:55:58 derick Exp $ */
+/* $Id: file.c,v 1.294 2003/01/18 14:10:22 wez Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -1482,7 +1482,8 @@
 {
   int  result;
   zval **file_handle, **format_string;
-  int len, type;
+  size_t len;
+  int type;
   char *buf;
   void *what;
 





-- 
- For Sale! -


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

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

2003-01-20 Thread Pierre-Alain Joye

pajoye  Mon Jan 20 20:49:34 2003 EDT

  Modified files:  
/php4/ext/gd/libgd  gd.c 
  Log:
  Add credits to my functions (thx for the advice WezIlia :)
  
  
Index: php4/ext/gd/libgd/gd.c
diff -u php4/ext/gd/libgd/gd.c:1.41 php4/ext/gd/libgd/gd.c:1.42
--- php4/ext/gd/libgd/gd.c:1.41 Fri Jan 17 13:34:07 2003
+++ php4/ext/gd/libgd/gd.c  Mon Jan 20 20:49:34 2003
@@ -1077,6 +1077,11 @@
}
 }
 
+
+/*
+ * Added on 2003/12 by Pierre-Alain Joye ([EMAIL PROTECTED])
+ * (c) 2003 Pierre-Alain Joye
+ * */
 #define BLEND_COLOR(a, nc, c, cc) \
 nc = (cc) + (c) - (cc)) * (a)) + c) - (cc)) * (a))  8) + 0x80)  8);
 
@@ -1098,6 +1103,10 @@
im-tpixels[y][x]=gdTrueColorAlpha(dr, dg, db,  gdAlphaOpaque);
 }  
 
+/*
+ * Added on 2003/12 by Pierre-Alain Joye ([EMAIL PROTECTED])
+ * (c) 2003 Pierre-Alain Joye
+ **/
 void gdImageAALine (gdImagePtr im, int x1, int y1, int x2, int y2, int col)
 {
/* keep them as 32bits */
@@ -2331,6 +2340,13 @@
}
 }
 
+
+/*
+ * Rotate function Added on 2003/12 
+ * by Pierre-Alain Joye ([EMAIL PROTECTED])
+ * (c) 2003 Pierre-Alain Joye
+ **/
+/* Begin rotate function */
 #ifdef ROTATE_PI
 #undef ROTATE_PI
 #endif /* ROTATE_PI */
@@ -2762,6 +2778,7 @@

return rotatedImg;
 }
+/* End Rotate function */
 
 gdImagePtr
 gdImageCreateFromXbm (FILE * fd)
@@ -3293,6 +3310,12 @@
}
 }
 
+
+/* Filters function added on 2003/12 
+ * by Pierre-Alain Joye ([EMAIL PROTECTED])
+ * (c) 2003 Pierre-Alain Joye
+ **/
+/* Begin filters function */
 #ifndef HAVE_GET_TRUE_COLOR
 #define 
GET_PIXEL_FUNCTION(src)(src-trueColor?gdImageGetTrueColorPixel:gdImageGetPixel)
 #endif
@@ -3745,3 +3768,4 @@

return gdImageConvolution(im, filter, weight+8, 0);
 }
+/* End filters function */



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

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

2003-01-20 Thread Pierre-Alain Joye

pajoye  Mon Jan 20 21:10:20 2003 EDT

  Modified files:  
/php4/ext/gd/libgd  gd.c 
  Log:
  Remove the (c), in the future, can we add PHP Licence terms for the new
  functions ?
  
  
Index: php4/ext/gd/libgd/gd.c
diff -u php4/ext/gd/libgd/gd.c:1.42 php4/ext/gd/libgd/gd.c:1.43
--- php4/ext/gd/libgd/gd.c:1.42 Mon Jan 20 20:49:34 2003
+++ php4/ext/gd/libgd/gd.c  Mon Jan 20 21:10:19 2003
@@ -1080,7 +1080,6 @@
 
 /*
  * Added on 2003/12 by Pierre-Alain Joye ([EMAIL PROTECTED])
- * (c) 2003 Pierre-Alain Joye
  * */
 #define BLEND_COLOR(a, nc, c, cc) \
 nc = (cc) + (c) - (cc)) * (a)) + c) - (cc)) * (a))  8) + 0x80)  8);
@@ -1105,7 +1104,6 @@
 
 /*
  * Added on 2003/12 by Pierre-Alain Joye ([EMAIL PROTECTED])
- * (c) 2003 Pierre-Alain Joye
  **/
 void gdImageAALine (gdImagePtr im, int x1, int y1, int x2, int y2, int col)
 {
@@ -2344,7 +2342,6 @@
 /*
  * Rotate function Added on 2003/12 
  * by Pierre-Alain Joye ([EMAIL PROTECTED])
- * (c) 2003 Pierre-Alain Joye
  **/
 /* Begin rotate function */
 #ifdef ROTATE_PI
@@ -3313,7 +3310,6 @@
 
 /* Filters function added on 2003/12 
  * by Pierre-Alain Joye ([EMAIL PROTECTED])
- * (c) 2003 Pierre-Alain Joye
  **/
 /* Begin filters function */
 #ifndef HAVE_GET_TRUE_COLOR



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

[PHP-CVS] cvs: php4 /sapi/embed EXPERIMENTAL config.m4

2003-01-20 Thread Edin Kadribasic

edink   Mon Jan 20 21:46:07 2003 EDT

  Added files: 
/php4/sapi/embedEXPERIMENTAL 

  Modified files:  
/php4/sapi/embedconfig.m4 
  Log:
  Added missing warning about experimental nature of sapi/embed.
  
  
Index: php4/sapi/embed/config.m4
diff -u php4/sapi/embed/config.m4:1.7 php4/sapi/embed/config.m4:1.8
--- php4/sapi/embed/config.m4:1.7   Mon Oct 14 18:18:35 2002
+++ php4/sapi/embed/config.m4   Mon Jan 20 21:46:07 2003
@@ -1,11 +1,11 @@
 dnl
-dnl $Id: config.m4,v 1.7 2002/10/14 22:18:35 edink Exp $
+dnl $Id: config.m4,v 1.8 2003/01/21 02:46:07 edink Exp $
 dnl
 
 AC_MSG_CHECKING(for embedded SAPI library support)
 
 AC_ARG_ENABLE(embed,
-[  --enable-embed[=TYPE]   Enable building of embedded SAPI library
+[  --enable-embed[=TYPE]   EXPERIMENTAL: Enable building of embedded SAPI library
   TYPE is either 'shared' or 'static'. [TYPE=shared]],
 [ 
   case $enableval in



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

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/embed EXPERIMENTAL config.m4

2003-01-20 Thread Edin Kadribasic

edink   Mon Jan 20 22:04:38 2003 EDT

  Added files: (Branch: PHP_4_3)
/php4/sapi/embedEXPERIMENTAL 

  Modified files:  
/php4/sapi/embedconfig.m4 
  Log:
  MFH
  
  
Index: php4/sapi/embed/config.m4
diff -u php4/sapi/embed/config.m4:1.7 php4/sapi/embed/config.m4:1.7.2.1
--- php4/sapi/embed/config.m4:1.7   Mon Oct 14 18:18:35 2002
+++ php4/sapi/embed/config.m4   Mon Jan 20 22:04:38 2003
@@ -1,11 +1,11 @@
 dnl
-dnl $Id: config.m4,v 1.7 2002/10/14 22:18:35 edink Exp $
+dnl $Id: config.m4,v 1.7.2.1 2003/01/21 03:04:38 edink Exp $
 dnl
 
 AC_MSG_CHECKING(for embedded SAPI library support)
 
 AC_ARG_ENABLE(embed,
-[  --enable-embed[=TYPE]   Enable building of embedded SAPI library
+[  --enable-embed[=TYPE]   EXPERIMENTAL: Enable building of embedded SAPI library
   TYPE is either 'shared' or 'static'. [TYPE=shared]],
 [ 
   case $enableval in



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

[PHP-CVS] cvs: php4 /ext/ircg config.m4

2003-01-20 Thread Jani Taskinen

sniper  Tue Jan 21 00:08:15 2003 EDT

  Modified files:  
/php4/ext/ircg  config.m4 
  Log:
  Fix bug: #21249, configure fails when searching for ircg-config script
  
Index: php4/ext/ircg/config.m4
diff -u php4/ext/ircg/config.m4:1.18 php4/ext/ircg/config.m4:1.19
--- php4/ext/ircg/config.m4:1.18Fri Dec  6 01:27:01 2002
+++ php4/ext/ircg/config.m4 Tue Jan 21 00:08:14 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.18 2002/12/06 06:27:01 sas Exp $
+dnl $Id: config.m4,v 1.19 2003/01/21 05:08:14 sniper Exp $
 dnl
 
 PHP_ARG_WITH(ircg, for IRCG support,
@@ -17,8 +17,10 @@
 ])
 
 if test $PHP_IRCG != no; then
-  $IRCG_CONFIG --ldflags
-  if test $? != 0; then
+
+  $IRCG_PREFIX=`$IRCG_CONFIG --prefix`
+
+  if test -z $IRCG_PREFIX; then
 AC_MSG_ERROR([I cannot run the ircg-config script which should have been 
installed by IRCG. Please ensure that the script is in your PATH or point 
--with-ircg-config to the path of the script.])
   fi
   



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/ircg config.m4

2003-01-20 Thread Jani Taskinen

sniper  Tue Jan 21 00:08:33 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/ircg  config.m4 
  Log:
  MFH: Fix bug: #21249, configure fails when searching for ircg-config script
  
Index: php4/ext/ircg/config.m4
diff -u php4/ext/ircg/config.m4:1.14 php4/ext/ircg/config.m4:1.14.4.1
--- php4/ext/ircg/config.m4:1.14Mon Mar 18 10:00:57 2002
+++ php4/ext/ircg/config.m4 Tue Jan 21 00:08:33 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.14 2002/03/18 15:00:57 sas Exp $
+dnl $Id: config.m4,v 1.14.4.1 2003/01/21 05:08:33 sniper Exp $
 dnl
 
 PHP_ARG_WITH(ircg, for IRCG support,
@@ -17,8 +17,10 @@
 ])
 
 if test $PHP_IRCG != no; then
-  $IRCG_CONFIG --ldflags
-  if test $? != 0; then
+
+  $IRCG_PREFIX=`$IRCG_CONFIG --prefix`
+  
+  if test -z $IRCG_PREFIX; then
 AC_MSG_ERROR([I cannot run the ircg-config script which should have been 
installed by IRCG. Please ensure that the script is in your PATH or point 
--with-ircg-config to the path of the script.])
   fi
   



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

[PHP-CVS] cvs: php4 /ext/ircg config.m4

2003-01-20 Thread Jani Taskinen

sniper  Tue Jan 21 00:09:04 2003 EDT

  Modified files:  
/php4/ext/ircg  config.m4 
  Log:
  fix typo
  
Index: php4/ext/ircg/config.m4
diff -u php4/ext/ircg/config.m4:1.19 php4/ext/ircg/config.m4:1.20
--- php4/ext/ircg/config.m4:1.19Tue Jan 21 00:08:14 2003
+++ php4/ext/ircg/config.m4 Tue Jan 21 00:09:03 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.19 2003/01/21 05:08:14 sniper Exp $
+dnl $Id: config.m4,v 1.20 2003/01/21 05:09:03 sniper Exp $
 dnl
 
 PHP_ARG_WITH(ircg, for IRCG support,
@@ -18,7 +18,7 @@
 
 if test $PHP_IRCG != no; then
 
-  $IRCG_PREFIX=`$IRCG_CONFIG --prefix`
+  IRCG_PREFIX=`$IRCG_CONFIG --prefix`
 
   if test -z $IRCG_PREFIX; then
 AC_MSG_ERROR([I cannot run the ircg-config script which should have been 
installed by IRCG. Please ensure that the script is in your PATH or point 
--with-ircg-config to the path of the script.])



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/ircg config.m4

2003-01-20 Thread Jani Taskinen

sniper  Tue Jan 21 00:09:34 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/ircg  config.m4 
  Log:
  MFH
  
Index: php4/ext/ircg/config.m4
diff -u php4/ext/ircg/config.m4:1.14.4.1 php4/ext/ircg/config.m4:1.14.4.2
--- php4/ext/ircg/config.m4:1.14.4.1Tue Jan 21 00:08:33 2003
+++ php4/ext/ircg/config.m4 Tue Jan 21 00:09:33 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.14.4.1 2003/01/21 05:08:33 sniper Exp $
+dnl $Id: config.m4,v 1.14.4.2 2003/01/21 05:09:33 sniper Exp $
 dnl
 
 PHP_ARG_WITH(ircg, for IRCG support,
@@ -18,7 +18,7 @@
 
 if test $PHP_IRCG != no; then
 
-  $IRCG_PREFIX=`$IRCG_CONFIG --prefix`
+  IRCG_PREFIX=`$IRCG_CONFIG --prefix`
   
   if test -z $IRCG_PREFIX; then
 AC_MSG_ERROR([I cannot run the ircg-config script which should have been 
installed by IRCG. Please ensure that the script is in your PATH or point 
--with-ircg-config to the path of the script.])



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

[PHP-CVS] cvs: php4 /sapi/apache2filter config.m4

2003-01-20 Thread Jani Taskinen

sniper  Tue Jan 21 01:02:21 2003 EDT

  Modified files:  
/php4/sapi/apache2filterconfig.m4 
  Log:
  Fixed bug: #21698, httpd.conf not modified with make install
  
Index: php4/sapi/apache2filter/config.m4
diff -u php4/sapi/apache2filter/config.m4:1.25 php4/sapi/apache2filter/config.m4:1.26
--- php4/sapi/apache2filter/config.m4:1.25  Mon Sep 23 13:40:04 2002
+++ php4/sapi/apache2filter/config.m4   Tue Jan 21 01:02:19 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.25 2002/09/23 17:40:04 dreid Exp $
+dnl $Id: config.m4,v 1.26 2003/01/21 06:02:19 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS)
@@ -52,13 +52,12 @@
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
   if test -z `$APXS -q SYSCONFDIR`; then
-optarg=-a
-  else
 optarg=
+  else
+optarg=-a
   fi
 
-  INSTALL_IT='$(mkinstalldirs) '$APXS_LIBEXECDIR  \
-$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg}-n php4
+  INSTALL_IT='$(mkinstalldirs) '$APXS_LIBEXECDIR  $APXS -S 
+LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg} -n php4
 
   case $host_alias in
   *aix*)



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

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache2filter config.m4

2003-01-20 Thread Jani Taskinen

sniper  Tue Jan 21 01:03:16 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/sapi/apache2filterconfig.m4 
  Log:
  MFH: Fixed bug: #21698, httpd.conf not modified with make install
  
Index: php4/sapi/apache2filter/config.m4
diff -u php4/sapi/apache2filter/config.m4:1.25 
php4/sapi/apache2filter/config.m4:1.25.2.1
--- php4/sapi/apache2filter/config.m4:1.25  Mon Sep 23 13:40:04 2002
+++ php4/sapi/apache2filter/config.m4   Tue Jan 21 01:03:16 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.25 2002/09/23 17:40:04 dreid Exp $
+dnl $Id: config.m4,v 1.25.2.1 2003/01/21 06:03:16 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS)
@@ -52,13 +52,12 @@
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
   if test -z `$APXS -q SYSCONFDIR`; then
-optarg=-a
-  else
 optarg=
+  else
+optarg=-a
   fi
 
-  INSTALL_IT='$(mkinstalldirs) '$APXS_LIBEXECDIR  \
-$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg}-n php4
+  INSTALL_IT='$(mkinstalldirs) '$APXS_LIBEXECDIR  $APXS -S 
+LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg} -n php4
 
   case $host_alias in
   *aix*)



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

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

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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd config.m4

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

[PHP-CVS] cvs: php4 / README.TESTING

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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/pcre php_pcre.c

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

[PHP-CVS] cvs: php4 /ext/imap php_imap.c php_imap.h

Re: [PHP-CVS] cvs: php4 /ext/standard file.c

Re: [PHP-CVS] cvs: php4 /ext/standard file.c

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

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

[PHP-CVS] cvs: php4 /sapi/embed EXPERIMENTAL config.m4

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/embed EXPERIMENTAL config.m4

[PHP-CVS] cvs: php4 /ext/ircg config.m4

[PHP-CVS] cvs: php4(PHP_4_3) /ext/ircg config.m4

[PHP-CVS] cvs: php4 /ext/ircg config.m4

[PHP-CVS] cvs: php4(PHP_4_3) /ext/ircg config.m4

[PHP-CVS] cvs: php4 /sapi/apache2filter config.m4

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache2filter config.m4

21 matches

Site Navigation

Mail list logo

Footer information