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

2007-01-05 Thread changelog 
changelog   Sat Jan  6 01:31:01 2007 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2563r2=1.2564diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2563 php-src/ChangeLog:1.2564
--- php-src/ChangeLog:1.2563Fri Jan  5 01:30:57 2007
+++ php-src/ChangeLog   Sat Jan  6 01:31:01 2007
@@ -1,3 +1,104 @@
+2007-01-05  Sara Golemon  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/posix/config.m4:
+  MFH: (r-1.16) ttyname_r() is broken on BSD
+
+* ext/posix/config.m4
+  ext/posix/posix.c:
+  Refix posix_ttyname(), test for a working implementation of ttyname_r() 
--
+  which BSD doesn't have
+
+* ext/posix/posix.c:
+  BSD4.1 (possibly others) doesn't support _SC_TTY_NAME_MAX
+
+* ZendEngine2/zend_builtin_functions.c:
+  Update create_function()
+
+2007-01-05  Andrei Zmievski  [EMAIL PROTECTED]
+
+* ext/standard/basic_functions.c:
+  Clean up set_include_path().
+
+2007-01-05  Sara Golemon  [EMAIL PROTECTED]
+
+* ext/session/mod_files.c:
+  Don't bother with conversion when the converter is already UTF8
+
+2007-01-05  Hannes Magnusson  [EMAIL PROTECTED]
+
+* ext/date/tests/bug37514.phpt
+  ext/date/tests/oo_002.phpt
+  ext/standard/tests/strings/bug26819.phpt:
+  MFB: Fix tests
+
+* (PHP_5_2)
+  ext/standard/tests/strings/bug26819.phpt:
+  Fix test according to bug#40009
+
+* (PHP_5_2)
+  ext/date/tests/bug37514.phpt
+  ext/date/tests/oo_002.phpt:
+  Fix tests
+
+2007-01-05  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/fbsql/php_fbsql.c
+  ext/gd/gd.c
+  ext/ldap/ldap.c
+  ext/pdo_firebird/firebird_statement.c
+  ext/pgsql/pgsql.c
+  ext/soap/php_encoding.c
+  ext/standard/uniqid.c
+  ext/sysvmsg/sysvmsg.c:
+  
+  %f - %F
+
+2007-01-05  Sebastian Bergmann  [EMAIL PROTECTED]
+
+* ext/session/mod_files.c
+  ext/session/session.c:
+  Fix ZTS issues.
+
+2007-01-05  Edin Kadribasic  [EMAIL PROTECTED]
+
+* (PHP_4_4)
+  ext/curl/curl.dsp:
+  New curl lib needs CURL_STATICLIB define when linked statically
+
+2007-01-05  Derick Rethans  [EMAIL PROTECTED]
+
+* (PHP_4_4)
+  NEWS
+  configure.in
+  main/php_version.h:
+  - Back to -dev
+
+* (PHP_4_4)
+  NEWS
+  configure.in
+  main/php_version.h:
+  - 4.4.5rc1
+
+2007-01-05  Sara Golemon  [EMAIL PROTECTED]
+
+* NEWS
+  ext/session/CREDITS
+  ext/session/php_session.h
+  ext/session/session.c:
+  Allow ext/session to use ext/hash's algorithms for generating IDs
+
+* ext/session/mod_files.c
+  ext/session/mod_user.c
+  ext/session/php_session.h
+  ext/session/session.c
+  ext/session/tests/001.phpt
+  ext/session/tests/003.phpt
+  ext/session/tests/004.phpt
+  ext/session/tests/005.phpt:
+  Unicode Updates
+
 2007-01-04  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * (PHP_5_2)

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

2007-01-05 Thread changelog 
changelog   Sat Jan  6 01:31:04 2007 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1050r2=1.1051diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1050 ZendEngine2/ChangeLog:1.1051
--- ZendEngine2/ChangeLog:1.1050Thu Jan  4 01:30:57 2007
+++ ZendEngine2/ChangeLog   Sat Jan  6 01:31:04 2007
@@ -1,3 +1,8 @@
+2007-01-05  Sara Golemon  [EMAIL PROTECTED]
+
+* zend_builtin_functions.c:
+  Update create_function()
+
 2007-01-03  Antony Dovgal  [EMAIL PROTECTED]
 
 * zend_extensions.h
@@ -16502,7 +16507,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1050 2007/01/04 01:30:57 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1051 2007/01/06 01:31:04 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -18226,7 +18231,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1050 2007/01/04 01:30:57 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1051 2007/01/06 01:31:04 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h

