date:20051204

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2005-12-04 Thread changelog

changelog   Mon Dec  5 01:49:26 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2184r2=1.2185ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2184 php-src/ChangeLog:1.2185
--- php-src/ChangeLog:1.2184Sun Dec  4 01:46:40 2005
+++ php-src/ChangeLog   Mon Dec  5 01:49:13 2005
@@ -1,3 +1,96 @@
+2005-12-04  Jani Taskinen  [EMAIL PROTECTED]
+
+* sapi/apache/config.m4
+  sapi/apache_hooks/config.m4:
+  - Nuke non-working part
+
+* makerpm
+  ext/gd/gd.c
+  ext/gd/gd_ctx.c:
+  php3 is dead
+
+* (PHP_5_1)
+  README.CVS-RULES:
+  fix branches
+
+2005-12-04  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/standard/tests/strings/http_build_query.phpt
+  ext/standard/tests/strings/url_t.phpt:
+  MFB51: Added tests for new parse_url() and http_build_query()
+  functionality.
+
+* ext/standard/tests/strings/http_build_query.phpt
+  ext/standard/tests/strings/http_build_query.phpt
+  ext/standard/tests/strings/url_t.phpt:
+  
+  file http_build_query.phpt was initially added on branch PHP_5_1.
+
+* (PHP_5_1)
+  ext/standard/basic_functions.c
+  ext/standard/http.c
+  ext/standard/php_http.h
+  ext/standard/url.c
+  ext/standard/url.h:
+  MFH:
+  Added 2nd optional parameter to parse_url() that allows retrieval of
+  individual URL components.
+  Added 3rd optional parameter to http_build_query() that allows custom
+  param
+  separator.
+
+* (PHP_5_1)
+  ext/standard/sunfuncs.c:
+  load proper header file
+
+* (PHP_4_4)
+  NEWS
+  ext/sockets/sockets.c:
+  MFH: Fixed bug #35062 (socket_read() produces warnings on non blocking
+  sockets).
+
+* ext/sockets/sockets.c:
+  MFB51: Fixed bug #35062 (socket_read() produces warnings on non blocking
+  sockets).
+
+* (PHP_5_1)
+  NEWS
+  ext/sockets/sockets.c:
+  Fixed bug #35062 (socket_read() produces warnings on non blocking 
sockets).
+
+* Makefile.gcov:
+  MFB51: Fixed gcov for generated files
+
+* (PHP_5_1)
+  Makefile.gcov:
+  Fixed gcov for generated files
+
+* ext/sqlite/libsqlite/src/parse.c:
+  MFB51: Regen files so they work properly with gcov.
+
+* (PHP_5_1)
+  ext/sqlite/libsqlite/src/parse.c:
+  Regen files so they work properly with gcov.
+
+2005-12-04  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  NEWS:
+  reorder,reword
+
+2005-12-04  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  NEWS:
+  BFN
+
+* (PHP_5_1)
+  ZendEngine2/zend_exceptions.c:
+  MFH: fix #35539 (typo in error message for ErrorException)
+
+* ZendEngine2/zend_exceptions.c:
+  fix #35539 (typo in error message for ErrorException)
+
 2005-12-03  Antony Dovgal  [EMAIL PROTECTED]
 
 * ext/sockets/sockets.c:
@@ -18194,7 +18287,7 @@
 
 * (PHP_4_3)
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2184 2005/12/04 06:46:40 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2185 2005/12/05 06:49:13 changelog Exp $ tag
 
 * (PHP_5_0)
   ext/standard/url_scanner_ex.c:
@@ -21595,7 +21688,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.2184 2005/12/04 06:46:40 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.2185 2005/12/05 06:49:13 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -22076,7 +22169,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.2184 2005/12/04 06:46:40 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.2185 2005/12/05 06:49:13 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -23550,7 +23643,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2184 2005/12/04 06:46:40 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2185 2005/12/05 06:49:13 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:

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

2005-12-04 Thread changelog

changelog   Mon Dec  5 01:50:44 2005 EDT

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.823r2=1.824ty=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.823 ZendEngine2/ChangeLog:1.824
--- ZendEngine2/ChangeLog:1.823 Sun Dec  4 01:48:28 2005
+++ ZendEngine2/ChangeLog   Mon Dec  5 01:50:42 2005
@@ -1,3 +1,12 @@
+2005-12-04  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  zend_exceptions.c:
+  MFH: fix #35539 (typo in error message for ErrorException)
+
+* zend_exceptions.c:
+  fix #35539 (typo in error message for ErrorException)
+
 2005-12-03  Jani Taskinen  [EMAIL PROTECTED]
 
 * tests/bug30346.phpt:
@@ -11358,7 +11367,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.823 2005/12/04 06:48:28 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.824 2005/12/05 06:50:42 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -13082,7 +13091,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.823 2005/12/04 06:48:28 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.824 2005/12/05 06:50:42 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c

2005-12-04 Thread Antony Dovgal

tony2001Sun Dec  4 06:40:54 2005 EDT

  Modified files:  
/php-src/ext/pdopdo_dbh.c 
  Log:
  fix #35543 (php crash when calling non existing method of a class that 
