date:20030122

[PHP-CVS] cvs: php4(PHP_4) /ext/ircg ircg.c

2003-01-22 Thread Sascha Schumann

sas Wed Jan 22 04:13:46 2003 EDT

  Modified files:  (Branch: PHP_4)
/php4/ext/ircg  ircg.c 
  Log:
  Fix for treating a NAMES list as single join
  
  
Index: php4/ext/ircg/ircg.c
diff -u php4/ext/ircg/ircg.c:1.137.2.1 php4/ext/ircg/ircg.c:1.137.2.1.2.1
--- php4/ext/ircg/ircg.c:1.137.2.1  Tue Dec 31 11:34:47 2002
+++ php4/ext/ircg/ircg.cWed Jan 22 04:13:45 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ircg.c,v 1.137.2.1 2002/12/31 16:34:47 sebastian Exp $ */
+/* $Id: ircg.c,v 1.137.2.1.2.1 2003/01/22 09:13:45 sas Exp $ */
 
 /* {{{ includes */
 
@@ -1128,32 +1128,61 @@
msg_send(conn, &m);
 }
 
-static void user_add(irconn_t *ircc, smart_str *channel, smart_str *users,
-   int nr, void *dummy)
+static void user_add_single(php_irconn_t *conn, smart_str *channel, smart_str *users)
+{
+   smart_str m = {0};
+   FORMAT_MSG(conn, FMT_MSG_JOIN, channel, NULL, &users[0],
+   NULL, &m, conn->conn.username, conn->conn.username_len);
+   FORMAT_MSG(conn, FMT_MSG_JOIN_LIST_END, channel, NULL, NULL,
+   NULL, &m, conn->conn.username, conn->conn.username_len);
+   msg_send(conn, &m);
+}
+
+static void user_add_multiple(php_irconn_t *conn, smart_str *channel, smart_str 
+*users, int nr)
 {
-   php_irconn_t *conn = dummy;
int i;
smart_str m = {0};
 
-   if (nr > 1) {
-   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_BEGIN, channel, NULL, NULL,
-   NULL, &m, conn->conn.username, 
conn->conn.username_len);
-   for (i = 0; i < nr; i++) {
-   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_ELEMENT, channel, NULL,
-   &users[i], NULL, &m, conn->conn.username, 
conn->conn.username_len);
-   }
-   
-   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_END, channel, NULL, NULL,
-   NULL, &m, conn->conn.username, 
conn->conn.username_len);
-   } else {
-   FORMAT_MSG(conn, FMT_MSG_JOIN, channel, NULL, &users[0],
-   NULL, &m, conn->conn.username, 
conn->conn.username_len);
-   FORMAT_MSG(conn, FMT_MSG_JOIN_LIST_END, channel, NULL, NULL,
+   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_BEGIN, channel, NULL, NULL,
NULL, &m, conn->conn.username, conn->conn.username_len);
+   for (i = 0; i < nr; i++) {
+   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_ELEMENT, channel, NULL,
+   &users[i], NULL, &m, conn->conn.username, 
+conn->conn.username_len);
}
+
+   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_END, channel, NULL, NULL,
+   NULL, &m, conn->conn.username, conn->conn.username_len);
+
+
msg_send(conn, &m);
 }
 
+#if IRCG_API_VERSION >= 20021109
+
+static void user_add_ex(irconn_t *ircc, smart_str *channel, smart_str *users,
+   int nr, int namelist, void *dummy)
+{
+   if (namelist) {
+   user_add_multiple(dummy, channel, users, nr);
+   } else {
+   user_add_single(dummy, channel, users);
+   }
+}
+
+#else
+
+static void user_add(irconn_t *ircc, smart_str *channel, smart_str *users,
+   int nr, void *dummy)
+{
+   if (nr > 1) {
+   user_add_multiple(dummy, channel, users, nr);
+   } else {
+   user_add_single(dummy, channel, users);
+   }
+}
+
+#endif
+
 static void new_topic(irconn_t *ircc, smart_str *channel, smart_str *who, smart_str 
*topic, void *dummy)
 {
php_irconn_t *conn = dummy;
@@ -1388,6 +1417,7 @@
conn->fd = thttpd_get_fd();
if (fcntl(conn->fd, F_GETFL) == -1) {
zend_hash_index_del(&h_irconn, Z_LVAL_PP(p1));
+   php_error(E_WARNING, "current fd is not valid");
RETURN_FALSE;
}
zend_hash_index_update(&h_fd2irconn, conn->fd, &Z_LVAL_PP(p1), sizeof(int), 
NULL);
@@ -1818,7 +1848,6 @@
IFMSG(FMT_MSG_NICK, IRCG_NICK, nick_handler);
 
IFMSG(FMT_MSG_SELF_PART, IRCG_PART, part_handler);
-   IFMSG(FMT_MSG_MASS_JOIN_ELEMENT, IRCG_USER_ADD, user_add);
IFMSG(FMT_MSG_LEAVE, IRCG_USER_LEAVE, user_leave);
IFMSG(FMT_MSG_KICK, IRCG_USER_KICK, user_kick);
IFMSG(FMT_MSG_QUIT, IRCG_USER_QUIT, user_quit);
@@ -1849,6 +1878,12 @@
/* RPL_LIST/RPL_LISTEND */
irc_register_hook(conn, IRCG_LIST, list_handler);
irc_register_hook(conn, IRCG_LISTEND, listend_handler);
+#endif
+
+#if IRCG_API_VERSION >= 20021109
+   IFMSG(FMT_MSG_MASS_JOIN_ELEMENT, IRCG_USER_ADD_EX, user_add_ex);
+#else  
+   IFMSG(FMT_MSG_MASS_JOIN_ELEMENT, IRCG_USER_ADD, user_add);
 #endif

 }