2007-01-05 Thread Derick Rethans 
derick  Fri Jan  5 08:54:57 2007 UTC

  Modified files:  (Branch: PHP_4_4)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  - 4.4.5rc1
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.180r2=1.1247.2.920.2.181diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.180 php-src/NEWS:1.1247.2.920.2.181
--- php-src/NEWS:1.1247.2.920.2.180 Fri Dec 29 00:35:25 2006
+++ php-src/NEWSFri Jan  5 08:54:57 2007
@@ -1,6 +1,6 @@
 PHP 4  NEWS
 |||
-?? ??? 2006, Version 4.4.5
+04 Jan 2007, Version 4.4.5RC1
 - Added a meta tag to phpinfo() output to prevent search engines from 
   indexing the page. (Ilia)
 - Updated PCRE to version 6.7. (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.32r2=1.396.2.164.2.33diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.164.2.32 
php-src/configure.in:1.396.2.164.2.33
--- php-src/configure.in:1.396.2.164.2.32   Mon Dec 25 15:42:35 2006
+++ php-src/configure.inFri Jan  5 08:54:57 2007
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.164.2.32 2006/12/25 15:42:35 tony2001 Exp $ 
-*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.164.2.33 2007/01/05 08:54:57 derick Exp $ 
-*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -38,7 +38,7 @@
 MAJOR_VERSION=4
 MINOR_VERSION=4
 RELEASE_VERSION=5
-EXTRA_VERSION=-dev
+EXTRA_VERSION=RC1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.66.2.81.2.28r2=1.66.2.81.2.29diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.66.2.81.2.28 
php-src/main/php_version.h:1.66.2.81.2.29
--- php-src/main/php_version.h:1.66.2.81.2.28   Tue Aug 15 12:23:08 2006
+++ php-src/main/php_version.h  Fri Jan  5 08:54:57 2007
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 4
 #define PHP_MINOR_VERSION 4
 #define PHP_RELEASE_VERSION 5
-#define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 4.4.5-dev
+#define PHP_EXTRA_VERSION RC1
+#define PHP_VERSION 4.4.5RC1

-- 
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 configure.in /main php_version.h

2007-01-05 Thread Derick Rethans 
derick  Fri Jan  5 08:56:56 2007 UTC

  Modified files:  (Branch: PHP_4_4)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  - Back to -dev
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.181r2=1.1247.2.920.2.182diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.181 php-src/NEWS:1.1247.2.920.2.182
--- php-src/NEWS:1.1247.2.920.2.181 Fri Jan  5 08:54:57 2007
+++ php-src/NEWSFri Jan  5 08:56:56 2007
@@ -1,5 +1,7 @@
 PHP 4  NEWS
 |||
+?? Jan 2007, Version 4.4.5
+
 04 Jan 2007, Version 4.4.5RC1
 - Added a meta tag to phpinfo() output to prevent search engines from 
   indexing the page. (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.33r2=1.396.2.164.2.34diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.164.2.33 
php-src/configure.in:1.396.2.164.2.34
--- php-src/configure.in:1.396.2.164.2.33   Fri Jan  5 08:54:57 2007
+++ php-src/configure.inFri Jan  5 08:56:56 2007
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.164.2.33 2007/01/05 08:54:57 derick Exp $ 
-*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.164.2.34 2007/01/05 08:56:56 derick Exp $ 
-*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -38,7 +38,7 @@
 MAJOR_VERSION=4
 MINOR_VERSION=4
 RELEASE_VERSION=5
-EXTRA_VERSION=RC1
+EXTRA_VERSION=RC2-dev
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.66.2.81.2.29r2=1.66.2.81.2.30diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.66.2.81.2.29 
php-src/main/php_version.h:1.66.2.81.2.30
--- php-src/main/php_version.h:1.66.2.81.2.29   Fri Jan  5 08:54:57 2007
+++ php-src/main/php_version.h  Fri Jan  5 08:56:56 2007
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 4
 #define PHP_MINOR_VERSION 4
 #define PHP_RELEASE_VERSION 5
-#define PHP_EXTRA_VERSION RC1
-#define PHP_VERSION 4.4.5RC1
+#define PHP_EXTRA_VERSION RC2-dev
+#define PHP_VERSION 4.4.5RC2-dev

-- 
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) /ext/curl curl.dsp

2007-01-05 Thread Edin Kadribasic 
edink   Fri Jan  5 10:00:56 2007 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/curl   curl.dsp 
  Log:
  New curl lib needs CURL_STATICLIB define when linked statically
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/curl.dsp?r1=1.4.8.1r2=1.4.8.1.4.1diff_format=u
Index: php-src/ext/curl/curl.dsp
diff -u php-src/ext/curl/curl.dsp:1.4.8.1 php-src/ext/curl/curl.dsp:1.4.8.1.4.1
--- php-src/ext/curl/curl.dsp:1.4.8.1   Tue Jul 22 12:34:38 2003
+++ php-src/ext/curl/curl.dsp   Fri Jan  5 10:00:56 2007
@@ -46,7 +46,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir 
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS 
/D _MBCS /D _USRDLL /D COMPILE_DL_CURL /D ZTS=1 /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I 
..\..\..\php_build\curl\include /D WIN32 /D CURL_EXPORTS /D 
COMPILE_DL_CURL /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D NDEBUG /D 
_WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I 
..\..\..\php_build\curl\include /D WIN32 /D CURL_EXPORTS /D 
COMPILE_DL_CURL /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D NDEBUG /D 
_WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /D 
CURL_STATICLIB /YX /FD /c
 # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d NDEBUG
@@ -74,7 +74,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir 
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D 
_MBCS /D _USRDLL /D COMPILE_DL_CURL /D ZTS=1 /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I 
..\..\..\php_build\curl\include /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D 
_WINDOWS /D _MBCS /D _USRDLL /D CURL_EXPORTS /D COMPILE_DL_CURL /D 
ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_CURL=1 /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I 
..\..\..\php_build\curl\include /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D 
_WINDOWS /D _MBCS /D _USRDLL /D CURL_EXPORTS /D COMPILE_DL_CURL /D 
ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_CURL=1 /D CURL_STATICLIB /FR /YX 
/FD /c
 # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d NDEBUG
@@ -102,7 +102,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir 
 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D 
WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D CURL_EXPORTS /D 
COMPILE_DL_CURL /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_CURL=1 /FR 
/YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I 
..\..\..\php_build\curl\include /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D 
_WINDOWS /D _MBCS /D _USRDLL /D CURL_EXPORTS /D COMPILE_DL_CURL /D 
ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_CURL=1 /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I 
..\..\..\php_build\curl\include /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D 
_WINDOWS /D _MBCS /D _USRDLL /D CURL_EXPORTS /D COMPILE_DL_CURL /D 
ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_CURL=1 /D CURL_STATICLIB /FR /YX 
/FD /c
 # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d NDEBUG
@@ -131,7 +131,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir 
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /D WIN32 /D 
CURL_EXPORTS /D COMPILE_DL_CURL /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D 
NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 
/YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I 
..\..\..\php_build\curl\include /D WIN32 /D CURL_EXPORTS /D 
COMPILE_DL_CURL /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D NDEBUG /D 
_WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I 
..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\main /I 
..\..\..\php_build\curl\include /D WIN32 /D CURL_EXPORTS /D 
COMPILE_DL_CURL /D ZTS=1 /D HAVE_CURL=1 /D ZEND_DEBUG=0 /D NDEBUG /D 
_WINDOWS /D _MBCS /D _USRDLL /D ZEND_WIN32 /D PHP_WIN32 /D 
CURL_STATICLIB /YX /FD /c
 # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
 # ADD BASE RSC /l 0x406 /d NDEBUG

-- 
PHP CVS Mailing List (http://www.php.net/)
To

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

2007-01-05 Thread Sebastian Bergmann 
sebastian   Fri Jan  5 14:53:31 2007 UTC

  Modified files:  
/php-src/ext/sessionmod_files.c session.c 
  Log:
  Fix ZTS issues.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.109r2=1.110diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.109 
php-src/ext/session/mod_files.c:1.110
--- php-src/ext/session/mod_files.c:1.109   Fri Jan  5 02:07:59 2007
+++ php-src/ext/session/mod_files.c Fri Jan  5 14:53:30 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: mod_files.c,v 1.109 2007/01/05 02:07:59 pollita Exp $ */
+/* $Id: mod_files.c,v 1.110 2007/01/05 14:53:30 sebastian Exp $ */
 
 #include php.h
 
@@ -94,7 +94,7 @@
return ret;
 }
 
-static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, 
const char *key)
+static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, 
const char *key TSRMLS_DC)
 {
size_t key_len;
const char *p;
@@ -180,7 +180,7 @@
PS(invalid_session_id) = 1;
return;
}
-   if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
+   if (!ps_files_path_create(buf, sizeof(buf), data, key 
TSRMLS_CC)) {
return;
}
 