extends PDO)
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.102r2=1.103ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.102 php-src/ext/pdo/pdo_dbh.c:1.103
--- php-src/ext/pdo/pdo_dbh.c:1.102 Thu Nov 24 11:22:27 2005
+++ php-src/ext/pdo/pdo_dbh.c   Sun Dec  4 06:40:52 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.102 2005/11/24 16:22:27 iliaa Exp $ */
+/* $Id: pdo_dbh.c,v 1.103 2005/12/04 11:40:52 tony2001 Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -1110,7 +1110,7 @@
int namelen;
char *lc_name;
 
-   if (!dbh-methods-get_driver_methods) {
+   if (!dbh || !dbh-methods || !dbh-methods-get_driver_methods) {
return 0;
}
funcs = dbh-methods-get_driver_methods(dbh,

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_dbh.c

2005-12-04 Thread Antony Dovgal

tony2001Sun Dec  4 06:41:13 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdopdo_dbh.c 
  Log:
  MFH: fix #35543 (php crash when calling non existing method of a class that 
extends PDO)
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.19r2=1.82.2.20ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.19 php-src/ext/pdo/pdo_dbh.c:1.82.2.20
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.19 Mon Nov 28 00:23:21 2005
+++ php-src/ext/pdo/pdo_dbh.c   Sun Dec  4 06:41:13 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.82.2.19 2005/11/28 05:23:21 wez Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.20 2005/12/04 11:41:13 tony2001 Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -1112,7 +1112,7 @@
int namelen;
char *lc_name;
 
-   if (!dbh-methods-get_driver_methods) {
+   if (!dbh || !dbh-methods || !dbh-methods-get_driver_methods) {
return 0;
}
funcs = dbh-methods-get_driver_methods(dbh,

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

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS

2005-12-04 Thread Jani Taskinen

sniper  Sun Dec  4 09:10:29 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
  Log:
  reorder,reword
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.270r2=1.2027.2.271ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.270 php-src/NEWS:1.2027.2.271
--- php-src/NEWS:1.2027.2.270   Sun Dec  4 06:47:18 2005
+++ php-src/NEWSSun Dec  4 09:10:22 2005
@@ -1,14 +1,14 @@
 PHPNEWS
 |||
 ?? ??? 200?, PHP 5.1.2
-- Added new extensions (Ilia,Wez)
-  . XmlWriter
+- Added new extensions: (Ilia, Wez)
+  . XMLWriter
   . Hash
-- Moved reflection into its own extension. (Marcus)
 - Added reflection constants as class constants. (Johannes)
 - Added --enable-gcov configure option to enable C-level code coverage.
   (John, Jani)
 - Added missing support for 'B' format identifier to date() function. (Ilia)
+- Changed reflection to be an extension. (Marcus)
 - Improved SPL: (Marcus)
   . Added class SplFileInfo as root class for DirectoryIterator and 
 SplFileObject

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

[PHP-CVS] cvs: CVSROOT / avail

2005-12-04 Thread Wez Furlong

wez Sun Dec  4 11:00:51 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  phar karma for Greg
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1056r2=1.1057ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1056 CVSROOT/avail:1.1057
--- CVSROOT/avail:1.1056Thu Dec  1 07:55:56 2005
+++ CVSROOT/avail   Sun Dec  4 11:00:50 2005
@@ -305,6 +305,7 @@
 avail|ttsuruoka|pear/Services_Amazon
 avail|fa|peardoc,pear/Net_DNS,pear/Net_IPv4
 avail|silvano|peardoc,pear/Validate
+avail|cellog|pecl/phar
 
 # Curl modules
 
avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www

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

[PHP-CVS] cvs: php-src(PHP_5_1) / Makefile.gcov

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 12:27:34 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcMakefile.gcov 
  Log:
  Fixed gcov for generated files
  
  
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.4.2.4r2=1.4.2.5ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.4.2.4 php-src/Makefile.gcov:1.4.2.5
--- php-src/Makefile.gcov:1.4.2.4   Wed Nov 30 17:47:03 2005
+++ php-src/Makefile.gcov   Sun Dec  4 12:27:34 2005
@@ -31,22 +31,23 @@
@echo
[EMAIL PROTECTED] . -name \*.gcda -o -name \*.gcno -o -name \*.da | sed 
-e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | 
while read x; do \
echo -n . ;\
+   y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \
test -d $$dir || $(mkinstalldirs) $$dir; \
-   if test -f $(top_srcdir)/$$x.c; then \
-   ln -f -s $(top_srcdir)/$$x.c lcov_data/$$x.c; \
+   if test -f $(top_srcdir)/$$y.c; then \
+   ln -f -s $(top_srcdir)/$$y.c lcov_data/$$y.c; \
fi; \
-   if test -f $(top_srcdir)/$$x.re; then \
-   ln -f -s $(top_srcdir)/$$x.re lcov_data/$$x.re; \
+   if test -f $(top_srcdir)/$$y.re; then \
+   ln -f -s $(top_srcdir)/$$y.re lcov_data/$$y.re; \
fi; \
-   if test -f $(top_srcdir)/$$x.y; then \
-   ln -f -s $(top_srcdir)/$$x.y lcov_data/$$x.y; \
+   if test -f $(top_srcdir)/$$y.y; then \
+   ln -f -s $(top_srcdir)/$$y.y lcov_data/$$y.y; \
fi; \
-   if test -f $(top_srcdir)/$$x.l; then \
-   ln -f -s $(top_srcdir)/$$x.l lcov_data/$$x.l; \
+   if test -f $(top_srcdir)/$$y.l; then \
+   ln -f -s $(top_srcdir)/$$y.l lcov_data/$$y.l; \
fi; \
-   if test -f $(top_builddir)/$$x.c; then \
-   ln -f -s $(top_builddir)/$$x.c lcov_data/$$x.c; \
+   if test -f $(top_builddir)/$$y.c; then \
+   ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
fi; \
test -f $$x.gcno  cp $$x.gcno lcov_data/ ; \
test -f $$x.gcda  cp $$x.gcda lcov_data/ ; \

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

[PHP-CVS] cvs: php-src / Makefile.gcov

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 12:28:26 2005 EDT

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  MFB51: Fixed gcov for generated files
  
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.6r2=1.7ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.6 php-src/Makefile.gcov:1.7
--- php-src/Makefile.gcov:1.6   Wed Nov 30 17:27:32 2005
+++ php-src/Makefile.gcov   Sun Dec  4 12:28:26 2005
@@ -31,22 +31,23 @@
@echo
[EMAIL PROTECTED] . -name \*.gcda -o -name \*.gcno -o -name \*.da | sed 
-e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | uniq | 
while read x; do \
echo -n . ;\
+   y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \
test -d $$dir || $(mkinstalldirs) $$dir; \
-   if test -f $(top_srcdir)/$$x.c; then \
-   ln -f -s $(top_srcdir)/$$x.c lcov_data/$$x.c; \
+   if test -f $(top_srcdir)/$$y.c; then \
+   ln -f -s $(top_srcdir)/$$y.c lcov_data/$$y.c; \
fi; \
-   if test -f $(top_srcdir)/$$x.re; then \
-   ln -f -s $(top_srcdir)/$$x.re lcov_data/$$x.re; \
+   if test -f $(top_srcdir)/$$y.re; then \
+   ln -f -s $(top_srcdir)/$$y.re lcov_data/$$y.re; \
fi; \
-   if test -f $(top_srcdir)/$$x.y; then \
-   ln -f -s $(top_srcdir)/$$x.y lcov_data/$$x.y; \
+   if test -f $(top_srcdir)/$$y.y; then \
+   ln -f -s $(top_srcdir)/$$y.y lcov_data/$$y.y; \
fi; \
-   if test -f $(top_srcdir)/$$x.l; then \
-   ln -f -s $(top_srcdir)/$$x.l lcov_data/$$x.l; \
+   if test -f $(top_srcdir)/$$y.l; then \
+   ln -f -s $(top_srcdir)/$$y.l lcov_data/$$y.l; \
fi; \
-   if test -f $(top_builddir)/$$x.c; then \
-   ln -f -s $(top_builddir)/$$x.c lcov_data/$$x.c; \
+   if test -f $(top_builddir)/$$y.c; then \
+   ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
fi; \
test -f $$x.gcno  cp $$x.gcno lcov_data/ ; \
test -f $$x.gcda  cp $$x.gcda lcov_data/ ; \

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

[PHP-CVS] cvs: php-src /ext/sockets sockets.c

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 12:31:41 2005 EDT

  Modified files:  
/php-src/ext/socketssockets.c 
  Log:
  MFB51: Fixed bug #35062 (socket_read() produces warnings on non blocking 
  sockets).
  
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.174r2=1.175ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.174 php-src/ext/sockets/sockets.c:1.175
--- php-src/ext/sockets/sockets.c:1.174 Sat Dec  3 18:24:07 2005
+++ php-src/ext/sockets/sockets.c   Sun Dec  4 12:31:40 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.174 2005/12/03 23:24:07 tony2001 Exp $ */
+/* $Id: sockets.c,v 1.175 2005/12/04 17:31:40 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -859,7 +859,19 @@
}
 
if (retval == -1) {
-   PHP_SOCKET_ERROR(php_sock, unable to read from socket, errno);
+   /* if the socket is in non-blocking mode and there's no data to 
read,
+   don't output any error, as this is a normal situation, and not 
an error */
+   if (errno == EAGAIN
+#ifdef EWOULDBLOCK
+   || errno == EWOULDBLOCK
+#endif
+   ) {
+   php_sock-error = errno;
+   SOCKETS_G(last_error) = errno;
+   } else {
+   PHP_SOCKET_ERROR(php_sock, unable to read from 
socket, errno);
+   }
+
efree(tmpbuf);
RETURN_FALSE;
}

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