-- 
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 ircg.c

2003-01-22 Thread Sascha Schumann

sas Wed Jan 22 04:14:57 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/ircg  ircg.c 
  Log:
  Fix for treating a NAMES list as single join
  
  
Index: php4/ext/ircg/ircg.c
diff -u php4/ext/ircg/ircg.c:1.137.2.1 php4/ext/ircg/ircg.c:1.137.2.2
--- php4/ext/ircg/ircg.c:1.137.2.1  Tue Dec 31 11:34:47 2002
+++ php4/ext/ircg/ircg.cWed Jan 22 04:14:57 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ircg.c,v 1.137.2.1 2002/12/31 16:34:47 sebastian Exp $ */
+/* $Id: ircg.c,v 1.137.2.2 2003/01/22 09:14:57 sas Exp $ */
 
 /* {{{ includes */
 
@@ -1128,32 +1128,61 @@
msg_send(conn, &m);
 }
 
-static void user_add(irconn_t *ircc, smart_str *channel, smart_str *users,
-   int nr, void *dummy)
+static void user_add_single(php_irconn_t *conn, smart_str *channel, smart_str *users)
+{
+   smart_str m = {0};
+   FORMAT_MSG(conn, FMT_MSG_JOIN, channel, NULL, &users[0],
+   NULL, &m, conn->conn.username, conn->conn.username_len);
+   FORMAT_MSG(conn, FMT_MSG_JOIN_LIST_END, channel, NULL, NULL,
+   NULL, &m, conn->conn.username, conn->conn.username_len);
+   msg_send(conn, &m);
+}
+
+static void user_add_multiple(php_irconn_t *conn, smart_str *channel, smart_str 
+*users, int nr)
 {
-   php_irconn_t *conn = dummy;
int i;
smart_str m = {0};
 
-   if (nr > 1) {
-   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_BEGIN, channel, NULL, NULL,
-   NULL, &m, conn->conn.username, 
conn->conn.username_len);
-   for (i = 0; i < nr; i++) {
-   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_ELEMENT, channel, NULL,
-   &users[i], NULL, &m, conn->conn.username, 
conn->conn.username_len);
-   }
-   
-   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_END, channel, NULL, NULL,
-   NULL, &m, conn->conn.username, 
conn->conn.username_len);
-   } else {
-   FORMAT_MSG(conn, FMT_MSG_JOIN, channel, NULL, &users[0],
-   NULL, &m, conn->conn.username, 
conn->conn.username_len);
-   FORMAT_MSG(conn, FMT_MSG_JOIN_LIST_END, channel, NULL, NULL,
+   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_BEGIN, channel, NULL, NULL,
NULL, &m, conn->conn.username, conn->conn.username_len);
+   for (i = 0; i < nr; i++) {
+   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_ELEMENT, channel, NULL,
+   &users[i], NULL, &m, conn->conn.username, 
+conn->conn.username_len);
}
+
+   FORMAT_MSG(conn, FMT_MSG_MASS_JOIN_END, channel, NULL, NULL,
+   NULL, &m, conn->conn.username, conn->conn.username_len);
+
+
msg_send(conn, &m);
 }
 