@@ -430,7 +430,7 @@
char buf[MAXPATHLEN];
PS_FILES_DATA;
 
-   if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
+   if (!ps_files_path_create(buf, sizeof(buf), data, key TSRMLS_CC)) {
return FAILURE;
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.464r2=1.465diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.464 php-src/ext/session/session.c:1.465
--- php-src/ext/session/session.c:1.464 Fri Jan  5 03:57:57 2007
+++ php-src/ext/session/session.c   Fri Jan  5 14:53:30 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: session.c,v 1.464 2007/01/05 03:57:57 pollita Exp $ */
+/* $Id: session.c,v 1.465 2007/01/05 14:53:30 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1546,7 +1546,7 @@
int id_len;
UErrorCode status = U_ZERO_ERROR;
 
-   
zend_unicode_to_string_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), id, 
id_len, name.u, name_len, status TSRMLS_CC);
+   
zend_unicode_to_string_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), id, 
id_len, name.u, name_len, status);
 
if (U_SUCCESS(status)  id) {
PS(id) = id;

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/fbsql php_fbsql.c /ext/gd gd.c /ext/ldap ldap.c /ext/pdo_firebird firebird_statement.c /ext/pgsql pgsql.c /ext/soap php_encoding.c /ext/standard uniqid.c /e

2007-01-05 Thread Ilia Alshanetsky 
iliaa   Fri Jan  5 15:06:55 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/fbsql  php_fbsql.c 
/php-src/ext/gd gd.c 
/php-src/ext/ldap   ldap.c 
/php-src/ext/pdo_firebird   firebird_statement.c 
/php-src/ext/pgsql  pgsql.c 
/php-src/ext/soap   php_encoding.c 
/php-src/ext/standard   uniqid.c 
/php-src/ext/sysvmsgsysvmsg.c 
  Log:
  
  %f - %F
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.114.2.3.2.4r2=1.114.2.3.2.5diff_format=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.4 
php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.5
--- php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.4 Mon Jan  1 09:36:00 2007
+++ php-src/ext/fbsql/php_fbsql.c   Fri Jan  5 15:06:55 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_fbsql.c,v 1.114.2.3.2.4 2007/01/01 09:36:00 sebastian Exp $ */
+/* $Id: php_fbsql.c,v 1.114.2.3.2.5 2007/01/05 15:06:55 iliaa Exp $ */
 
 /* TODO:
  *
@@ -2893,7 +2893,7 @@
{
double v = *((double*)data);
char b[128];
-   snprintf(b, sizeof(b), %f, v);
+   snprintf(b, sizeof(b), %F, v);
phpfbestrdup(b, length, value);
}
break;
@@ -2905,7 +2905,7 @@
unsigned scale = fbcdmdScale(dtmd);
double v = *((double*)data);
char b[128];
-   snprintf(b, sizeof(b), %.*f, scale, v);
+   snprintf(b, sizeof(b), %.*F, scale, v);
phpfbestrdup(b, length, value);
}
break;
@@ -3021,7 +3021,7 @@
{
char b[128];
double seconds = *((double*)data);
-   snprintf(b, sizeof(b), %f, seconds);
+   snprintf(b, sizeof(b), %F, seconds);
phpfbestrdup(b, length, value);
}
break;
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.12r2=1.312.2.20.2.13diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.12 php-src/ext/gd/gd.c:1.312.2.20.2.13
--- php-src/ext/gd/gd.c:1.312.2.20.2.12 Mon Jan  1 09:36:01 2007
+++ php-src/ext/gd/gd.c Fri Jan  5 15:06:55 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.312.2.20.2.12 2007/01/01 09:36:01 sebastian Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.13 2007/01/05 15:06:55 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -4276,7 +4276,7 @@
T1_DeleteAllSizes(*f_ind);
 
if (Z_DVAL_PP(ext) = 0) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Second parameter 
%f out of range (must be  0), Z_DVAL_PP(ext));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Second parameter 
%F out of range (must be  0), Z_DVAL_PP(ext));
RETURN_FALSE;
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.2r2=1.161.2.3.2.3diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.2 
php-src/ext/ldap/ldap.c:1.161.2.3.2.3
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.2   Mon Jan  1 09:36:02 2007
+++ php-src/ext/ldap/ldap.c Fri Jan  5 15:06:55 2007
@@ -22,7 +22,7 @@
+--+
  */
  
-/* $Id: ldap.c,v 1.161.2.3.2.2 2007/01/01 09:36:02 sebastian Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.3 2007/01/05 15:06:55 iliaa Exp $ */
 #define IS_EXT_MODULE
 
 #ifdef HAVE_CONFIG_H
@@ -317,7 +317,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled);
-   php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.161.2.3.2.2 
2007/01/01 09:36:02 sebastian Exp $);
+   php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.161.2.3.2.3 
2007/01/05 15:06:55 iliaa Exp $);
 
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -342,13 +342,13 @@
 
 #if HAVE_NSLDAP