[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/sockets sockets.c

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 12:32:28 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-srcNEWS 
/php-src/ext/socketssockets.c 
  Log:
  MFH: Fixed bug #35062 (socket_read() produces warnings on non blocking 
  sockets).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.90r2=1.1247.2.920.2.91ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.90 php-src/NEWS:1.1247.2.920.2.91
--- php-src/NEWS:1.1247.2.920.2.90  Wed Nov 30 13:12:43 2005
+++ php-src/NEWSSun Dec  4 12:32:26 2005
@@ -5,6 +5,8 @@
   properly). (Ilia)
 - Fixed bug #35341 (Fix for bug #33760 breaks build with older curl). (Tony)
 - Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
+- Fixed bug #35062 (socket_read() produces warnings on non blocking sockets).
+  (Nuno, Ilia)
 - Fixed bug #33153 (crash in mssql_next result). (Frank)
 - Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
 - Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.125.2.29.2.1r2=1.125.2.29.2.2ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.125.2.29.2.1 
php-src/ext/sockets/sockets.c:1.125.2.29.2.2
--- php-src/ext/sockets/sockets.c:1.125.2.29.2.1Thu Nov  3 09:58:43 2005
+++ php-src/ext/sockets/sockets.c   Sun Dec  4 12:32:27 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.125.2.29.2.1 2005/11/03 14:58:43 mike Exp $ */
+/* $Id: sockets.c,v 1.125.2.29.2.2 2005/12/04 17:32:27 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -839,7 +839,19 @@
}
 
if (retval == -1) {
-   PHP_SOCKET_ERROR(php_sock, unable to read from socket, errno);
+   /* if the socket is in non-blocking mode and there's no data to 
read,
+   don't output any error, as this is a normal situation, and not 
an error */
+   if (errno == EAGAIN
+#ifdef EWOULDBLOCK
+   || errno == EWOULDBLOCK
+#endif
+   ) {
+   php_sock-error = errno;
+   SOCKETS_G(last_error) = errno;
+   } else {
+   PHP_SOCKET_ERROR(php_sock, unable to read from 
socket, errno);
+   }
+
efree(tmpbuf);
RETURN_FALSE;
}

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard/tests/strings http_build_query.phpt url_t.phpt

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 12:58:15 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/standard/tests/strings http_build_query.phpt 

  Modified files:  
/php-src/ext/standard/tests/strings url_t.phpt 
  Log:
  Added tests for new parse_url() and http_build_query() functionality.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/url_t.phpt?r1=1.9.2.1r2=1.9.2.2ty=u
Index: php-src/ext/standard/tests/strings/url_t.phpt
diff -u php-src/ext/standard/tests/strings/url_t.phpt:1.9.2.1 
php-src/ext/standard/tests/strings/url_t.phpt:1.9.2.2
--- php-src/ext/standard/tests/strings/url_t.phpt:1.9.2.1   Tue Aug 16 
10:20:41 2005
+++ php-src/ext/standard/tests/strings/url_t.phpt   Sun Dec  4 12:58:15 2005
@@ -75,6 +75,11 @@
 foreach ($sample_urls as $url) {
 var_dump(@parse_url($url));
 }
+
+$url = 'http://secret:[EMAIL 
PROTECTED]:80/index.php?test=1test2=chartest3=mixesCI#some_page_ref123';
+foreach 
(array(PHP_URL_SCHEME,PHP_URL_HOST,PHP_URL_PORT,PHP_URL_USER,PHP_URL_PASS,PHP_URL_PATH,PHP_URL_QUERY,PHP_URL_FRAGMENT)
 as $v) {
+   var_dump(parse_url($url, $v));
+}
 ?
 --EXPECT--
 array(1) {
@@ -673,3 +678,11 @@
   [path]=
   string(4) /bla
 }
+string(4) http
+string(11) www.php.net
+int(80)
+string(6) secret
+string(7) hideout
+string(10) /index.php
+string(31) test=1test2=chartest3=mixesCI
+string(16) some_page_ref123

http://cvs.php.net/co.php/php-src/ext/standard/tests/strings/http_build_query.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/strings/http_build_query.phpt
+++ php-src/ext/standard/tests/strings/http_build_query.phpt

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

[PHP-CVS] cvs: php-src /ext/standard/tests/strings http_build_query.phpt url_t.phpt

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 12:58:55 2005 EDT

  Modified files:  
/php-src/ext/standard/tests/strings http_build_query.phpt 
url_t.phpt 
  Log:
  MFB51: Added tests for new parse_url() and http_build_query() functionality.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/http_build_query.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/standard/tests/strings/http_build_query.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/http_build_query.phpt:1.2
--- /dev/null   Sun Dec  4 12:58:55 2005
+++ php-src/ext/standard/tests/strings/http_build_query.phptSun Dec  4 
12:58:53 2005
@@ -0,0 +1,15 @@
+--TEST--
+http_build_query() function
+--FILE--
+?php
+
+$array = array(foo=bar,baz=1,test=a ' \ , abc);
+var_dump(http_build_query($array));
+var_dump(http_build_query($array, 'foo'));
+var_dump(http_build_query($array, 'foo', ';'));
+
+?
+--EXPECT--
+string(35) foo=barbaz=1test=a+%27+%22+0=abc
+string(38) foo=barbaz=1test=a+%27+%22+foo0=abc
+string(38) foo=bar;baz=1;test=a+%27+%22+;foo0=abc
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/url_t.phpt?r1=1.10r2=1.11ty=u
Index: php-src/ext/standard/tests/strings/url_t.phpt
diff -u php-src/ext/standard/tests/strings/url_t.phpt:1.10 
php-src/ext/standard/tests/strings/url_t.phpt:1.11
--- php-src/ext/standard/tests/strings/url_t.phpt:1.10  Tue Aug 16 10:10:13 2005
+++ php-src/ext/standard/tests/strings/url_t.phpt   Sun Dec  4 12:58:53 2005
@@ -75,6 +75,11 @@
 foreach ($sample_urls as $url) {
 var_dump(@parse_url($url));
 }
+
+$url = 'http://secret:[EMAIL 
PROTECTED]:80/index.php?test=1test2=chartest3=mixesCI#some_page_ref123';
+foreach 
(array(PHP_URL_SCHEME,PHP_URL_HOST,PHP_URL_PORT,PHP_URL_USER,PHP_URL_PASS,PHP_URL_PATH,PHP_URL_QUERY,PHP_URL_FRAGMENT)
 as $v) {
+   var_dump(parse_url($url, $v));
+}
 ?
 --EXPECT--
 array(1) {
@@ -673,3 +678,11 @@
   [path]=
   string(4) /bla
 }