+#if IRCG_API_VERSION >= 20021109
+
+static void user_add_ex(irconn_t *ircc, smart_str *channel, smart_str *users,
+   int nr, int namelist, void *dummy)
+{
+   if (namelist) {
+   user_add_multiple(dummy, channel, users, nr);
+   } else {
+   user_add_single(dummy, channel, users);
+   }
+}
+
+#else
+
+static void user_add(irconn_t *ircc, smart_str *channel, smart_str *users,
+   int nr, void *dummy)
+{
+   if (nr > 1) {
+   user_add_multiple(dummy, channel, users, nr);
+   } else {
+   user_add_single(dummy, channel, users);
+   }
+}
+
+#endif
+
 static void new_topic(irconn_t *ircc, smart_str *channel, smart_str *who, smart_str 
*topic, void *dummy)
 {
php_irconn_t *conn = dummy;
@@ -1388,6 +1417,7 @@
conn->fd = thttpd_get_fd();
if (fcntl(conn->fd, F_GETFL) == -1) {
zend_hash_index_del(&h_irconn, Z_LVAL_PP(p1));
+   php_error(E_WARNING, "current fd is not valid");
RETURN_FALSE;
}
zend_hash_index_update(&h_fd2irconn, conn->fd, &Z_LVAL_PP(p1), sizeof(int), 
NULL);
@@ -1818,7 +1848,6 @@
IFMSG(FMT_MSG_NICK, IRCG_NICK, nick_handler);
 
IFMSG(FMT_MSG_SELF_PART, IRCG_PART, part_handler);
-   IFMSG(FMT_MSG_MASS_JOIN_ELEMENT, IRCG_USER_ADD, user_add);
IFMSG(FMT_MSG_LEAVE, IRCG_USER_LEAVE, user_leave);
IFMSG(FMT_MSG_KICK, IRCG_USER_KICK, user_kick);
IFMSG(FMT_MSG_QUIT, IRCG_USER_QUIT, user_quit);
@@ -1849,6 +1878,12 @@
/* RPL_LIST/RPL_LISTEND */
irc_register_hook(conn, IRCG_LIST, list_handler);
irc_register_hook(conn, IRCG_LISTEND, listend_handler);
+#endif
+
+#if IRCG_API_VERSION >= 20021109
+   IFMSG(FMT_MSG_MASS_JOIN_ELEMENT, IRCG_USER_ADD_EX, user_add_ex);
+#else  
+   IFMSG(FMT_MSG_MASS_JOIN_ELEMENT, IRCG_USER_ADD, user_add);
 #endif

 }



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

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

2003-01-22 Thread Ilia Alshanetsky

iliaa   Wed Jan 22 14:53:30 2003 EDT

  Modified files:  
/php4/ext/gdgd.c 
  Log:
  Fixed a crash when invalid color is passed to imagepstext().
  
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.245 php4/ext/gd/gd.c:1.246
--- php4/ext/gd/gd.c:1.245  Fri Jan 17 16:37:56 2003
+++ php4/ext/gd/gd.cWed Jan 22 14:53:29 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.245 2003/01/17 21:37:56 iliaa Exp $ */
+/* $Id: gd.c,v 1.246 2003/01/22 19:53:29 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
Cold Spring Harbor Labs. */
@@ -3284,62 +3284,56 @@
Rasterize a string over an image */
 PHP_FUNCTION(imagepstext)
 {
-   zval **img, **str, **fnt, **sz, **fg, **bg, **sp, **px, **py, **aas, **wd, 
**ang;
-   int i, j, x, y;
-   int space;
+   zval *img, *fnt;
+   int i, j;
+   int _fg, _bg, x, y, size, space = 0, aa_steps = 4, width = 0;
int *f_ind;
int h_lines, v_lines, c_ind;
-   int rd, gr, bl, fg_rd, fg_gr, fg_bl, bg_rd, bg_gr, bg_bl, _fg, _bg;
+   int rd, gr, bl, fg_rd, fg_gr, fg_bl, bg_rd, bg_gr, bg_bl;
 #if HAVE_LIBGD20
int fg_al, bg_al, al;
 #endif
-   int aa[16], aa_steps;
-   int width, amount_kern, add_width;
-   double angle, extend;
+   int aa[16];
+   int amount_kern, add_width;
+   double angle = 0.0, extend;
unsigned long aa_greys[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 
15, 16};
gdImagePtr bg_img;
GLYPH *str_img;
T1_OUTLINE *char_path, *str_path;
T1_TMATRIX *transform = NULL;
char *_str;
+   int _str_len;
+   int argc = ZEND_NUM_ARGS();

-   switch(ZEND_NUM_ARGS()) {
-   case 8:
-   if (zend_get_parameters_ex(8, &img, &str, &fnt, &sz, &fg, &bg, &px, 
&py) == FAILURE) {
-   RETURN_FALSE;
-   }
-   space = 0;
-   aa_steps = 4;
-   width = 0;
-   angle = 0;
-   break;
-   case 12:
-   if (zend_get_parameters_ex(12, &img, &str, &fnt, &sz, &fg, &bg, &px, 
&py, &sp, &wd, &ang, &aas) == FAILURE) {
-   RETURN_FALSE;
-   }
-   convert_to_long_ex(sp);
-   convert_to_long_ex(wd);
-   convert_to_double_ex(ang);
-   convert_to_long_ex(aas);
-   space = Z_LVAL_PP(sp);
-   width = Z_LVAL_PP(wd);
-   angle = Z_DVAL_PP(ang);
-   aa_steps = Z_LVAL_PP(aas);
-   break;
-   default:
+   if (argc != 8 && argc != 12) {
ZEND_WRONG_PARAM_COUNT();
}
+   
+   if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsrl|lldl", &img, &_str, 
+&_str_len, &fnt, &size, &_fg, &_bg, &x, &y, &space, &width, &angle, &aa_steps) == 
+FAILURE) {
+   return;
+   }
 