SDKVersion = ldap_version(ver);
-   snprintf(tmp, 31, %f, SDKVersion/100.0);
+   snprintf(tmp, 31, %F, SDKVersion/100.0);
php_info_print_table_row(2, SDK Version, tmp);
 
-   snprintf(tmp, 31, %f, ver.protocol_version/100.0);
+   snprintf(tmp, 31, %F, ver.protocol_version/100.0);
php_info_print_table_row(2, Highest LDAP Protocol Supported, tmp);
 
-   snprintf(tmp, 31, %f, ver.SSL_version/100.0);
+   snprintf(tmp, 31, %F, ver.SSL_version/100.0);
php_info_print_table_row(2, SSL Level Supported, tmp);
 
if (ver.security_level != LDAP_SECURITY_NONE) {

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/tests bug37514.phpt oo_002.phpt

2007-01-05 Thread Hannes Magnusson 
bjori   Fri Jan  5 15:21:45 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/date/tests bug37514.phpt oo_002.phpt 
  Log:
  Fix tests
  #We'll need to update these every year..
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug37514.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/date/tests/bug37514.phpt
diff -u php-src/ext/date/tests/bug37514.phpt:1.1.2.2 
php-src/ext/date/tests/bug37514.phpt:1.1.2.3
--- php-src/ext/date/tests/bug37514.phpt:1.1.2.2Wed Jan  3 13:48:54 2007
+++ php-src/ext/date/tests/bug37514.phptFri Jan  5 15:21:45 2007
@@ -11,10 +11,10 @@
 echo date('r', strtotime('May 18th 5:05 am')), \n;
 echo date('r', strtotime('May 18th 2006 5:05pm')), \n;
 ?
---EXPECTF--
-Thu, 18 May %d 05:05:00 +
-Thu, 18 May %d 17:05:00 +
-Thu, 18 May %d 17:05:00 +
-Thu, 18 May %d 05:05:00 +
-Thu, 18 May %d 05:05:00 +
-Thu, 18 May %d 17:05:00 +
+--EXPECT--
+Fri, 18 May 2007 05:05:00 +
+Fri, 18 May 2007 17:05:00 +
+Fri, 18 May 2007 17:05:00 +
+Fri, 18 May 2007 05:05:00 +
+Fri, 18 May 2007 05:05:00 +
+Thu, 18 May 2006 17:05:00 +
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/oo_002.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/date/tests/oo_002.phpt
diff -u php-src/ext/date/tests/oo_002.phpt:1.1.2.4 
php-src/ext/date/tests/oo_002.phpt:1.1.2.5
--- php-src/ext/date/tests/oo_002.phpt:1.1.2.4  Wed Jan  3 13:47:11 2007
+++ php-src/ext/date/tests/oo_002.phpt  Fri Jan  5 15:21:45 2007
@@ -19,10 +19,10 @@
 $c = clone $t;
 var_dump($c-getName());
 ?
---EXPECTF--
-string(29) Tue, 01 Aug %d 13:00:00 +
-string(29) Tue, 01 Aug %d 13:00:00 +
-string(29) Tue, 01 Aug %d 14:00:00 +
-string(29) Tue, 01 Aug %d 12:59:59 +
+--EXPECT--
+string(29) Wed, 01 Aug 07 13:00:00 +
+string(29) Wed, 01 Aug 07 13:00:00 +
+string(29) Wed, 01 Aug 07 14:00:00 +
+string(29) Wed, 01 Aug 07 12:59:59 +
 string(10) Asia/Tokyo
 string(10) Asia/Tokyo

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

[PHP-CVS] cvs: php-src /ext/date/tests bug37514.phpt oo_002.phpt /ext/standard/tests/strings bug26819.phpt

2007-01-05 Thread Hannes Magnusson 
bjori   Fri Jan  5 15:28:41 2007 UTC

  Modified files:  
/php-src/ext/date/tests bug37514.phpt oo_002.phpt 
/php-src/ext/standard/tests/strings bug26819.phpt 
  Log:
  MFB: Fix tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug37514.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/date/tests/bug37514.phpt
diff -u php-src/ext/date/tests/bug37514.phpt:1.3 
php-src/ext/date/tests/bug37514.phpt:1.4
--- php-src/ext/date/tests/bug37514.phpt:1.3Wed Jan  3 13:48:46 2007
+++ php-src/ext/date/tests/bug37514.phptFri Jan  5 15:28:41 2007
@@ -11,10 +11,10 @@
 echo date('r', strtotime('May 18th 5:05 am')), \n;
 echo date('r', strtotime('May 18th 2006 5:05pm')), \n;
 ?
---EXPECTF--
-Thu, 18 May %d 05:05:00 +
-Thu, 18 May %d 17:05:00 +
-Thu, 18 May %d 17:05:00 +
-Thu, 18 May %d 05:05:00 +
-Thu, 18 May %d 05:05:00 +
-Thu, 18 May %d 17:05:00 +
+--EXPECT--
+Fri, 18 May 2007 05:05:00 +
+Fri, 18 May 2007 17:05:00 +
+Fri, 18 May 2007 17:05:00 +
+Fri, 18 May 2007 05:05:00 +
+Fri, 18 May 2007 05:05:00 +
+Thu, 18 May 2006 17:05:00 +
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/oo_002.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/date/tests/oo_002.phpt
diff -u php-src/ext/date/tests/oo_002.phpt:1.6 
php-src/ext/date/tests/oo_002.phpt:1.7
--- php-src/ext/date/tests/oo_002.phpt:1.6  Wed Jan  3 13:47:03 2007
+++ php-src/ext/date/tests/oo_002.phpt  Fri Jan  5 15:28:41 2007
@@ -20,16 +20,16 @@
 var_dump($c-getName());
 ?
 --EXPECTF--
-string(29) Tue, 01 Aug %d 13:00:00 +
-string(29) Tue, 01 Aug %d 13:00:00 +
-string(29) Tue, 01 Aug %d 14:00:00 +
-string(29) Tue, 01 Aug %d 12:59:59 +
+string(29) Wed, 01 Aug 07 13:00:00 +
+string(29) Wed, 01 Aug 07 13:00:00 +
+string(29) Wed, 01 Aug 07 14:00:00 +
+string(29) Wed, 01 Aug 07 12:59:59 +
 string(10) Asia/Tokyo
 string(10) Asia/Tokyo
 --UEXPECTF--
-unicode(29) Tue, 01 Aug %d 13:00:00 +
-unicode(29) Tue, 01 Aug %d 13:00:00 +
-unicode(29) Tue, 01 Aug %d 14:00:00 +
-unicode(29) Tue, 01 Aug %d 12:59:59 +
+unicode(29) Wed, 01 Aug 07 13:00:00 +
+unicode(29) Wed, 01 Aug 07 13:00:00 +
+unicode(29) Wed, 01 Aug 07 14:00:00 +
+unicode(29) Wed, 01 Aug 07 12:59:59 +
 unicode(10) Asia/Tokyo
 unicode(10) Asia/Tokyo
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug26819.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/bug26819.phpt
diff -u php-src/ext/standard/tests/strings/bug26819.phpt:1.1 
php-src/ext/standard/tests/strings/bug26819.phpt:1.2
--- php-src/ext/standard/tests/strings/bug26819.phpt:1.1Tue Jan  6 
20:07:07 2004
+++ php-src/ext/standard/tests/strings/bug26819.phptFri Jan  5 15:28:41 2007
@@ -6,4 +6,4 @@
 var_dump(http_build_query($a));
 ?
 --EXPECT--
-NULL
+string(0) 

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

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

2007-01-05 Thread Sara Golemon 
pollita Fri Jan  5 17:29:31 2007 UTC

  Modified files:  
/php-src/ext/sessionmod_files.c 
  Log:
  Don't bother with conversion when the converter is already UTF8
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.110r2=1.111diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.110 
php-src/ext/session/mod_files.c:1.111
--- php-src/ext/session/mod_files.c:1.110   Fri Jan  5 14:53:30 2007
+++ php-src/ext/session/mod_files.c Fri Jan  5 17:29:30 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: mod_files.c,v 1.110 2007/01/05 14:53:30 sebastian Exp $ */
+/* $Id: mod_files.c,v 1.111 2007/01/05 17:29:30 pollita Exp $ */
 
 #include php.h
 
@@ -121,8 +121,8 @@
n += key_len;
buf[n] = '\0';
 
-   if (UG(unicode)  UG(filesystem_encoding_conv)) {
-   /* If there's a cheap way to see if filesystem_encoding_conv 
happens to be utf8, we should skip this reconversion */
+   if (UG(unicode)  UG(filesystem_encoding_conv) 
+   ucnv_getType(UG(filesystem_encoding_conv)) != UCNV_UTF8) {
char *newbuf = NULL;
int newlen;
UErrorCode status = U_ZERO_ERROR;

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

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

2007-01-05 Thread Andrei Zmievski 
andrei  Fri Jan  5 18:50:46 2007 UTC

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  Clean up set_include_path().
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.844r2=1.845diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.844 
php-src/ext/standard/basic_functions.c:1.845
--- php-src/ext/standard/basic_functions.c:1.844Mon Jan  1 09:29:30 2007
+++ php-src/ext/standard/basic_functions.c  Fri Jan  5 18:50:46 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.844 2007/01/01 09:29:30 sebastian Exp $ */
+/* $Id: basic_functions.c,v 1.845 2007/01/05 18:50:46 andrei Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -5783,15 +5783,16 @@
new_value_len = temp_len;
free_new_value = 1;
} else if (UG(unicode)) {
-   const char *conv_name;
UErrorCode status = U_ZERO_ERROR;
 
-   conv_name = 
ucnv_getName(ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), status);
-   conv_name = ucnv_getStandardName(conv_name, MIME, status);
-   if (strcmp(conv_name, UTF-8) != 0) {
-   status = U_ZERO_ERROR;
+   if 
(ucnv_getType(ZEND_U_CONVERTER(UG(filesystem_encoding_conv))) != UCNV_UTF8) {
zend_convert_encodings(UG(utf8_conv), 
ZEND_U_CONVERTER(UG(filesystem_encoding_conv)),
   temp, 
temp_len, new_value.s, new_value_len, status);
+   if (U_FAILURE(status)) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Could not convert path parameter from filesystem encoding to UTF-8);
+   zval_dtor(return_value);
+   RETURN_FALSE;
+   }
new_value.s = temp;
new_value_len = temp_len;
free_new_value = 1;

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

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

2007-01-05 Thread Sara Golemon 
pollita Fri Jan  5 20:01:44 2007 UTC

  Modified files:  
/php-src/ext/posix  posix.c 
  Log:
  BSD4.1 (possibly others) doesn't support _SC_TTY_NAME_MAX
  
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.85r2=1.86diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.85 php-src/ext/posix/posix.c:1.86
--- php-src/ext/posix/posix.c:1.85  Mon Jan  1 09:29:28 2007
+++ php-src/ext/posix/posix.c   Fri Jan  5 20:01:44 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: posix.c,v 1.85 2007/01/01 09:29:28 sebastian Exp $ */
+/* $Id: posix.c,v 1.86 2007/01/05 20:01:44 pollita Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -147,7 +147,7 @@
 static PHP_MINFO_FUNCTION(posix)
 {
php_info_print_table_start();
-   php_info_print_table_row(2, Revision, $Revision: 1.85 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.86 $);
php_info_print_table_end();
 }
 /* }}} */
@@ -575,7 +575,12 @@
fd = Z_LVAL_PP(z_fd);
}
 #if HAVE_TTYNAME_R
+#ifdef _SC_TTY_NAME_MAX
buflen = sysconf(_SC_TTY_NAME_MAX);
+#else
+   /* Arbitrary buffer size for systems which don't extrospect their tty 
name lengths, way overkill */
+   buflen = 64;
+#endif
p = emalloc(buflen);
 
if (ttyname_r(fd, p, buflen)) {

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

[PHP-CVS] cvs: php-src /ext/posix config.m4 posix.c

2007-01-05 Thread Sara Golemon 
pollita Fri Jan  5 21:30:06 2007 UTC

  Modified files:  
/php-src/ext/posix  config.m4 posix.c 
  Log:
  Refix posix_ttyname(), test for a working implementation of ttyname_r() -- 
which BSD doesn't have
  
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/config.m4?r1=1.15r2=1.16diff_format=u
Index: php-src/ext/posix/config.m4
diff -u php-src/ext/posix/config.m4:1.15 php-src/ext/posix/config.m4:1.16
--- php-src/ext/posix/config.m4:1.15Thu Dec  7 01:41:29 2006
+++ php-src/ext/posix/config.m4 Fri Jan  5 21:30:06 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.15 2006/12/07 01:41:29 iliaa Exp $
+dnl $Id: config.m4,v 1.16 2007/01/05 21:30:06 pollita Exp $
 dnl
 
 PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions,
@@ -11,5 +11,22 @@
 
   AC_CHECK_HEADERS(sys/mkdev.h)
 
-  AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo 
mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r 
ttyname_r)
+  AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo 
mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r)
+
+  AC_MSG_CHECKING([for working ttyname_r() implementation])
+  AC_TRY_RUN([
+#include unistd.h
+
+int main(int argc, char *argv[])
+{
+   char buf[64];
+
+   return ttyname_r(0, buf, 64) ? 1 : 0;
+}
+  ],[
+AC_MSG_RESULT([yes])
+AC_DEFINE(HAVE_TTYNAME_R, 1, [Whether you have a working ttyname_r])
+  ],[
+AC_MSG_RESULT([no, posix_ttyname() will be thread-unsafe])
+  ])
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.86r2=1.87diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.86 php-src/ext/posix/posix.c:1.87
--- php-src/ext/posix/posix.c:1.86  Fri Jan  5 20:01:44 2007
+++ php-src/ext/posix/posix.c   Fri Jan  5 21:30:06 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: posix.c,v 1.86 2007/01/05 20:01:44 pollita Exp $ */
+/* $Id: posix.c,v 1.87 2007/01/05 21:30:06 pollita Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -147,7 +147,7 @@
 static PHP_MINFO_FUNCTION(posix)
 {
php_info_print_table_start();
-   php_info_print_table_row(2, Revision, $Revision: 1.86 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.87 $);
php_info_print_table_end();
 }
 /* }}} */
@@ -575,12 +575,7 @@
fd = Z_LVAL_PP(z_fd);
}
 #if HAVE_TTYNAME_R