+string(4) http
+string(11) www.php.net
+int(80)
+string(6) secret
+string(7) hideout
+string(10) /index.php
+string(31) test=1test2=chartest3=mixesCI
+string(16) some_page_ref123

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard sunfuncs.c

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 12:41:03 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/standard   sunfuncs.c 
  Log:
  load proper header file
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/sunfuncs.c?r1=1.11r2=1.11.2.1ty=u
Index: php-src/ext/standard/sunfuncs.c
diff -u php-src/ext/standard/sunfuncs.c:1.11 
php-src/ext/standard/sunfuncs.c:1.11.2.1
--- php-src/ext/standard/sunfuncs.c:1.11Wed Aug  3 10:08:14 2005
+++ php-src/ext/standard/sunfuncs.c Sun Dec  4 12:41:02 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: sunfuncs.c,v 1.11 2005/08/03 14:08:14 sniper Exp $ */
+/* $Id: sunfuncs.c,v 1.11.2.1 2005/12/04 17:41:02 iliaa Exp $ */
 
 /*
The sun position algorithm taken from the 'US Naval Observatory's
@@ -27,8 +27,8 @@
 
 #include php.h
 #include php_sunfuncs.h
-#include datetime.h
 #include php_ini.h
+#include ext/date/php_date.h
 
 #include assert.h
 #include math.h

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard basic_functions.c http.c php_http.h url.c url.h

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 12:44:28 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/standard   basic_functions.c http.c php_http.h url.c 
url.h 
  Log:
  MFH:
  Added 2nd optional parameter to parse_url() that allows retrieval of 
  individual URL components.
  Added 3rd optional parameter to http_build_query() that allows custom param
  separator.
  
  http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.725.2.9r2=1.725.2.10ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.9 
php-src/ext/standard/basic_functions.c:1.725.2.10
--- php-src/ext/standard/basic_functions.c:1.725.2.9Thu Dec  1 06:48:13 2005
+++ php-src/ext/standard/basic_functions.c  Sun Dec  4 12:44:23 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.9 2005/12/01 11:48:13 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.10 2005/12/04 17:44:23 iliaa Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -107,8 +107,6 @@
 #include php_fopen_wrappers.h
 #include streamsfuncs.h
 
-static zend_class_entry *incomplete_class_entry = NULL;
-
 static
ZEND_BEGIN_ARG_INFO(first_and_second__args_force_ref, 0)
ZEND_ARG_PASS_INFO(1)
@@ -958,7 +956,7 @@
memset(BG(mblen_state), 0, sizeof(BG(mblen_state)));
 #endif
 
-   BG(incomplete_class) = incomplete_class_entry;
+   BG(incomplete_class) = php_create_incomplete_class(TSRMLS_C);
 }
 
 
@@ -1024,8 +1022,6 @@
 #endif
 #endif
 
-   BG(incomplete_class) = incomplete_class_entry = 
php_create_incomplete_class(TSRMLS_C);
-
REGISTER_LONG_CONSTANT(CONNECTION_ABORTED, PHP_CONNECTION_ABORTED, 
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(CONNECTION_NORMAL,  PHP_CONNECTION_NORMAL,  
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(CONNECTION_TIMEOUT, PHP_CONNECTION_TIMEOUT, 
CONST_CS | CONST_PERSISTENT);
@@ -1039,6 +1035,15 @@
REGISTER_LONG_CONSTANT(SUNFUNCS_RET_STRING, SUNFUNCS_RET_STRING, 
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SUNFUNCS_RET_DOUBLE, SUNFUNCS_RET_DOUBLE, 
CONST_CS | CONST_PERSISTENT);
 
+   REGISTER_LONG_CONSTANT(PHP_URL_SCHEME, PHP_URL_SCHEME, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(PHP_URL_HOST, PHP_URL_HOST, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(PHP_URL_PORT, PHP_URL_PORT, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(PHP_URL_USER, PHP_URL_USER, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(PHP_URL_PASS, PHP_URL_PASS, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(PHP_URL_PATH, PHP_URL_PATH, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(PHP_URL_QUERY, PHP_URL_QUERY, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(PHP_URL_FRAGMENT, PHP_URL_FRAGMENT, CONST_CS | 
CONST_PERSISTENT);
+
 #define REGISTER_MATH_CONSTANT(x)  REGISTER_DOUBLE_CONSTANT(#x, x, CONST_CS | 
CONST_PERSISTENT)
REGISTER_MATH_CONSTANT(M_E);
REGISTER_MATH_CONSTANT(M_LOG2E);
http://cvs.php.net/diff.php/php-src/ext/standard/http.c?r1=1.14.2.1r2=1.14.2.2ty=u
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.14.2.1 
php-src/ext/standard/http.c:1.14.2.2
--- php-src/ext/standard/http.c:1.14.2.1Fri Sep 16 13:10:58 2005
+++ php-src/ext/standard/http.c Sun Dec  4 12:44:27 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: http.c,v 1.14.2.1 2005/09/16 17:10:58 tony2001 Exp $ */
+/* $Id: http.c,v 1.14.2.2 2005/12/04 17:44:27 iliaa Exp $ */
 
 #include php_http.h
 #include php_ini.h
@@ -29,9 +29,9 @@
const char *num_prefix, int num_prefix_len,
const char *key_prefix, int key_prefix_len,
const char *key_suffix, int key_suffix_len,
-   zval *type TSRMLS_DC)
+   zval *type, char *arg_sep TSRMLS_DC)
 {
-   char *arg_sep = NULL, *key = NULL, *ekey, *newprefix, *p;
+   char *key = NULL, *ekey, *newprefix, *p;
int arg_sep_len, key_len, ekey_len, key_type, newprefix_len;
ulong idx;
zval **zdata = NULL, *copyzval;
@@ -45,9 +45,11 @@
return SUCCESS;
}
 