-   convert_to_string_ex(str);
-   convert_to_long_ex(sz);
+   ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, &img, -1, "Image", le_gd);
+   ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font);
 
-   ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, img, -1, "Image", le_gd);
-   ZEND_FETCH_RESOURCE(f_ind, int *, fnt, -1, "Type 1 font", le_ps_font);
+   /* Ensure that the provided colors are valid */
+#if HAVE_LIBGD20
+   if (_fg < 0 || (!gdImageTrueColor(bg_img) && _fg > 
+gdImageColorsTotal(bg_img))) {
+#else
+   if (_fg < 0 || _fg > gdImageColorsTotal(bg_img)) {
+#endif 
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Foreground color index %d 
+out of range", _fg);
+   RETURN_FALSE;
+   }
 
-   x = Z_LVAL_PP(px);
-   y = Z_LVAL_PP(py);
-   _fg = Z_LVAL_PP(fg);
-   _bg = Z_LVAL_PP(bg);
+#if HAVE_LIBGD20
+   if (_bg < 0 || (!gdImageTrueColor(bg_img) && _fg > 
+gdImageColorsTotal(bg_img))) {
+#else
+   if (_bg < 0 || _bg > gdImageColorsTotal(bg_img)) {
+#endif 
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Background color index %d 
+out of range", _bg);
+   RETURN_FALSE;
+   }

fg_rd = gdImageRed  (bg_img, _fg);
fg_gr = gdImageGreen(bg_img, _fg);
@@ -3371,49 +3365,45 @@
T1_AASetBitsPerPixel(8);
 
switch (aa_steps) {
-   case 4:
-   T1_AASetGrayValues(0, 1, 2, 3, 4);
-   T1_AASetLevel(T1_AA_LOW);
-   break;
-   case 16:
-   T1_AAHSetGrayValues(aa_greys);
-   T1_AASetLevel(T1_AA_HIGH);
-   break;
-   default:
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value %d as 
number of steps for antialiasing", aa_steps);
-   RETURN_FALSE;
+   case 4:
+   T1_AASetGrayValues(0, 1, 2, 3, 4);
+   T1_AASetLevel(T1_AA_LOW);
+

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

2003-01-22 Thread Ilia Alshanetsky

iliaa   Wed Jan 22 14:53:41 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/gdgd.c 
  Log:
  MFH
  
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.221.2.10 php4/ext/gd/gd.c:1.221.2.11
--- php4/ext/gd/gd.c:1.221.2.10 Wed Jan  8 13:11:58 2003
+++ php4/ext/gd/gd.cWed Jan 22 14:53:40 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.221.2.10 2003/01/08 18:11:58 iliaa Exp $ */
+/* $Id: gd.c,v 1.221.2.11 2003/01/22 19:53:40 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
Cold Spring Harbor Labs. */
@@ -3192,62 +3192,56 @@
Rasterize a string over an image */
 PHP_FUNCTION(imagepstext)
 {
-   zval **img, **str, **fnt, **sz, **fg, **bg, **sp, **px, **py, **aas, **wd, 
**ang;
-   int i, j, x, y;
-   int space;
+   zval *img, *fnt;
+   int i, j;
+   int _fg, _bg, x, y, size, space = 0, aa_steps = 4, width = 0;
int *f_ind;
int h_lines, v_lines, c_ind;
-   int rd, gr, bl, fg_rd, fg_gr, fg_bl, bg_rd, bg_gr, bg_bl, _fg, _bg;
+   int rd, gr, bl, fg_rd, fg_gr, fg_bl, bg_rd, bg_gr, bg_bl;
 #if HAVE_LIBGD20
int fg_al, bg_al, al;
 #endif
-   int aa[16], aa_steps;
-   int width, amount_kern, add_width;
-   double angle, extend;
+   int aa[16];
+   int amount_kern, add_width;
+   double angle = 0.0, extend;
unsigned long aa_greys[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 
15, 16};
gdImagePtr bg_img;
GLYPH *str_img;
T1_OUTLINE *char_path, *str_path;
T1_TMATRIX *transform = NULL;
char *_str;
+   int _str_len;
+   int argc = ZEND_NUM_ARGS();

-   switch(ZEND_NUM_ARGS()) {
-   case 8:
-   if (zend_get_parameters_ex(8, &img, &str, &fnt, &sz, &fg, &bg, &px, 
&py) == FAILURE) {
-   RETURN_FALSE;
-   }
-   space = 0;
-   aa_steps = 4;
-   width = 0;
-   angle = 0;
-   break;
-   case 12:
-   if (zend_get_parameters_ex(12, &img, &str, &fnt, &sz, &fg, &bg, &px, 
&py, &sp, &wd, &ang, &aas) == FAILURE) {
-   RETURN_FALSE;
-   }
-   convert_to_long_ex(sp);
-   convert_to_long_ex(wd);
-   convert_to_double_ex(ang);
-   convert_to_long_ex(aas);
-   space = Z_LVAL_PP(sp);
-   width = Z_LVAL_PP(wd);
-   angle = Z_DVAL_PP(ang);
-   aa_steps = Z_LVAL_PP(aas);
-   break;
-   default:
+   if (argc != 8 && argc != 12) {
ZEND_WRONG_PARAM_COUNT();
}
+   
+   if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsrl|lldl", &img, &_str, 
+&_str_len, &fnt, &size, &_fg, &_bg, &x, &y, &space, &width, &angle, &aa_steps) == 
+FAILURE) {
+   return;
+   }
 
-   convert_to_string_ex(str);
-   convert_to_long_ex(sz);
+   ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, &img, -1, "Image", le_gd);
+   ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font);
 
-   ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, img, -1, "Image", le_gd);
-   ZEND_FETCH_RESOURCE(f_ind, int *, fnt, -1, "Type 1 font", le_ps_font);
+   /* Ensure that the provided colors are valid */
+#if HAVE_LIBGD20
+   if (_fg < 0 || (!gdImageTrueColor(bg_img) && _fg > 
+gdImageColorsTotal(bg_img))) {
+#else
+   if (_fg < 0 || _fg > gdImageColorsTotal(bg_img)) {
+#endif 
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Foreground color index %d 
+out of range", _fg);
+   RETURN_FALSE;
+   }
 
-   x = Z_LVAL_PP(px);
-   y = Z_LVAL_PP(py);
-   _fg = Z_LVAL_PP(fg);
-   _bg = Z_LVAL_PP(bg);
+#if HAVE_LIBGD20
+   if (_bg < 0 || (!gdImageTrueColor(bg_img) && _fg > 
+gdImageColorsTotal(bg_img))) {
+#else
+   if (_bg < 0 || _bg > gdImageColorsTotal(bg_img)) {
+#endif 
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Background color index %d 
+out of range", _bg);
+   RETURN_FALSE;
+   }

fg_rd = gdImageRed  (bg_img, _fg);
fg_gr = gdImageGreen(bg_img, _fg);
@@ -3279,49 +3273,45 @@
T1_AASetBitsPerPixel(8);
 
switch (aa_steps) {
-   case 4:
-   T1_AASetGrayValues(0, 1, 2, 3, 4);
-   T1_AASetLevel(T1_AA_LOW);
-   break;
-   case 16:
-   T1_AAHSetGrayValues(aa_greys);
-   T1_AASetLevel(T1_AA_HIGH);
-   break;
-   default:
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value %d as 
number of steps for antialiasing", aa_steps);
-   RETURN_FALSE;
+   case 4:
+   T1_AASetGrayValues(0, 1, 2, 3, 4);
+   T1_AASetLevel(T1_AA_LOW);
+   break;
+

[PHP-CVS] cvs: php4(PHP_4_3) /ext/ming ming.dsp

2003-01-22 Thread Frank M. Kromann

fmk Wed Jan 22 15:12:45 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/ming  ming.dsp 
  Log:
  adding missing zlib.lib and path to bindlib
  
Index: php4/ext/ming/ming.dsp
diff -u php4/ext/ming/ming.dsp:1.1 php4/ext/ming/ming.dsp:1.1.14.1
--- php4/ext/ming/ming.dsp:1.1  Wed Jan 31 12:04:59 2001
+++ php4/ext/ming/ming.dsp  Wed Jan 22 15:12:45 2003
@@ -43,7 +43,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D 
"_MBCS" /D "_USRDLL" /D "MING_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I 
"..\..\main" /I "..\..\win32" /D "WIN32" /D "PHP_EXPORTS" /D "COMPILE_DL_MING" /D 
"HAVE_MING" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "PHP_WIN32" 
/D ZTS=1 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I 
+"..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D "WIN32" /D "PHP_EXPORTS" 
+/D "COMPILE_DL_MING" /D "HAVE_MING" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D 
+"ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -53,7 +53,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libming.lib kernel32.lib user32.lib gdi32.lib winspool.lib 
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ming.dll" 
/libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php4ts.lib libming.lib zlib.lib kernel32.lib user32.lib gdi32.lib 
+winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
+odbc32.lib odbccp32.lib /nologo /dll /machine:I386 
+/out:"..\..\Release_TS/php_ming.dll" /libpath:"..\..\Release_TS" 
+/libpath:"..\..\Release_TS_Inline"
 
 !ELSEIF  "$(CFG)" == "ming - Win32 Debug_TS"
 
@@ -68,8 +68,8 @@
 # PROP Intermediate_Dir "Debug_TS"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 
/D "_MBCS" /D "_USRDLL" /D "MING_EXPORTS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" 
/I "..\..\main" /I "..\..\win32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" 
/D "PHP_EXPORTS" /D "COMPILE_DL_MING" /D "ZEND_WIN32" /D "PHP_WIN32" /D "HAVE_MING" /D 
ZTS=1 /YX /FD /GZ  /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 
+/D "_MBCS" /D "_USRDLL" /D "MING_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" 
+/I "..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D ZEND_DEBUG=1 /D "WIN32" 
+/D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_MING" /D "ZEND_WIN32" /D 
+"PHP_WIN32" /D "HAVE_MING" /D ZTS=1 /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -79,7 +79,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib libming.lib kernel32.lib user32.lib gdi32.lib 
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 
/out:"..\..\Debug_TS/php_ming.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php4ts_debug.lib libming.lib zlib.lib kernel32.lib user32.lib gdi32.lib 
+winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
+odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 
+/out:"..\..\Debug_TS/php_ming.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
 
 !ENDIF 
 



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

[PHP-CVS] cvs: php4 /ext/ming ming.dsp

2003-01-22 Thread Frank M. Kromann

fmk Wed Jan 22 15:13:10 2003 EDT

  Modified files:  
/php4/ext/ming  ming.dsp 
  Log:
  adding missing zlib.lib and path to bindlib
  
Index: php4/ext/ming/ming.dsp
diff -u php4/ext/ming/ming.dsp:1.1 php4/ext/ming/ming.dsp:1.2
--- php4/ext/ming/ming.dsp:1.1  Wed Jan 31 12:04:59 2001
+++ php4/ext/ming/ming.dsp  Wed Jan 22 15:13:09 2003
@@ -43,7 +43,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D 
"_MBCS" /D "_USRDLL" /D "MING_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I 
"..\..\main" /I "..\..\win32" /D "WIN32" /D "PHP_EXPORTS" /D "COMPILE_DL_MING" /D 
"HAVE_MING" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "PHP_WIN32" 
/D ZTS=1 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I 
+"..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D "WIN32" /D "PHP_EXPORTS" 
+/D "COMPILE_DL_MING" /D "HAVE_MING" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D 
+"ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -53,7 +53,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libming.lib kernel32.lib user32.lib gdi32.lib winspool.lib 
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ming.dll" 
/libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php4ts.lib libming.lib zlib.lib kernel32.lib user32.lib gdi32.lib 
+winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
+odbc32.lib odbccp32.lib /nologo /dll /machine:I386 
+/out:"..\..\Release_TS/php_ming.dll" /libpath:"..\..\Release_TS" 
+/libpath:"..\..\Release_TS_Inline"
 
 !ELSEIF  "$(CFG)" == "ming - Win32 Debug_TS"
 
@@ -68,8 +68,8 @@
 # PROP Intermediate_Dir "Debug_TS"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 
/D "_MBCS" /D "_USRDLL" /D "MING_EXPORTS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" 
/I "..\..\main" /I "..\..\win32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" 
/D "PHP_EXPORTS" /D "COMPILE_DL_MING" /D "ZEND_WIN32" /D "PHP_WIN32" /D "HAVE_MING" /D 
ZTS=1 /YX /FD /GZ  /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 
+/D "_MBCS" /D "_USRDLL" /D "MING_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" 
+/I "..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D ZEND_DEBUG=1 /D "WIN32" 
+/D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_MING" /D "ZEND_WIN32" /D 
+"PHP_WIN32" /D "HAVE_MING" /D ZTS=1 /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -79,7 +79,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib libming.lib kernel32.lib user32.lib gdi32.lib 
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 
/out:"..\..\Debug_TS/php_ming.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php4ts_debug.lib libming.lib zlib.lib kernel32.lib user32.lib gdi32.lib 
+winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
+odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 
+/out:"..\..\Debug_TS/php_ming.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
 
 !ENDIF 
 



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

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

2003-01-22 Thread Anil Madhavapeddy

avsmWed Jan 22 15:41:29 2003 EDT

  Modified files:  
/php4/ext/standard  config.m4 
  Log:
  typo
  
  
Index: php4/ext/standard/config.m4
diff -u php4/ext/standard/config.m4:1.51 php4/ext/standard/config.m4:1.52
--- php4/ext/standard/config.m4:1.51Wed Jan 15 11:29:00 2003
+++ php4/ext/standard/config.m4 Wed Jan 22 15:41:28 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.51 2003/01/15 16:29:00 wez Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.52 2003/01/22 20:41:28 avsm Exp $ -*- sh -*-
 
 divert(3)dnl
 
@@ -6,7 +6,7 @@
 dnl Check if flush should be called explicitly after buffered io
 dnl
 AC_DEFUN(AC_FLUSH_IO,[
-  AC_CACHE_CHECK([whether flush should be called explicitly after a bufferered io], 
ac_cv_flush_io,[
+  AC_CACHE_CHECK([whether flush should be called explicitly after a buffered io], 
+ac_cv_flush_io,[
   AC_TRY_RUN( [
 #include 
 #include 



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

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

2003-01-22 Thread Ilia Alshanetsky

iliaa   Wed Jan 22 17:07:27 2003 EDT

  Modified files:  
/php4/ext/sybase_ct php_sybase_ct.c 
  Log:
  Removed non-needed code.
  
  
Index: php4/ext/sybase_ct/php_sybase_ct.c
diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.79 php4/ext/sybase_ct/php_sybase_ct.c:1.80
--- php4/ext/sybase_ct/php_sybase_ct.c:1.79 Wed Jan 15 08:55:32 2003
+++ php4/ext/sybase_ct/php_sybase_ct.c  Wed Jan 22 17:07:22 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: php_sybase_ct.c,v 1.79 2003/01/15 13:55:32 iliaa Exp $ */
+/* $Id: php_sybase_ct.c,v 1.80 2003/01/22 22:07:22 iliaa Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -1262,8 +1262,7 @@
if (sybase_ptr->active_result_index) {
zval *tmp = NULL;

-   php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase:  Called %s() 
without first fetching all rows from a previous unbuffered query",
-   get_active_function_name(TSRMLS_C));
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE, "called without first 
+fetching all rows from a previous unbuffered query");
if (sybase_ptr->cmd) {
ct_cancel(NULL, sybase_ptr->cmd, CS_CANCEL_ALL);
}
@@ -2058,7 +2057,7 @@
}
 
if (!zend_is_callable(*params[0], 0, &name)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s(): First argumented is 
expected to be a valid callback, '%s' was given", get_active_function_name(TSRMLS_C), 
name);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "First argumented is 
+expected to be a valid callback, '%s' was given", name);
efree(name);
efree(params);
RETURN_FALSE;



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

[PHP-CVS] cvs: php4 /tests/func 005a.phpt

2003-01-22 Thread Jani Taskinen

sniper  Wed Jan 22 22:28:41 2003 EDT

  Added files: 
/php4/tests/func005a.phpt 
  Log:
  Added test for bug: #21513
  

Index: php4/tests/func/005a.phpt
+++ php4/tests/func/005a.phpt
--TEST--
Testing register_shutdown_function() with timeout. (Bug: #21513)
--POST--
--GET--
--FILE--

--EXPECT--
Start
Shutdown



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

[PHP-CVS] cvs: php4(PHP_4_3) /tests/func 005a.phpt

2003-01-22 Thread Jani Taskinen

sniper  Wed Jan 22 22:29:23 2003 EDT

  Added files: (Branch: PHP_4_3)
/php4/tests/func005a.phpt 
  Log:
  MFH: Added test for bug: #21513
  

Index: php4/tests/func/005a.phpt
+++ php4/tests/func/005a.phpt
--TEST--
Testing register_shutdown_function() with timeout. (Bug: #21513)
--POST--
--GET--
--FILE--

--EXPECT--
Start
Shutdown



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

[PHP-CVS] cvs: php4(PHP_4_3) / NEWS

2003-01-22 Thread Jani Taskinen

sniper  Thu Jan 23 00:20:34 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   NEWS 
  Log:
  fugbix news
  
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.49 php4/NEWS:1.1247.2.50
--- php4/NEWS:1.1247.2.49   Tue Jan 14 09:49:41 2003
+++ php4/NEWS   Thu Jan 23 00:20:34 2003
@@ -9,6 +9,7 @@
   . Disallow linkage of Berkeley db submodules against libraries with
 different major version.
   . Disallow configuring of more than one Berkeley db handler. 
+- Fixed bug #14532 (fixed connection_status() to return 2 for timeouts). (Jani)
 - Fixed bug #21525 (bind_textdomain_codeset() now available on Windows). (Edin)
 - Fixed bug #21511 (config.status warning). (Jani)
 - Fixed bug #21531 (file_exists() and other filestat functions report errors



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

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

2003-01-22 Thread Jani Taskinen

sniper  Thu Jan 23 00:33:10 2003 EDT

  Modified files:  
/php4/ext/ingres_ii config.m4 
  Log:
  Correct default path
  
Index: php4/ext/ingres_ii/config.m4
diff -u php4/ext/ingres_ii/config.m4:1.8 php4/ext/ingres_ii/config.m4:1.9
--- php4/ext/ingres_ii/config.m4:1.8Tue Mar 12 11:21:42 2002
+++ php4/ext/ingres_ii/config.m4Thu Jan 23 00:33:09 2003
@@ -1,10 +1,10 @@
 dnl
-dnl $Id: config.m4,v 1.8 2002/03/12 16:21:42 sas Exp $
+dnl $Id: config.m4,v 1.9 2003/01/23 05:33:09 sniper Exp $
 dnl
 
 PHP_ARG_WITH(ingres, for Ingres II support,
 [  --with-ingres[=DIR] Include Ingres II support. DIR is the Ingres
-  base directory (default $II_SYSTEM/II/ingres)])
+  base directory (default $II_SYSTEM/ingres)])
 
 if test "$PHP_INGRES" != "no"; then
   AC_DEFINE(HAVE_II, 1, [Whether you have Ingres II])



-- 
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/ingres_ii config.m4

2003-01-22 Thread Jani Taskinen

sniper  Thu Jan 23 00:33:17 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/ingres_ii config.m4 
  Log:
  MFH
  
Index: php4/ext/ingres_ii/config.m4
diff -u php4/ext/ingres_ii/config.m4:1.8 php4/ext/ingres_ii/config.m4:1.8.4.1
--- php4/ext/ingres_ii/config.m4:1.8Tue Mar 12 11:21:42 2002
+++ php4/ext/ingres_ii/config.m4Thu Jan 23 00:33:17 2003
@@ -1,10 +1,10 @@
 dnl
-dnl $Id: config.m4,v 1.8 2002/03/12 16:21:42 sas Exp $
+dnl $Id: config.m4,v 1.8.4.1 2003/01/23 05:33:17 sniper Exp $
 dnl
 
 PHP_ARG_WITH(ingres, for Ingres II support,
 [  --with-ingres[=DIR] Include Ingres II support. DIR is the Ingres
-  base directory (default $II_SYSTEM/II/ingres)])
+  base directory (default $II_SYSTEM/ingres)])
 
 if test "$PHP_INGRES" != "no"; then
   AC_DEFINE(HAVE_II, 1, [Whether you have Ingres II])



-- 
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-22 Thread Jani Taskinen

sniper  Thu Jan 23 01:22:42 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/gdconfig.m4 
  Log:
  Enable building with freetype 2.1.3
  
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.120.2.7 php4/ext/gd/config.m4:1.120.2.8
--- php4/ext/gd/config.m4:1.120.2.7 Mon Jan 20 05:39:39 2003
+++ php4/ext/gd/config.m4   Thu Jan 23 01:22:42 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.120.2.7 2003/01/20 10:39:39 sniper Exp $
+dnl $Id: config.m4,v 1.120.2.8 2003/01/23 06:22:42 sniper Exp $
 dnl
 
 dnl
@@ -183,6 +183,7 @@
 
 if test -n "$FREETYPE2_DIR" ; then
   PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
+  PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
   PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
   AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
   AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])



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

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

2003-01-22 Thread Jani Taskinen

sniper  Thu Jan 23 01:23:08 2003 EDT

  Modified files:  
/php4/ext/gdconfig.m4 
  Log:
  MFB
  
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.127 php4/ext/gd/config.m4:1.128
--- php4/ext/gd/config.m4:1.127 Mon Jan 20 05:39:29 2003
+++ php4/ext/gd/config.m4   Thu Jan 23 01:23:08 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.127 2003/01/20 10:39:29 sniper Exp $
+dnl $Id: config.m4,v 1.128 2003/01/23 06:23:08 sniper Exp $
 dnl
 
 dnl
@@ -183,6 +183,7 @@
 
 if test -n "$FREETYPE2_DIR" ; then
   PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
+  PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
   PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
   AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
   AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])



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

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

2003-01-22 Thread Jani Taskinen

sniper  Thu Jan 23 01:42:43 2003 EDT

  Modified files:  
/php4   configure.in 
  Log:
  remove this stupid highlight which causes trouble.
  
Index: php4/configure.in
diff -u php4/configure.in:1.414 php4/configure.in:1.415
--- php4/configure.in:1.414 Sun Jan 19 16:37:40 2003
+++ php4/configure.in   Thu Jan 23 01:42:43 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.414 2003/01/19 21:37:40 zeev Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.415 2003/01/23 06:42:43 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1316,11 +1316,10 @@
 | about the implications of having register_globals set to on, and   |
 | avoid using it if possible.|
 ++
-X
 
-PHP_CONFIGURE_PART(
 Thank you for using PHP.
-)
+
+X
 
 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) / configure.in

2003-01-22 Thread Jani Taskinen

sniper  Thu Jan 23 01:42:52 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   configure.in 
  Log:
  MFH
  
Index: php4/configure.in
diff -u php4/configure.in:1.396.2.23 php4/configure.in:1.396.2.24
--- php4/configure.in:1.396.2.23Thu Jan  9 11:38:28 2003
+++ php4/configure.in   Thu Jan 23 01:42:51 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.23 2003/01/09 16:38:28 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.24 2003/01/23 06:42:51 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1316,11 +1316,10 @@
 | about the implications of having register_globals set to on, and   |
 | avoid using it if possible.|
 ++
-X
 
-PHP_CONFIGURE_PART(
 Thank you for using PHP.
-)
+
+X
 
 fi
 ])



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

[PHP-CVS] cvs: php4(PHP_4) /ext/ircg ircg.c

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

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

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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/ming ming.dsp

[PHP-CVS] cvs: php4 /ext/ming ming.dsp

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

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

[PHP-CVS] cvs: php4 /tests/func 005a.phpt

[PHP-CVS] cvs: php4(PHP_4_3) /tests/func 005a.phpt

[PHP-CVS] cvs: php4(PHP_4_3) / NEWS

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

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

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

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

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

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

17 matches

Site Navigation

Mail list logo

Footer information