-#ifdef _SC_TTY_NAME_MAX
buflen = sysconf(_SC_TTY_NAME_MAX);
-#else
-   /* Arbitrary buffer size for systems which don't extrospect their tty 
name lengths, way overkill */
-   buflen = 64;
-#endif
p = emalloc(buflen);
 
if (ttyname_r(fd, p, buflen)) {

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

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

2007-01-05 Thread Sara Golemon 
pollita Fri Jan  5 21:31:56 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/posix  config.m4 
  Log:
  MFH: (r-1.16) ttyname_r() is broken on BSD
  
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/config.m4?r1=1.12.4.3r2=1.12.4.4diff_format=u
Index: php-src/ext/posix/config.m4
diff -u php-src/ext/posix/config.m4:1.12.4.3 
php-src/ext/posix/config.m4:1.12.4.4
--- php-src/ext/posix/config.m4:1.12.4.3Thu Dec  7 01:41:18 2006
+++ php-src/ext/posix/config.m4 Fri Jan  5 21:31:56 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.12.4.3 2006/12/07 01:41:18 iliaa Exp $
+dnl $Id: config.m4,v 1.12.4.4 2007/01/05 21:31:56 pollita Exp $
 dnl
 
 PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions,
@@ -11,5 +11,22 @@
 
   AC_CHECK_HEADERS(sys/mkdev.h)
 
-  AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo 
mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r 
ttyname_r)
+  AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo 
mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r)
+
+  AC_MSG_CHECKING([for working ttyname_r() implementation])
+  AC_TRY_RUN([
+#include unistd.h
+
+int main(int argc, char *argv[])
+{
+   char buf[64];
+
+   return ttyname_r(0, buf, 64) ? 1 : 0;
+}
+  ],[
+AC_MSG_RESULT([yes])
+AC_DEFINE(HAVE_TTYNAME_R, 1, [Whether you have a working ttyname_r])
+  ],[
+AC_MSG_RESULT([no, posix_ttyname() will be thread-unsafe])
+  ])
 fi

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

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

2007-01-05 Thread Georg Richter 
georg   Sat Jan  6 05:50:36 2007 UTC

  Modified files:  
/php-src/ext/mysqli mysqli_api.c 
  Log:
  merged from 5_2 (mysqli_info crash)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.141r2=1.142diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.141 
php-src/ext/mysqli/mysqli_api.c:1.142
--- php-src/ext/mysqli/mysqli_api.c:1.141   Tue Jan  2 05:49:05 2007
+++ php-src/ext/mysqli/mysqli_api.c Sat Jan  6 05:50:36 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_api.c,v 1.141 2007/01/02 05:49:05 georg Exp $ 
+  $Id: mysqli_api.c,v 1.142 2007/01/06 05:50:36 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1099,7 +1099,7 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link, 
MYSQLI_STATUS_VALID);
 
-   RETURN_UTF8_STRING(mysql-mysql-info, ZSTR_DUPLICATE);
+   RETURN_UTF8_STRING((mysql-mysql-info) ? mysql-mysql-info : , 
ZSTR_DUPLICATE);
 }
 /* }}} */
 

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