-   arg_sep = INI_STR(arg_separator.output);
-   if (!arg_sep || !strlen(arg_sep)) {
-   arg_sep = URL_DEFAULT_ARG_SEP;
+   if (!arg_sep) {
+   arg_sep = INI_STR(arg_separator.output);
+   if (!arg_sep || !strlen(arg_sep)) {
+   arg_sep = URL_DEFAULT_ARG_SEP;
+   }
}
arg_sep_len = strlen(arg_sep);
 
@@ -127,7 +129,7 @@
*p = '\0';
}
ht-nApplyCount++;

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql config.m4

2005-12-04 Thread Wez Furlong

wez Sun Dec  4 13:33:26 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_mysql  config.m4 
  Log:
  Fix PECL #6138
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.5r2=1.25.2.6ty=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.5 
php-src/ext/pdo_mysql/config.m4:1.25.2.6
--- php-src/ext/pdo_mysql/config.m4:1.25.2.5Tue Nov 29 12:31:13 2005
+++ php-src/ext/pdo_mysql/config.m4 Sun Dec  4 13:33:26 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.25.2.5 2005/11/29 17:31:13 sniper Exp $
+dnl $Id: config.m4,v 1.25.2.6 2005/12/04 18:33:26 wez Exp $
 dnl
 
 if test $PHP_PDO != no; then
@@ -50,6 +50,9 @@
 
   if test -n $PDO_MYSQL_CONFIG  test -x $PDO_MYSQL_CONFIG ; then
 AC_MSG_RESULT($PDO_MYSQL_CONFIG)
+if test x$SED = x; then
+  AC_PATH_PROG(SED, sed)
+fi
 PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e s/'//g`
 PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e s/'//g`
 PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` 

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

[PHP-CVS] cvs: php-src /ext/xmlreader/tessts .cvsignore /ext/xmlwriter/tests .cvsignore

2005-12-04 Thread Marcus Boerger

helly   Sun Dec  4 13:34:14 2005 EDT

  Added files: 
/php-src/ext/xmlreader/tessts   .cvsignore 
/php-src/ext/xmlwriter/tests.cvsignore 
  Log:
  - Add missing .cvsignore
  
  

http://cvs.php.net/co.php/php-src/ext/xmlreader/tessts/.cvsignore?r=1.1p=1
Index: php-src/ext/xmlreader/tessts/.cvsignore
+++ php-src/ext/xmlreader/tessts/.cvsignore
phpt.*
*.diff
*.log
*.exp
*.out
*.php
*.gcda
*.gcno

http://cvs.php.net/co.php/php-src/ext/xmlwriter/tests/.cvsignore?r=1.1p=1
Index: php-src/ext/xmlwriter/tests/.cvsignore
+++ php-src/ext/xmlwriter/tests/.cvsignore
phpt.*
*.diff
*.log
*.exp
*.out
*.php
*.gcda
*.gcno

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

Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql config.m4

2005-12-04 Thread Jani Taskinen



There's something else wrong if $SED isn't defined,
as it has been around since PHP 4.3.something.

--Jani

On Sun, 4 Dec 2005, Wez Furlong wrote:



wez Sun Dec  4 13:33:26 2005 EDT

 Modified files:  (Branch: PHP_5_1)
   /php-src/ext/pdo_mysql   config.m4
 Log:
 Fix PECL #6138


http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.5r2=1.25.2.6ty=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.5 
php-src/ext/pdo_mysql/config.m4:1.25.2.6
--- php-src/ext/pdo_mysql/config.m4:1.25.2.5Tue Nov 29 12:31:13 2005
+++ php-src/ext/pdo_mysql/config.m4 Sun Dec  4 13:33:26 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.5 2005/11/29 17:31:13 sniper Exp $
+dnl $Id: config.m4,v 1.25.2.6 2005/12/04 18:33:26 wez Exp $
dnl

if test $PHP_PDO != no; then
@@ -50,6 +50,9 @@

  if test -n $PDO_MYSQL_CONFIG  test -x $PDO_MYSQL_CONFIG ; then
AC_MSG_RESULT($PDO_MYSQL_CONFIG)
+if test x$SED = x; then
+  AC_PATH_PROG(SED, sed)
+fi
PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e s/'//g`
PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e s/'//g`
PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`




--
Give me your money at @ http://pecl.php.net/wishlist.php/sniper
Donating money may make me happier and friendlier for a limited period!
Death to all 4 letter abbreviations starting with P!

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

Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql config.m4

2005-12-04 Thread Wez Furlong

Well, I welcome your help in figuring it out; just closing the bug
report with an upgrade to 5.1 message isn't helpful; as I've told
you many times, 5.0 is a supported version for PDO.

--Wez.

On 12/4/05, Jani Taskinen [EMAIL PROTECTED] wrote:

  There's something else wrong if $SED isn't defined,
  as it has been around since PHP 4.3.something.

  --Jani

 On Sun, 4 Dec 2005, Wez Furlong wrote:

 
  wez   Sun Dec  4 13:33:26 2005 EDT
 
   Modified files:  (Branch: PHP_5_1)
 /php-src/ext/pdo_mysql config.m4
   Log:
   Fix PECL #6138
 
 
  http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.5r2=1.25.2.6ty=u
  Index: php-src/ext/pdo_mysql/config.m4
  diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.5 
  php-src/ext/pdo_mysql/config.m4:1.25.2.6
  --- php-src/ext/pdo_mysql/config.m4:1.25.2.5  Tue Nov 29 12:31:13 2005
  +++ php-src/ext/pdo_mysql/config.m4   Sun Dec  4 13:33:26 2005
  @@ -1,5 +1,5 @@
  dnl
  -dnl $Id: config.m4,v 1.25.2.5 2005/11/29 17:31:13 sniper Exp $
  +dnl $Id: config.m4,v 1.25.2.6 2005/12/04 18:33:26 wez Exp $
  dnl
 
  if test $PHP_PDO != no; then
  @@ -50,6 +50,9 @@
 
if test -n $PDO_MYSQL_CONFIG  test -x $PDO_MYSQL_CONFIG ; then
  AC_MSG_RESULT($PDO_MYSQL_CONFIG)
  +if test x$SED = x; then
  +  AC_PATH_PROG(SED, sed)
  +fi
  PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e s/'//g`
  PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e s/'//g`
  PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
 
 

 --
 Give me your money at @ http://pecl.php.net/wishlist.php/sniper
 Donating money may make me happier and friendlier for a limited period!
 Death to all 4 letter abbreviations starting with P!

 --
 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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo package.xml package2.xml pdo.c /ext/pdo_dblib package.xml package2.xml pdo_dblib.c /ext/pdo_firebird package.xml package2.xml /ext/pdo_mysql package.xml pac

2005-12-04 Thread Wez Furlong

wez Sun Dec  4 17:34:28 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/pdopackage2.xml 
/php-src/ext/pdo_sqlite package2.xml 
/php-src/ext/pdo_dblib  package2.xml 
/php-src/ext/pdo_firebird   package2.xml 
/php-src/ext/pdo_mysql  package2.xml 
/php-src/ext/pdo_ocipackage2.xml 
/php-src/ext/pdo_odbc   package2.xml 
/php-src/ext/pdo_pgsql  package2.xml 

  Removed files:   
