[PHP-CVS] cvs: php-src /ext/date/tests oo_002.phpt
tony2001Wed Jan 3 13:47:03 2007 UTC Modified files: /php-src/ext/date/tests oo_002.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/oo_002.phpt?r1=1.5r2=1.6diff_format=u Index: php-src/ext/date/tests/oo_002.phpt diff -u php-src/ext/date/tests/oo_002.phpt:1.5 php-src/ext/date/tests/oo_002.phpt:1.6 --- php-src/ext/date/tests/oo_002.phpt:1.5 Wed Sep 27 18:32:24 2006 +++ php-src/ext/date/tests/oo_002.phpt Wed Jan 3 13:47:03 2007 @@ -19,17 +19,17 @@ $c = clone $t; var_dump($c-getName()); ? ---EXPECT-- -string(29) Tue, 01 Aug 06 13:00:00 + -string(29) Tue, 01 Aug 06 13:00:00 + -string(29) Tue, 01 Aug 06 14:00:00 + -string(29) Tue, 01 Aug 06 12:59:59 + +--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(10) Asia/Tokyo string(10) Asia/Tokyo ---UEXPECT-- -unicode(29) Tue, 01 Aug 06 13:00:00 + -unicode(29) Tue, 01 Aug 06 13:00:00 + -unicode(29) Tue, 01 Aug 06 14:00:00 + -unicode(29) Tue, 01 Aug 06 12:59:59 + +--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(10) Asia/Tokyo unicode(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(PHP_5_2) /ext/date/tests oo_002.phpt
tony2001Wed Jan 3 13:47:11 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/date/tests oo_002.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/oo_002.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/date/tests/oo_002.phpt diff -u php-src/ext/date/tests/oo_002.phpt:1.1.2.3 php-src/ext/date/tests/oo_002.phpt:1.1.2.4 --- php-src/ext/date/tests/oo_002.phpt:1.1.2.3 Tue Aug 15 06:53:21 2006 +++ php-src/ext/date/tests/oo_002.phpt Wed Jan 3 13:47:11 2007 @@ -19,10 +19,10 @@ $c = clone $t; var_dump($c-getName()); ? ---EXPECT-- -string(29) Tue, 01 Aug 06 13:00:00 + -string(29) Tue, 01 Aug 06 13:00:00 + -string(29) Tue, 01 Aug 06 14:00:00 + -string(29) Tue, 01 Aug 06 12:59:59 + +--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(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
tony2001Wed Jan 3 13:48:46 2007 UTC
Modified files:
/php-src/ext/date/tests bug37514.phpt
Log:
and one more..
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug37514.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/date/tests/bug37514.phpt
diff -u php-src/ext/date/tests/bug37514.phpt:1.2
php-src/ext/date/tests/bug37514.phpt:1.3
--- php-src/ext/date/tests/bug37514.phpt:1.2Fri May 19 14:53:07 2006
+++ php-src/ext/date/tests/bug37514.phptWed Jan 3 13:48:46 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;
?
---EXPECT--
-Thu, 18 May 2006 05:05:00 +
-Thu, 18 May 2006 17:05:00 +
-Thu, 18 May 2006 17:05:00 +
-Thu, 18 May 2006 05:05:00 +
-Thu, 18 May 2006 05:05:00 +
-Thu, 18 May 2006 17:05:00 +
+--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 +
--
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/date/tests bug37514.phpt
tony2001Wed Jan 3 13:48:54 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date/tests bug37514.phpt
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug37514.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/date/tests/bug37514.phpt
diff -u php-src/ext/date/tests/bug37514.phpt:1.1.2.1
php-src/ext/date/tests/bug37514.phpt:1.1.2.2
--- php-src/ext/date/tests/bug37514.phpt:1.1.2.1Fri May 19 14:52:30 2006
+++ php-src/ext/date/tests/bug37514.phptWed Jan 3 13:48:54 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;
?
---EXPECT--
-Thu, 18 May 2006 05:05:00 +
-Thu, 18 May 2006 17:05:00 +
-Thu, 18 May 2006 17:05:00 +
-Thu, 18 May 2006 05:05:00 +
-Thu, 18 May 2006 05:05:00 +
-Thu, 18 May 2006 17:05:00 +
+--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 +
--
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) / NEWS /ext/date php_date.c
derick Wed Jan 3 14:46:24 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/date php_date.c
Log:
- Fixed bug #40012 (php_date.c doesnt compile on Netware).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.469r2=1.2027.2.547.2.470diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.469 php-src/NEWS:1.2027.2.547.2.470
--- php-src/NEWS:1.2027.2.547.2.469 Tue Jan 2 15:29:09 2007
+++ php-src/NEWSWed Jan 3 14:46:23 2007
@@ -17,6 +17,8 @@
__inet_pton() and inet_ntop() was named __inet_ntop(). (Hannes)
- Fixed the validate email filter so that the letter v can also be used in
the user part of the email address. (Derick)
+- Fixed bug #40012 (php_date.c doesnt compile on Netware). (gk at gknw dot de,
+ Derick)
- Fixed bug #39984 (redirect response code in header() could be ignored in
CGI sapi). (Ilia)
- Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.37r2=1.43.2.45.2.38diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.37
php-src/ext/date/php_date.c:1.43.2.45.2.38
--- php-src/ext/date/php_date.c:1.43.2.45.2.37 Mon Jan 1 09:35:48 2007
+++ php-src/ext/date/php_date.c Wed Jan 3 14:46:23 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.37 2007/01/01 09:35:48 sebastian Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.38 2007/01/03 14:46:23 derick Exp $ */
#include php.h
#include php_streams.h
@@ -623,6 +623,14 @@
}
return tzid;
}
+#elif defined(NETWARE)
+ /* Try to guess timezone from system information */
+ {
+ char *tzid = timelib_timezone_id_from_abbr(, ((_timezone *
-1) + (daylightOffset * daylightOnOff)), daylightOnOff);
+ if (tzid) {
+ return tzid;
+ }
+ }
#endif
/* Fallback to UTC */
php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG We had to
select 'UTC' because your platform doesn't provide functionality for the
guessing algorithm);
@@ -2061,7 +2069,7 @@
PHP_FUNCTION(timezone_name_from_abbr)
{
char*abbr;
- char*tzname;
+ char*tzid;
int abbr_len;
long gmtoffset = -1;
long isdst = -1;
@@ -2069,10 +2077,10 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|ll, abbr,
abbr_len, gmtoffset, isdst) == FAILURE) {
RETURN_FALSE;
}
- tzname = timelib_timezone_id_from_abbr(abbr, gmtoffset, isdst);
+ tzid = timelib_timezone_id_from_abbr(abbr, gmtoffset, isdst);
- if (tzname) {
- RETURN_STRING(tzname, 1);
+ if (tzid) {
+ RETURN_STRING(tzid, 1);
} else {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
derick Wed Jan 3 14:46:52 2007 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
- MFB: Fixed bug #40012 (php_date.c doesnt compile on Netware).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.127r2=1.128diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.127 php-src/ext/date/php_date.c:1.128
--- php-src/ext/date/php_date.c:1.127 Mon Jan 1 09:29:22 2007
+++ php-src/ext/date/php_date.c Wed Jan 3 14:46:52 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.127 2007/01/01 09:29:22 sebastian Exp $ */
+/* $Id: php_date.c,v 1.128 2007/01/03 14:46:52 derick Exp $ */
#include php.h
#include php_streams.h
@@ -628,6 +628,14 @@
}
return tzid;
}
+#elif defined(NETWARE)
+ /* Try to guess timezone from system information */
+ {
+ char *tzid = timelib_timezone_id_from_abbr(, ((_timezone *
-1) + (daylightOffset * daylightOnOff)), daylightOnOff);
+ if (tzid) {
+ return tzid;
+ }
+ }
#endif
/* Fallback to UTC */
php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG We had to
select 'UTC' because your platform doesn't provide functionality for the
guessing algorithm);
@@ -2218,7 +2226,7 @@
PHP_FUNCTION(timezone_name_from_abbr)
{
char*abbr;
- char*tzname;
+ char*tzid;
int abbr_len;
long gmtoffset = -1;
long isdst = -1;
@@ -2226,10 +2234,10 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|ll, abbr,
abbr_len, gmtoffset, isdst) == FAILURE) {
RETURN_FALSE;
}
- tzname = timelib_timezone_id_from_abbr(abbr, gmtoffset, isdst);
+ tzid = timelib_timezone_id_from_abbr(abbr, gmtoffset, isdst);
- if (tzname) {
- RETURN_STRING(tzname, 1);
+ if (tzid) {
+ RETURN_STRING(tzid, 1);
} else {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcre/pcrelib pcre.h
tony2001Wed Jan 3 18:32:16 2007 UTC Modified files: /php-src/ext/pcre/pcrelib pcre.h Log: revert this date to its previous state http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre.h?r1=1.21r2=1.22diff_format=u Index: php-src/ext/pcre/pcrelib/pcre.h diff -u php-src/ext/pcre/pcrelib/pcre.h:1.21 php-src/ext/pcre/pcrelib/pcre.h:1.22 --- php-src/ext/pcre/pcrelib/pcre.h:1.21Mon Jan 1 09:29:27 2007 +++ php-src/ext/pcre/pcrelib/pcre.h Wed Jan 3 18:32:16 2007 @@ -57,7 +57,7 @@ #define PCRE_MAJOR 6 #define PCRE_MINOR 7 #define PCRE_PRERELEASE -#define PCRE_DATE 04-Jul-2007 +#define PCRE_DATE 04-Jul-2006 /* Win32 uses DLL by default; it needs special stuff for exported functions when building PCRE. */ -- 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/pcre/pcrelib pcre.h
tony2001Wed Jan 3 18:32:27 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pcre/pcrelib pcre.h Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre.h?r1=1.18.2.1.2.2r2=1.18.2.1.2.3diff_format=u Index: php-src/ext/pcre/pcrelib/pcre.h diff -u php-src/ext/pcre/pcrelib/pcre.h:1.18.2.1.2.2 php-src/ext/pcre/pcrelib/pcre.h:1.18.2.1.2.3 --- php-src/ext/pcre/pcrelib/pcre.h:1.18.2.1.2.2Mon Jan 1 09:36:04 2007 +++ php-src/ext/pcre/pcrelib/pcre.h Wed Jan 3 18:32:27 2007 @@ -57,7 +57,7 @@ #define PCRE_MAJOR 6 #define PCRE_MINOR 7 #define PCRE_PRERELEASE -#define PCRE_DATE 04-Jul-2007 +#define PCRE_DATE 04-Jul-2006 /* Win32 uses DLL by default; it needs special stuff for exported functions when building PCRE. */ -- 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/pcre/pcrelib pcre.h
tony2001Wed Jan 3 18:32:58 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/pcre/pcrelib pcre.h Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre.h?r1=1.12.2.5.2.4r2=1.12.2.5.2.5diff_format=u Index: php-src/ext/pcre/pcrelib/pcre.h diff -u php-src/ext/pcre/pcrelib/pcre.h:1.12.2.5.2.4 php-src/ext/pcre/pcrelib/pcre.h:1.12.2.5.2.5 --- php-src/ext/pcre/pcrelib/pcre.h:1.12.2.5.2.4Mon Jan 1 09:46:45 2007 +++ php-src/ext/pcre/pcrelib/pcre.h Wed Jan 3 18:32:58 2007 @@ -57,7 +57,7 @@ #define PCRE_MAJOR 6 #define PCRE_MINOR 7 #define PCRE_PRERELEASE -#define PCRE_DATE 04-Jul-2007 +#define PCRE_DATE 04-Jul-2006 /* Win32 uses DLL by default; it needs special stuff for exported functions when building PCRE. */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2filter php_functions.c /sapi/apache2handler php_functions.c
tony2001Wed Jan 3 18:52:23 2007 UTC
Modified files:
/php-src/sapi/apache2filter php_functions.c
/php-src/sapi/apache2handlerphp_functions.c
Log:
fix magic numbers
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.48r2=1.49diff_format=u
Index: php-src/sapi/apache2filter/php_functions.c
diff -u php-src/sapi/apache2filter/php_functions.c:1.48
php-src/sapi/apache2filter/php_functions.c:1.49
--- php-src/sapi/apache2filter/php_functions.c:1.48 Mon Jan 1 09:29:36 2007
+++ php-src/sapi/apache2filter/php_functions.c Wed Jan 3 18:52:23 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_functions.c,v 1.48 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: php_functions.c,v 1.49 2007/01/03 18:52:23 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -289,7 +289,7 @@
static char *php_apache_get_version()
{
-#if MODULE_MAGIC_NUMBER_MAJOR = 20070905
+#if MODULE_MAGIC_NUMBER_MAJOR = 20060905
return (char *) ap_get_server_banner();
#else
return (char *) ap_get_server_version();
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.28r2=1.29diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.28
php-src/sapi/apache2handler/php_functions.c:1.29
--- php-src/sapi/apache2handler/php_functions.c:1.28Mon Jan 1 09:29:36 2007
+++ php-src/sapi/apache2handler/php_functions.c Wed Jan 3 18:52:23 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_functions.c,v 1.28 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: php_functions.c,v 1.29 2007/01/03 18:52:23 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -333,7 +333,7 @@
static char *php_apache_get_version()
{
-#if MODULE_MAGIC_NUMBER_MAJOR = 20070905
+#if MODULE_MAGIC_NUMBER_MAJOR = 20060905
return (char *) ap_get_server_banner();
#else
return (char *) ap_get_server_version();
--
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/ftp ftp.c
nlopess Wed Jan 3 20:04:57 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/ftpftp.c
Log:
merge Tony's patch to fix memleak
http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/ftp.c?r1=1.68.2.22.2.4r2=1.68.2.22.2.5diff_format=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.68.2.22.2.4 php-src/ext/ftp/ftp.c:1.68.2.22.2.5
--- php-src/ext/ftp/ftp.c:1.68.2.22.2.4 Mon Jan 1 09:46:42 2007
+++ php-src/ext/ftp/ftp.c Wed Jan 3 20:04:57 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ftp.c,v 1.68.2.22.2.4 2007/01/01 09:46:42 sebastian Exp $ */
+/* $Id: ftp.c,v 1.68.2.22.2.5 2007/01/03 20:04:57 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1503,6 +1503,8 @@
/* some servers don't open a ftp-data connection if the directory is
empty */
if (ftp-resp == 226) {
+ ftp-data = data_close(ftp, data);
+ php_stream_close(tmpstream);
return ecalloc(1, sizeof(char**));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcre/pcrelib pcregrep.c
bjori Wed Jan 3 20:08:08 2007 UTC Modified files: /php-src/ext/pcre/pcrelib pcregrep.c Log: Revert pcrelib version string to 2006 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcregrep.c?r1=1.11r2=1.12diff_format=u Index: php-src/ext/pcre/pcrelib/pcregrep.c diff -u php-src/ext/pcre/pcrelib/pcregrep.c:1.11 php-src/ext/pcre/pcrelib/pcregrep.c:1.12 --- php-src/ext/pcre/pcrelib/pcregrep.c:1.11Mon Jan 1 09:29:27 2007 +++ php-src/ext/pcre/pcrelib/pcregrep.c Wed Jan 3 20:08:08 2007 @@ -56,7 +56,7 @@ typedef int BOOL; -#define VERSION 4.3 01-Jun-2007 +#define VERSION 4.3 01-Jun-2006 #define MAX_PATTERN_COUNT 100 #if BUFSIZ 8192 -- 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/pcre/pcrelib pcregrep.c
bjori Wed Jan 3 20:08:37 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pcre/pcrelib pcregrep.c Log: MFH: revert pcrelib version string http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcregrep.c?r1=1.8.2.1.2.2r2=1.8.2.1.2.3diff_format=u Index: php-src/ext/pcre/pcrelib/pcregrep.c diff -u php-src/ext/pcre/pcrelib/pcregrep.c:1.8.2.1.2.2 php-src/ext/pcre/pcrelib/pcregrep.c:1.8.2.1.2.3 --- php-src/ext/pcre/pcrelib/pcregrep.c:1.8.2.1.2.2 Mon Jan 1 09:36:04 2007 +++ php-src/ext/pcre/pcrelib/pcregrep.c Wed Jan 3 20:08:37 2007 @@ -56,7 +56,7 @@ typedef int BOOL; -#define VERSION 4.3 01-Jun-2007 +#define VERSION 4.3 01-Jun-2006 #define MAX_PATTERN_COUNT 100 #if BUFSIZ 8192 -- 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/pcre/pcrelib pcregrep.c
bjori Wed Jan 3 20:09:00 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/pcre/pcrelib pcregrep.c Log: MFH: revert pcrelib version string http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcregrep.c?r1=1.3.2.4.2.4r2=1.3.2.4.2.5diff_format=u Index: php-src/ext/pcre/pcrelib/pcregrep.c diff -u php-src/ext/pcre/pcrelib/pcregrep.c:1.3.2.4.2.4 php-src/ext/pcre/pcrelib/pcregrep.c:1.3.2.4.2.5 --- php-src/ext/pcre/pcrelib/pcregrep.c:1.3.2.4.2.4 Mon Jan 1 09:46:46 2007 +++ php-src/ext/pcre/pcrelib/pcregrep.c Wed Jan 3 20:09:00 2007 @@ -56,7 +56,7 @@ typedef int BOOL; -#define VERSION 4.3 01-Jun-2007 +#define VERSION 4.3 01-Jun-2006 #define MAX_PATTERN_COUNT 100 #if BUFSIZ 8192 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo php_pdo_driver.h
nlopess Wed Jan 3 20:33:10 2007 UTC
Modified files:
/php-src/ext/pdophp_pdo_driver.h
Log:
fix PDO_DRIVER_API
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/php_pdo_driver.h?r1=1.85r2=1.86diff_format=u
Index: php-src/ext/pdo/php_pdo_driver.h
diff -u php-src/ext/pdo/php_pdo_driver.h:1.85
php-src/ext/pdo/php_pdo_driver.h:1.86
--- php-src/ext/pdo/php_pdo_driver.h:1.85 Mon Jan 1 09:29:27 2007
+++ php-src/ext/pdo/php_pdo_driver.hWed Jan 3 20:33:09 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pdo_driver.h,v 1.85 2007/01/01 09:29:27 sebastian Exp $ */
+/* $Id: php_pdo_driver.h,v 1.86 2007/01/03 20:33:09 nlopess Exp $ */
#ifndef PHP_PDO_DRIVER_H
#define PHP_PDO_DRIVER_H
@@ -45,7 +45,7 @@
# define FALSE 0
#endif
-#define PDO_DRIVER_API 20071209
+#define PDO_DRIVER_API 20061209
enum pdo_param_type {
PDO_PARAM_NULL,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8_interface.c
tony2001Wed Jan 3 20:45:18 2007 UTC Modified files: /php-src/ext/oci8 oci8_interface.c Log: use constant http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.28r2=1.29diff_format=u Index: php-src/ext/oci8/oci8_interface.c diff -u php-src/ext/oci8/oci8_interface.c:1.28 php-src/ext/oci8/oci8_interface.c:1.29 --- php-src/ext/oci8/oci8_interface.c:1.28 Mon Jan 1 09:29:26 2007 +++ php-src/ext/oci8/oci8_interface.c Wed Jan 3 20:45:17 2007 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: oci8_interface.c,v 1.28 2007/01/01 09:29:26 sebastian Exp $ */ +/* $Id: oci8_interface.c,v 1.29 2007/01/03 20:45:17 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1599,7 +1599,7 @@ php_oci_connection *connection; text *errbuf; sb4 errcode = 0; - sword error = 0; + sword error = OCI_SUCCESS; dvoid *errh = NULL; #ifdef HAVE_OCI8_ATTR_STATEMENT ub2 error_offset = 0; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/exif exif.c /ext/mime_magic mime_magic.c /ext/sqlite sqlite.c ZendEngine2 zend_extensions.h zend_modules.h
tony2001Wed Jan 3 20:49:27 2007 UTC
Modified files:
/ZendEngine2zend_extensions.h zend_modules.h
/php-src/ext/exif exif.c
/php-src/ext/mime_magic mime_magic.c
/php-src/ext/sqlite sqlite.c
Log:
more magic number fixes
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_extensions.h?r1=1.74r2=1.75diff_format=u
Index: ZendEngine2/zend_extensions.h
diff -u ZendEngine2/zend_extensions.h:1.74 ZendEngine2/zend_extensions.h:1.75
--- ZendEngine2/zend_extensions.h:1.74 Mon Jan 1 09:29:21 2007
+++ ZendEngine2/zend_extensions.h Wed Jan 3 20:49:27 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_extensions.h,v 1.74 2007/01/01 09:29:21 sebastian Exp $ */
+/* $Id: zend_extensions.h,v 1.75 2007/01/03 20:49:27 tony2001 Exp $ */
#ifndef ZEND_EXTENSIONS_H
#define ZEND_EXTENSIONS_H
@@ -27,7 +27,7 @@
/* The first number is the engine version and the rest is the date.
* This way engine 2/3 API no. is always greater than engine 1 API no..
*/
-#define ZEND_EXTENSION_API_NO 320070519
+#define ZEND_EXTENSION_API_NO 320060519
typedef struct _zend_extension_version_info {
int zend_extension_api_no;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_modules.h?r1=1.75r2=1.76diff_format=u
Index: ZendEngine2/zend_modules.h
diff -u ZendEngine2/zend_modules.h:1.75 ZendEngine2/zend_modules.h:1.76
--- ZendEngine2/zend_modules.h:1.75 Mon Jan 1 09:29:21 2007
+++ ZendEngine2/zend_modules.h Wed Jan 3 20:49:27 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_modules.h,v 1.75 2007/01/01 09:29:21 sebastian Exp $ */
+/* $Id: zend_modules.h,v 1.76 2007/01/03 20:49:27 tony2001 Exp $ */
#ifndef MODULES_H
#define MODULES_H
@@ -39,7 +39,7 @@
extern struct _zend_arg_info fifth_arg_force_ref[6];
extern struct _zend_arg_info all_args_by_ref[1];
-#define ZEND_MODULE_API_NO 20070613
+#define ZEND_MODULE_API_NO 20060613
#ifdef ZTS
#define USING_ZTS 1
#else
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.188r2=1.189diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.188 php-src/ext/exif/exif.c:1.189
--- php-src/ext/exif/exif.c:1.188 Mon Jan 1 09:29:23 2007
+++ php-src/ext/exif/exif.c Wed Jan 3 20:49:27 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.188 2007/01/01 09:29:23 sebastian Exp $ */
+/* $Id: exif.c,v 1.189 2007/01/03 20:49:27 tony2001 Exp $ */
/* ToDos
*
@@ -139,7 +139,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.188 2007/01/01 09:29:23 sebastian
Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.189 2007/01/03 20:49:27 tony2001 Exp
$
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -253,7 +253,7 @@
#if ZEND_MODULE_API_NO = 20010901
EXIF_VERSION,
#endif
-#if ZEND_MODULE_API_NO = 20070613
+#if ZEND_MODULE_API_NO = 20060613
PHP_MODULE_GLOBALS(exif),
PHP_GINIT(exif),
NULL,
http://cvs.php.net/viewvc.cgi/php-src/ext/mime_magic/mime_magic.c?r1=1.54r2=1.55diff_format=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.54
php-src/ext/mime_magic/mime_magic.c:1.55
--- php-src/ext/mime_magic/mime_magic.c:1.54Mon Jan 1 09:29:25 2007
+++ php-src/ext/mime_magic/mime_magic.c Wed Jan 3 20:49:27 2007
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe [EMAIL PROTECTED] |
+--+
- $Id: mime_magic.c,v 1.54 2007/01/01 09:29:25 sebastian Exp $
+ $Id: mime_magic.c,v 1.55 2007/01/03 20:49:27 tony2001 Exp $
This module contains a lot of stuff taken from Apache mod_mime_magic,
so the license section is a little bit longer than usual:
@@ -240,7 +240,7 @@
#if ZEND_MODULE_API_NO = 20010901
0.1,
#endif
-#if ZEND_MODULE_API_NO = 20070613
+#if ZEND_MODULE_API_NO = 20060613
PHP_MODULE_GLOBALS(mime_magic),
PHP_GINIT(mime_magic),
NULL,
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.200r2=1.201diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.200 php-src/ext/sqlite/sqlite.c:1.201
--- php-src/ext/sqlite/sqlite.c:1.200 Mon Jan 1 09:29:30 2007
+++ php-src/ext/sqlite/sqlite.c Wed Jan 3 20:49:27 2007
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.200 2007/01/01 09:29:30 sebastian Exp $
+ $Id: sqlite.c,v 1.201 2007/01/03 20:49:27 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -347,7 +347,7 @@
#if ZEND_MODULE_API_NO = 20010901
PHP_SQLITE_MODULE_VERSION,
#endif
-#if ZEND_MODULE_API_NO = 20070613
+#if ZEND_MODULE_API_NO = 20060613
PHP_MODULE_GLOBALS(sqlite),
[PHP-CVS] cvs: php-src /ext/pdo pdo_sql_parser.c pdo_sql_parser.re
nlopess Wed Jan 3 22:02:43 2007 UTC
Modified files:
/php-src/ext/pdopdo_sql_parser.c pdo_sql_parser.re
Log:
fix a bug where PHP would enter in an infinite cycle with chars with ascii
value 127
while at it, remove the lim structure parameter (it wasn't being used)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.51r2=1.52diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.51
php-src/ext/pdo/pdo_sql_parser.c:1.52
--- php-src/ext/pdo/pdo_sql_parser.c:1.51 Wed Jan 3 20:27:49 2007
+++ php-src/ext/pdo/pdo_sql_parser.cWed Jan 3 22:02:43 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.10.6 on Sat Dec 9 17:16:39 2007 */
+/* Generated by re2c 0.10.4 on Wed Jan 3 22:02:19 2007 */
#line 1 ext/pdo/pdo_sql_parser.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_sql_parser.c,v 1.51 2007/01/03 20:27:49 nlopess Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.52 2007/01/03 22:02:43 nlopess Exp $ */
#include php.h
#include php_pdo_driver.h
@@ -31,14 +31,14 @@
#define RET(i) {s-cur = cursor; return i; }
-#define YYCTYPE char
+#define YYCTYPE unsigned char
#define YYCURSORcursor
-#define YYLIMIT s-lim
+#define YYLIMIT cursor
#define YYMARKERs-ptr
#define YYFILL(n)
typedef struct Scanner {
- char*lim, *ptr, *cur, *tok;
+ char*ptr, *cur, *tok;
} Scanner;
static int scan(Scanner *s)
@@ -263,7 +263,6 @@
ptr = *outquery;
s.cur = inquery;
- s.lim = inquery + inquery_len;
/* phase 1: look for args */
while((t = scan(s)) != PDO_PARSER_EOI) {
@@ -578,7 +577,6 @@
ptr = *outquery;
s.cur = inquery;
- s.lim = inquery + inquery_len;
while((t = scan(s)) != PDO_PARSER_EOI) {
if(t == PDO_PARSER_TEXT) {
memcpy(ptr, s.tok, s.cur - s.tok);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.37r2=1.38diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.37
php-src/ext/pdo/pdo_sql_parser.re:1.38
--- php-src/ext/pdo/pdo_sql_parser.re:1.37 Tue Dec 5 18:05:56 2006
+++ php-src/ext/pdo/pdo_sql_parser.re Wed Jan 3 22:02:43 2007
@@ -2,7 +2,7 @@
+--+
| PHP Version 5|
+--+
- | Copyright (c) 1997-2006 The PHP Group|
+ | Copyright (c) 1997-2007 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pdo_sql_parser.re,v 1.37 2006/12/05 18:05:56 iliaa Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.38 2007/01/03 22:02:43 nlopess Exp $ */
#include php.h
#include php_pdo_driver.h
@@ -29,14 +29,14 @@
#define RET(i) {s-cur = cursor; return i; }
-#define YYCTYPE char
+#define YYCTYPE unsigned char
#define YYCURSORcursor
-#define YYLIMIT s-lim
+#define YYLIMIT cursor
#define YYMARKERs-ptr
#define YYFILL(n)
typedef struct Scanner {
- char*lim, *ptr, *cur, *tok;
+ char*ptr, *cur, *tok;
} Scanner;
static int scan(Scanner *s)
@@ -90,7 +90,6 @@
ptr = *outquery;
s.cur = inquery;
- s.lim = inquery + inquery_len;
/* phase 1: look for args */
while((t = scan(s)) != PDO_PARSER_EOI) {
@@ -405,7 +404,6 @@
ptr = *outquery;
s.cur = inquery;
- s.lim = inquery + inquery_len;
while((t = scan(s)) != PDO_PARSER_EOI) {
if(t == PDO_PARSER_TEXT) {
memcpy(ptr, s.tok, s.cur - s.tok);
--
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/pdo pdo_sql_parser.c pdo_sql_parser.re
nlopess Wed Jan 3 22:05:25 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdopdo_sql_parser.c pdo_sql_parser.re
Log:
MFH: fix infinite cycle
#this was the infinite cycle that was bugging me in the gcov machine...
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.35.2.6.2.7r2=1.35.2.6.2.8diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.7
php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.8
--- php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.7 Mon Jan 1 09:36:04 2007
+++ php-src/ext/pdo/pdo_sql_parser.cWed Jan 3 22:05:24 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.10.6 on Mon Dec 4 16:21:45 2006 */
+/* Generated by re2c 0.10.4 on Wed Jan 3 22:04:03 2007 */
#line 1 ext/pdo/pdo_sql_parser.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.7 2007/01/01 09:36:04 sebastian Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.8 2007/01/03 22:05:24 nlopess Exp $ */
#include php.h
#include php_pdo_driver.h
@@ -31,14 +31,14 @@
#define RET(i) {s-cur = cursor; return i; }
-#define YYCTYPE char
+#define YYCTYPE unsigned char
#define YYCURSORcursor
-#define YYLIMIT s-lim
+#define YYLIMIT cursor
#define YYMARKERs-ptr
#define YYFILL(n)
typedef struct Scanner {
- char*lim, *ptr, *cur, *tok;
+ char*ptr, *cur, *tok;
} Scanner;
static int scan(Scanner *s)
@@ -263,7 +263,6 @@
ptr = *outquery;
s.cur = inquery;
- s.lim = inquery + inquery_len;
/* phase 1: look for args */
while((t = scan(s)) != PDO_PARSER_EOI) {
@@ -578,7 +577,6 @@
ptr = *outquery;
s.cur = inquery;
- s.lim = inquery + inquery_len;
while((t = scan(s)) != PDO_PARSER_EOI) {
if(t == PDO_PARSER_TEXT) {
memcpy(ptr, s.tok, s.cur - s.tok);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.5r2=1.28.2.4.2.6diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.5
php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.6
--- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.5 Tue Dec 5 18:04:59 2006
+++ php-src/ext/pdo/pdo_sql_parser.re Wed Jan 3 22:05:24 2007
@@ -2,7 +2,7 @@
+--+
| PHP Version 5|
+--+
- | Copyright (c) 1997-2006 The PHP Group|
+ | Copyright (c) 1997-2007 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.5 2006/12/05 18:04:59 iliaa Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.6 2007/01/03 22:05:24 nlopess Exp $ */
#include php.h
#include php_pdo_driver.h
@@ -29,14 +29,14 @@
#define RET(i) {s-cur = cursor; return i; }
-#define YYCTYPE char
+#define YYCTYPE unsigned char
#define YYCURSORcursor
-#define YYLIMIT s-lim
+#define YYLIMIT cursor
#define YYMARKERs-ptr
#define YYFILL(n)
typedef struct Scanner {
- char*lim, *ptr, *cur, *tok;
+ char*ptr, *cur, *tok;
} Scanner;
static int scan(Scanner *s)
@@ -90,7 +90,6 @@
ptr = *outquery;
s.cur = inquery;
- s.lim = inquery + inquery_len;
/* phase 1: look for args */
while((t = scan(s)) != PDO_PARSER_EOI) {
@@ -405,7 +404,6 @@
ptr = *outquery;
s.cur = inquery;
- s.lim = inquery + inquery_len;
while((t = scan(s)) != PDO_PARSER_EOI) {
if(t == PDO_PARSER_TEXT) {
memcpy(ptr, s.tok, s.cur - s.tok);
--
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/zlib/tests bug_34821.phpt
nlopess Wed Jan 3 22:32:49 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/zlib/tests bug_34821.phpt Log: reduce the test data size even further or when running with valgrind it times out http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/bug_34821.phpt?r1=1.1.2.1.2.2r2=1.1.2.1.2.3diff_format=u Index: php-src/ext/zlib/tests/bug_34821.phpt diff -u php-src/ext/zlib/tests/bug_34821.phpt:1.1.2.1.2.2 php-src/ext/zlib/tests/bug_34821.phpt:1.1.2.1.2.3 --- php-src/ext/zlib/tests/bug_34821.phpt:1.1.2.1.2.2 Thu Dec 28 19:52:37 2006 +++ php-src/ext/zlib/tests/bug_34821.phpt Wed Jan 3 22:32:49 2007 @@ -5,12 +5,12 @@ --FILE-- ?php -// test 50 bytes to 500k +// test 50 bytes to 50k $b = array( 50, 500, 5000, - 25, + 5, // 100, // works, but test would take too long ); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib/tests bug_34821.phpt
nlopess Wed Jan 3 22:33:33 2007 UTC Modified files: /php-src/ext/zlib/tests bug_34821.phpt Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/bug_34821.phpt?r1=1.5r2=1.6diff_format=u Index: php-src/ext/zlib/tests/bug_34821.phpt diff -u php-src/ext/zlib/tests/bug_34821.phpt:1.5 php-src/ext/zlib/tests/bug_34821.phpt:1.6 --- php-src/ext/zlib/tests/bug_34821.phpt:1.5 Thu Dec 28 19:53:30 2006 +++ php-src/ext/zlib/tests/bug_34821.phpt Wed Jan 3 22:33:33 2007 @@ -5,12 +5,12 @@ --FILE-- ?php -// test 50 bytes to 500k +// test 50 bytes to 50k $b = array( 50, 500, 5000, - 25, + 5, // 100, // works, but test would take too long ); -- 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) / NEWS /ext/standard http.c
iliaa Wed Jan 3 23:16:56 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard http.c
/php-srcNEWS
Log:
Fixed bug #40009 (http_build_query(array()) returns NULL).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http.c?r1=1.14.2.4.2.2r2=1.14.2.4.2.3diff_format=u
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.14.2.4.2.2
php-src/ext/standard/http.c:1.14.2.4.2.3
--- php-src/ext/standard/http.c:1.14.2.4.2.2Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/http.c Wed Jan 3 23:16:56 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: http.c,v 1.14.2.4.2.2 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: http.c,v 1.14.2.4.2.3 2007/01/03 23:16:56 iliaa Exp $ */
#include php_http.h
#include php_ini.h
@@ -215,7 +215,7 @@
}
if (!formstr.c) {
- RETURN_NULL();
+ RETURN_EMPTY_STRING();
}
smart_str_0(formstr);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.470r2=1.2027.2.547.2.471diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.470 php-src/NEWS:1.2027.2.547.2.471
--- php-src/NEWS:1.2027.2.547.2.470 Wed Jan 3 14:46:23 2007
+++ php-src/NEWSWed Jan 3 23:16:56 2007
@@ -19,6 +19,7 @@
the user part of the email address. (Derick)
- Fixed bug #40012 (php_date.c doesnt compile on Netware). (gk at gknw dot de,
Derick)
+- Fixed bug #40009 (http_build_query(array()) returns NULL). (Ilia)
- Fixed bug #39984 (redirect response code in header() could be ignored in
CGI sapi). (Ilia)
- Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard http.c
iliaa Wed Jan 3 23:17:17 2007 UTC
Modified files:
/php-src/ext/standard http.c
Log:
MFB: Fixed bug #40009 (http_build_query(array()) returns NULL).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http.c?r1=1.25r2=1.26diff_format=u
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.25 php-src/ext/standard/http.c:1.26
--- php-src/ext/standard/http.c:1.25Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/http.c Wed Jan 3 23:17:17 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: http.c,v 1.25 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: http.c,v 1.26 2007/01/03 23:17:17 iliaa Exp $ */
#include php_http.h
#include php_ini.h
@@ -247,7 +247,7 @@
}
if (!formstr.c) {
- RETURN_NULL();
+ RETURN_EMPTY_STRING();
}
smart_str_0(formstr);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