/php-src/ext/pdopackage.xml 
/php-src/ext/pdo_sqlite package.xml 
/php-src/ext/pdo_dblib  package.xml 
/php-src/ext/pdo_firebird   package.xml 
/php-src/ext/pdo_mysql  package.xml 
/php-src/ext/pdo_ocipackage.xml 
/php-src/ext/pdo_odbc   package.xml 
/php-src/ext/pdo_pgsql  package.xml 

  Modified files:  
/php-src/ext/pdopdo.c 
/php-src/ext/pdo_sqlite pdo_sqlite.c 
/php-src/ext/pdo_dblib  pdo_dblib.c 
/php-src/ext/pdo_mysql  pdo_mysql.c 
/php-src/ext/pdo_ocipdo_oci.c 
/php-src/ext/pdo_odbc   pdo_odbc.c 
/php-src/ext/pdo_pgsql  pdo_pgsql.c 
  Log:
  switch to package2.xml
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.57.2.14r2=1.57.2.15ty=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57.2.14 php-src/ext/pdo/pdo.c:1.57.2.15
--- php-src/ext/pdo/pdo.c:1.57.2.14 Mon Nov 28 01:39:53 2005
+++ php-src/ext/pdo/pdo.c   Sun Dec  4 17:34:21 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo.c,v 1.57.2.14 2005/11/28 06:39:53 wez Exp $ */
+/* $Id: pdo.c,v 1.57.2.15 2005/12/04 22:34:21 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -133,7 +133,7 @@
PHP_RINIT(pdo),
PHP_RSHUTDOWN(pdo),
PHP_MINFO(pdo),
-   1.0.2,
+   1.0.3,
STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/pdo_sqlite.c?r1=1.10.2.3r2=1.10.2.4ty=u
Index: php-src/ext/pdo_sqlite/pdo_sqlite.c
diff -u php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.3 
php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.4
--- php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.3Sat Nov 26 15:50:08 2005
+++ php-src/ext/pdo_sqlite/pdo_sqlite.c Sun Dec  4 17:34:25 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_sqlite.c,v 1.10.2.3 2005/11/26 20:50:08 wez Exp $ */
+/* $Id: pdo_sqlite.c,v 1.10.2.4 2005/12/04 22:34:25 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -31,7 +31,7 @@
 #include php_pdo_sqlite_int.h
 #include zend_exceptions.h
 
-#define PHP_PDO_SQLITE_MODULE_VERSION  1.0
+#define PHP_PDO_SQLITE_MODULE_VERSION  1.0.1
 
 /* {{{ pdo_sqlite_functions[] */
 function_entry pdo_sqlite_functions[] = {
@@ -100,7 +100,7 @@
(bundled) 
 #endif
PHP_PDO_SQLITE_MODULE_VERSION 
-$Id: pdo_sqlite.c,v 1.10.2.3 2005/11/26 20:50:08 wez Exp $);
+$Id: pdo_sqlite.c,v 1.10.2.4 2005/12/04 22:34:25 wez Exp $);
php_info_print_table_row(2, SQLite Library, sqlite3_libversion());
php_info_print_table_end();
 }
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.9.2.3r2=1.9.2.4ty=u
Index: php-src/ext/pdo_dblib/pdo_dblib.c
diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.3 
php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.4
--- php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.3   Sat Nov 26 15:50:07 2005
+++ php-src/ext/pdo_dblib/pdo_dblib.c   Sun Dec  4 17:34:25 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: pdo_dblib.c,v 1.9.2.3 2005/11/26 20:50:07 wez Exp $ */
+/* $Id: pdo_dblib.c,v 1.9.2.4 2005/12/04 22:34:25 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -65,7 +65,7 @@
NULL,
PHP_RSHUTDOWN(pdo_dblib),
PHP_MINFO(pdo_dblib),
-   1.0,
+   1.0.1,
STANDARD_MODULE_PROPERTIES
 };
 
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.8.2.9r2=1.8.2.10ty=u
Index: php-src/ext/pdo_mysql/pdo_mysql.c
diff -u php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.9 
php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.10
--- php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.9   Thu Dec  1 00:16:24 2005
+++ php-src/ext/pdo_mysql/pdo_mysql.c   Sun Dec  4 17:34:26 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: pdo_mysql.c,v 1.8.2.9 2005/12/01 05:16:24 wez Exp $ */
+/* $Id: pdo_mysql.c,v 1.8.2.10 2005/12/04 22:34:26 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -60,7 +60,7 @@
NULL,
NULL,
PHP_MINFO(pdo_mysql),
-   1.0.1,
+   1.0.2,
STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/pdo_oci.c?r1=1.5.2.3r2=1.5.2.4ty=u
Index: php-src/ext/pdo_oci/pdo_oci.c
diff -u php-src/ext/pdo_oci/pdo_oci.c:1.5.2.3

[PHP-CVS] cvs: php-src(PHP_5_1) / README.CVS-RULES

2005-12-04 Thread Jani Taskinen

sniper  Sun Dec  4 18:19:49 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcREADME.CVS-RULES 
  Log:
  fix branches
  
http://cvs.php.net/diff.php/php-src/README.CVS-RULES?r1=1.18r2=1.18.2.1ty=u
Index: php-src/README.CVS-RULES
diff -u php-src/README.CVS-RULES:1.18 php-src/README.CVS-RULES:1.18.2.1
--- php-src/README.CVS-RULES:1.18   Tue Mar 22 04:01:13 2005
+++ php-src/README.CVS-RULESSun Dec  4 18:19:44 2005
@@ -31,11 +31,11 @@
6. Test your changes before committing them. We mean it. Really.
 
 Currently we have the following branches in use:
-HEAD Will become PHP 5.1. This CVS branch is for active development.
-PHP_5_0  Is used to release the PHP 5.0.x series. Only minor feature
+HEAD Will become PHP 6.0. This CVS branch is for active development.
+PHP_5_1  Is used to release the PHP 5.1.x series. Only minor feature
 enhancements may go in here, but please keep that as 
infrequent as
 possible.
-PHP_4_3  Is used to release the PHP 4.3.x series. Only bugfixes are permitted
+PHP_4_4  Is used to release the PHP 4.4.x series. Only bugfixes are permitted
  on this branch.
 
 The next few rules are more of a technical nature.

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

[PHP-CVS] cvs: php-src /ext/gd gd.c gd_ctx.c

2005-12-04 Thread Jani Taskinen

sniper  Sun Dec  4 18:24:14 2005 EDT

  Modified files:  
/php-src/ext/gd gd.c gd_ctx.c 
  Log:
  php3 is dead
  
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.320r2=1.321ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.320 php-src/ext/gd/gd.c:1.321
--- php-src/ext/gd/gd.c:1.320   Wed Nov 30 19:36:26 2005
+++ php-src/ext/gd/gd.c Sun Dec  4 18:24:12 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.320 2005/12/01 00:36:26 sniper Exp $ */
+/* $Id: gd.c,v 1.321 2005/12/04 23:24:12 sniper Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -604,7 +604,7 @@
 }
 /* }}} */
 
-/* Need this for cpdf. See also comment in file.c php3i_get_le_fp() */
+/* Need this for cpdf. See also comment in file.c phpi_get_le_fp() */
 PHP_GD_API int phpi_get_le_gd(void)
 {
return le_gd;
@@ -1801,12 +1801,6 @@
 
fseek(tmp, 0, SEEK_SET);
 
-#if APACHE  defined(CHARSET_EBCDIC)
-   /* XXX this is unlikely to work any more [EMAIL PROTECTED] */
-
-   /* This is a binary file already: avoid EBCDIC-ASCII 
conversion */
-   ap_bsetflag(php3_rqst-connection-client, B_EBCDIC2ASCII, 0);
-#endif
while ((b = fread(buf, 1, sizeof(buf), tmp))  0) {
php_write(buf, b TSRMLS_CC);
}
http://cvs.php.net/diff.php/php-src/ext/gd/gd_ctx.c?r1=1.25r2=1.26ty=u
Index: php-src/ext/gd/gd_ctx.c
diff -u php-src/ext/gd/gd_ctx.c:1.25 php-src/ext/gd/gd_ctx.c:1.26
--- php-src/ext/gd/gd_ctx.c:1.25Tue Nov  1 12:04:29 2005
+++ php-src/ext/gd/gd_ctx.c Sun Dec  4 18:24:14 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: gd_ctx.c,v 1.25 2005/11/01 17:04:29 sniper Exp $ */
+/* $Id: gd_ctx.c,v 1.26 2005/12/04 23:24:14 sniper Exp $ */
 
 #include php_gd.h
 
@@ -101,11 +101,6 @@
ctx-free = _php_image_output_ctxfree;
 #endif
 
-#if APACHE  defined(CHARSET_EBCDIC)
-   /* XXX this is unlikely to work any more [EMAIL PROTECTED] */
-   /* This is a binary file already: avoid EBCDIC-ASCII 
conversion */
-   ap_bsetflag(php3_rqst-connection-client, B_EBCDIC2ASCII, 0);
-#endif
}
 
switch(image_type) {

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

[PHP-CVS] cvs: php-src / makerpm

2005-12-04 Thread Jani Taskinen

sniper  Sun Dec  4 18:27:23 2005 EDT

  Modified files:  
/php-srcmakerpm 
  Log:
  php3 is dead
  
http://cvs.php.net/diff.php/php-src/makerpm?r1=1.9r2=1.10ty=u
Index: php-src/makerpm
diff -u php-src/makerpm:1.9 php-src/makerpm:1.10
--- php-src/makerpm:1.9 Mon Aug 15 18:30:38 2005
+++ php-src/makerpm Sun Dec  4 18:27:23 2005
@@ -54,7 +54,6 @@
 
 %prep
 %setup -q -n TARDIR
-#mkdir manual; cd manual  tar xzf $RPM_SOURCE_DIR/php3-manual.tar.gz
 ./buildconf
 
 %build

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

[PHP-CVS] cvs: php-src /sapi/apache config.m4

2005-12-04 Thread Jani Taskinen

sniper  Sun Dec  4 18:30:42 2005 EDT

  Modified files:  
/php-src/sapi/apacheconfig.m4 
  Log:
  - Nuke non-working part
  
http://cvs.php.net/diff.php/php-src/sapi/apache/config.m4?r1=1.75r2=1.76ty=u
Index: php-src/sapi/apache/config.m4
diff -u php-src/sapi/apache/config.m4:1.75 php-src/sapi/apache/config.m4:1.76
--- php-src/sapi/apache/config.m4:1.75  Sun May 29 19:16:45 2005
+++ php-src/sapi/apache/config.m4   Sun Dec  4 18:30:40 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.75 2005/05/29 23:16:45 sniper Exp $
+dnl $Id: config.m4,v 1.76 2005/12/04 23:30:40 sniper Exp $
 dnl
 AC_DEFUN([PHP_APACHE_FD_CHECK], [
 AC_CACHE_CHECK([for member fd in BUFF *],ac_cv_php_fd_in_buff,[
@@ -133,20 +133,9 @@
 AC_DEFINE(HAVE_APACHE,1,[ ])
 APACHE_MODULE=yes
 PHP_EXPAND_PATH($withval, withval)
-# For Apache 1.2.x
-if test -f $withval/src/httpd.h; then 
-  APACHE_INCLUDE=-I$withval/src
-  APACHE_TARGET=$withval/src
-  PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, 
$APACHE_INCLUDE)
-  APACHE_INSTALL=mkdir -p $APACHE_TARGET; cp $SAPI_STATIC 
$APACHE_INSTALL_FILES $APACHE_TARGET
-  PHP_LIBS=-L. -lphp3
-  AC_MSG_RESULT(yes - Apache 1.2.x)
-  STRONGHOLD=
-  if test -f $withval/src/ap_config.h; then
-AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
-  fi
+
 # For Apache 2.0.x
-elif test -f $withval/include/httpd.h 
+if test -f $withval/include/httpd.h 
  test -f $withval/srclib/apr/include/apr_general.h ; then
   AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!])
 # For Apache 1.3.x

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

[PHP-CVS] cvs: php-src /sapi/apache_hooks config.m4

2005-12-04 Thread Jani Taskinen

sniper  Sun Dec  4 18:31:34 2005 EDT

  Modified files:  
/php-src/sapi/apache_hooks  config.m4 
  Log:
  - Nuke non-working part
  
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/config.m4?r1=1.7r2=1.8ty=u
Index: php-src/sapi/apache_hooks/config.m4
diff -u php-src/sapi/apache_hooks/config.m4:1.7 
php-src/sapi/apache_hooks/config.m4:1.8
--- php-src/sapi/apache_hooks/config.m4:1.7 Sun May 29 19:16:46 2005
+++ php-src/sapi/apache_hooks/config.m4 Sun Dec  4 18:31:33 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.7 2005/05/29 23:16:46 sniper Exp $
+dnl $Id: config.m4,v 1.8 2005/12/04 23:31:33 sniper Exp $
 dnl
 AC_DEFUN([PHP_APACHE_FD_CHECK], [
 AC_CACHE_CHECK([for member fd in BUFF *],ac_cv_php_fd_in_buff,[
@@ -135,20 +135,8 @@
 AC_DEFINE(HAVE_APACHE_HOOKS,1,[ ])
 APACHE_HOOKS_MODULE=yes
 PHP_EXPAND_PATH($withval, withval)
-# For Apache 1.2.x
-if test -f $withval/src/httpd.h; then 
-  APACHE_INCLUDE=-I$withval/src
-  APACHE_TARGET=$withval/src
-  PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c 
php_apache.c, $APACHE_INCLUDE)
-  APACHE_HOOKS_INSTALL=mkdir -p $APACHE_TARGET; cp $SAPI_STATIC 
$APACHE_INSTALL_FILES $APACHE_TARGET
-  PHP_LIBS=-L. -lphp3
-  AC_MSG_RESULT(yes - Apache 1.2.x)
-  STRONGHOLD=
-  if test -f $withval/src/ap_config.h; then
-AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
-  fi
 # For Apache 2.0.x
-elif test -f $withval/include/httpd.h 
+if test -f $withval/include/httpd.h 
  test -f $withval/srclib/apr/include/apr_general.h ; then
   AC_MSG_ERROR([Use --with-apxs2 with Apache 2.x!])
 # For Apache 1.3.x

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

[PHP-CVS] cvs: php-src(PHP_5_1) / Makefile.gcov

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 23:22:16 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcMakefile.gcov 
  Log:
  Avoid gcov conflicts on non-unique filenames
  
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.4.2.5r2=1.4.2.6ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.4.2.5 php-src/Makefile.gcov:1.4.2.6
--- php-src/Makefile.gcov:1.4.2.5   Sun Dec  4 12:27:34 2005
+++ php-src/Makefile.gcov   Sun Dec  4 23:22:16 2005
@@ -49,11 +49,11 @@
if test -f $(top_builddir)/$$y.c; then \
ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
fi; \
-   test -f $$x.gcno  cp $$x.gcno lcov_data/ ; \
-   test -f $$x.gcda  cp $$x.gcda lcov_data/ ; \
-   test -f $$x.dacp $$x.da   lcov_data/ ; \
-   test -f $$x.bbcp $$x.bb   lcov_data/ ; \
-   test -f $$x.bbg   cp $$x.bbg  lcov_data/ ; \
+   test -f $$x.gcno  cp $$x.gcno lcov_data/$$y.gcno ; \
+   test -f $$x.gcda  cp $$x.gcda lcov_data/$$y.gcda ; \
+   test -f $$x.dacp $$x.da   lcov_data/$$y.da ; \
+   test -f $$x.bbcp $$x.bb   lcov_data/$$y.bb ; \
+   test -f $$x.bbg   cp $$x.bbg  lcov_data/$$y.bbg ; \
done
@echo 
@echo Generating $@


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

[PHP-CVS] cvs: php-src / Makefile.gcov

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 23:22:37 2005 EDT

  Modified files:  
/php-srcMakefile.gcov 
  Log:
  MFB51:Avoid gcov conflicts on non-unique filenames 
  
  
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.7r2=1.8ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.7 php-src/Makefile.gcov:1.8
--- php-src/Makefile.gcov:1.7   Sun Dec  4 12:28:26 2005
+++ php-src/Makefile.gcov   Sun Dec  4 23:22:37 2005
@@ -49,11 +49,11 @@
if test -f $(top_builddir)/$$y.c; then \
ln -f -s $(top_builddir)/$$y.c lcov_data/$$y.c; \
fi; \
-   test -f $$x.gcno  cp $$x.gcno lcov_data/ ; \
-   test -f $$x.gcda  cp $$x.gcda lcov_data/ ; \
-   test -f $$x.dacp $$x.da   lcov_data/ ; \
-   test -f $$x.bbcp $$x.bb   lcov_data/ ; \
-   test -f $$x.bbg   cp $$x.bbg  lcov_data/ ; \
+   test -f $$x.gcno  cp $$x.gcno lcov_data/$$y.gcno ; \
+   test -f $$x.gcda  cp $$x.gcda lcov_data/$$y.gcda ; \
+   test -f $$x.dacp $$x.da   lcov_data/$$y.da ; \
+   test -f $$x.bbcp $$x.bb   lcov_data/$$y.bb ; \
+   test -f $$x.bbg   cp $$x.bbg  lcov_data/$$y.bbg ; \
done
@echo 
@echo Generating $@

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

[PHP-CVS] cvs: php-src /ext/standard sunfuncs.c

2005-12-04 Thread Ilia Alshanetsky

iliaa   Sun Dec  4 23:23:17 2005 EDT

  Modified files:  
/php-src/ext/standard   sunfuncs.c 
  Log:
  MBF51: load proper header file
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/sunfuncs.c?r1=1.11r2=1.12ty=u
Index: php-src/ext/standard/sunfuncs.c
diff -u php-src/ext/standard/sunfuncs.c:1.11 
php-src/ext/standard/sunfuncs.c:1.12
--- php-src/ext/standard/sunfuncs.c:1.11Wed Aug  3 10:08:14 2005
+++ php-src/ext/standard/sunfuncs.c Sun Dec  4 23:23:17 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: sunfuncs.c,v 1.11 2005/08/03 14:08:14 sniper Exp $ */
+/* $Id: sunfuncs.c,v 1.12 2005/12/05 04:23:17 iliaa Exp $ */
 
 /*
The sun position algorithm taken from the 'US Naval Observatory's
@@ -27,8 +27,8 @@
 
 #include php.h
 #include php_sunfuncs.h
-#include datetime.h
 #include php_ini.h
+#include ext/date/php_date.h
 
 #include assert.h
 #include math.h

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

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

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

[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_dbh.c

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: php-src(PHP_5_1) / Makefile.gcov

[PHP-CVS] cvs: php-src / Makefile.gcov

[PHP-CVS] cvs: php-src /ext/sockets sockets.c

[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/sockets sockets.c

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard/tests/strings http_build_query.phpt url_t.phpt

[PHP-CVS] cvs: php-src /ext/standard/tests/strings http_build_query.phpt url_t.phpt

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard sunfuncs.c

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard basic_functions.c http.c php_http.h url.c url.h

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql config.m4

[PHP-CVS] cvs: php-src /ext/xmlreader/tessts .cvsignore /ext/xmlwriter/tests .cvsignore

Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql config.m4

Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql config.m4

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo package.xml package2.xml pdo.c /ext/pdo_dblib package.xml package2.xml pdo_dblib.c /ext/pdo_firebird package.xml package2.xml /ext/pdo_mysql package.xml pac

[PHP-CVS] cvs: php-src(PHP_5_1) / README.CVS-RULES

[PHP-CVS] cvs: php-src /ext/gd gd.c gd_ctx.c

[PHP-CVS] cvs: php-src / makerpm

[PHP-CVS] cvs: php-src /sapi/apache config.m4

[PHP-CVS] cvs: php-src /sapi/apache_hooks config.m4

[PHP-CVS] cvs: php-src(PHP_5_1) / Makefile.gcov

[PHP-CVS] cvs: php-src / Makefile.gcov

[PHP-CVS] cvs: php-src /ext/standard sunfuncs.c

27 matches

Site Navigation

Mail list logo

Footer information