[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/tests 015.phpt
jorton Wed Jul 9 08:37:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date/tests 015.phpt
Log:
- MFH: tweak test case to better trigger the (now-fixed) reference bugs
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/015.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/date/tests/015.phpt
diff -u php-src/ext/date/tests/015.phpt:1.1.2.2
php-src/ext/date/tests/015.phpt:1.1.2.3
--- php-src/ext/date/tests/015.phpt:1.1.2.2 Tue Jul 8 17:41:51 2008
+++ php-src/ext/date/tests/015.phpt Wed Jul 9 08:37:29 2008
@@ -10,10 +10,13 @@
$dto->setTimezone(new DateTimeZone('US/Eastern'));
var_dump($tzold->getName());
var_dump($dto->getTimezone()->getName());
+unset($dto);
+var_dump($tzold->getName());
echo "Done\n";
?>
--EXPECTF--
-string(3) "UTC"
-string(3) "UTC"
-string(10) "US/Eastern"
+unicode(3) "UTC"
+unicode(3) "UTC"
+unicode(10) "US/Eastern"
+unicode(3) "UTC"
Done
--
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 015.phpt
jorton Wed Jul 9 08:29:55 2008 UTC
Modified files:
/php-src/ext/date/tests 015.phpt
Log:
- tweak test case to better trigger the (now-fixed) reference bugs
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/015.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/date/tests/015.phpt
diff -u php-src/ext/date/tests/015.phpt:1.1 php-src/ext/date/tests/015.phpt:1.2
--- php-src/ext/date/tests/015.phpt:1.1 Tue Jul 8 17:40:35 2008
+++ php-src/ext/date/tests/015.phpt Wed Jul 9 08:29:55 2008
@@ -10,10 +10,13 @@
$dto->setTimezone(new DateTimeZone('US/Eastern'));
var_dump($tzold->getName());
var_dump($dto->getTimezone()->getName());
+unset($dto);
+var_dump($tzold->getName());
echo "Done\n";
?>
--EXPECTF--
unicode(3) "UTC"
unicode(3) "UTC"
unicode(10) "US/Eastern"
+unicode(3) "UTC"
Done
--
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/openssl xp_ssl.c /ext/soap php_http.c
jorton Tue Apr 8 14:11:50 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/opensslxp_ssl.c
/php-src/ext/soap php_http.c
/php-srcNEWS
Log:
MFH: Fixed bug #32979 (OpenSSL stream->fd casts broken in 64-bit build)
(stotty at tvnet dot hu)
MFH: Fix another case of a broken stream->fd cast in 64-bit builds.
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.10&r2=1.22.2.3.2.11&diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.10
php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.11
--- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.10 Mon Dec 31 07:20:09 2007
+++ php-src/ext/openssl/xp_ssl.cTue Apr 8 14:11:49 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.22.2.3.2.10 2007/12/31 07:20:09 sebastian Exp $ */
+/* $Id: xp_ssl.c,v 1.22.2.3.2.11 2008/04/08 14:11:49 jorton Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -728,7 +728,7 @@
case PHP_STREAM_AS_FD_FOR_SELECT:
if (ret) {
- *ret = (void*)sslsock->s.socket;
+ *(int *)ret = sslsock->s.socket;
}
return SUCCESS;
@@ -738,7 +738,7 @@
return FAILURE;
}
if (ret) {
- *ret = (void*)sslsock->s.socket;
+ *(int *)ret = sslsock->s.socket;
}
return SUCCESS;
default:
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.14&r2=1.77.2.11.2.15&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.14
php-src/ext/soap/php_http.c:1.77.2.11.2.15
--- php-src/ext/soap/php_http.c:1.77.2.11.2.14 Mon Dec 31 07:20:11 2007
+++ php-src/ext/soap/php_http.c Tue Apr 8 14:11:49 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_http.c,v 1.77.2.11.2.14 2007/12/31 07:20:11 sebastian Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.15 2008/04/08 14:11:49 jorton Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -33,7 +33,7 @@
static int stream_alive(php_stream *stream TSRMLS_DC)
{
- long socket;
+ int socket;
char buf;
/* maybe better to use:
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1135&r2=1.2027.2.547.2.1136&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1135 php-src/NEWS:1.2027.2.547.2.1136
--- php-src/NEWS:1.2027.2.547.2.1135Tue Apr 8 08:45:51 2008
+++ php-src/NEWSTue Apr 8 14:11:49 2008
@@ -4,6 +4,8 @@
- Fixed bug #44667 (proc_open() does not handle pipes with the mode 'wb'
correctly). (Jani)
- Fixed bug #44591 (imagegif's filename parameter). (Felipe)
+- Fixed bug #32979 (OpenSSL stream->fd casts broken in 64-bit build)
+ (stotty at tvnet dot hu)
03 Apr 2008, PHP 5.2.6RC4
- Fixed possible stack buffer overflow in FastCGI SAPI. (Andrei Nigmatulin)
--
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_3) /ext/openssl xp_ssl.c /ext/soap php_http.c
On Fri, Apr 04, 2008 at 01:02:48PM -, Joe Orton wrote: > jortonFri Apr 4 13:02:48 2008 UTC > > Modified files: (Branch: PHP_5_3) > /php-src/ext/openssl xp_ssl.c > /php-src/ext/soap php_http.c > Log: > MFH: Fixed bug #32979 (OpenSSL stream->fd casts broken in 64-bit build) > (stotty at tvnet dot hu) > MFH: Fix another case of a broken stream->fd cast in 64-bit builds. Ilia, is it OK to commit these two changes for 5.2.x as well? joe -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/openssl xp_ssl.c /ext/soap php_http.c
jorton Fri Apr 4 13:02:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/opensslxp_ssl.c
/php-src/ext/soap php_http.c
Log:
MFH: Fixed bug #32979 (OpenSSL stream->fd casts broken in 64-bit build)
(stotty at tvnet dot hu)
MFH: Fix another case of a broken stream->fd cast in 64-bit builds.
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.9.2.3&r2=1.22.2.3.2.9.2.4&diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.3
php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.4
--- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.3 Mon Dec 31 07:17:11 2007
+++ php-src/ext/openssl/xp_ssl.cFri Apr 4 13:02:47 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.3 2007/12/31 07:17:11 sebastian Exp $ */
+/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.4 2008/04/04 13:02:47 jorton Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -728,7 +728,7 @@
case PHP_STREAM_AS_FD_FOR_SELECT:
if (ret) {
- *ret = (void*)sslsock->s.socket;
+ *(int *)ret = sslsock->s.socket;
}
return SUCCESS;
@@ -738,7 +738,7 @@
return FAILURE;
}
if (ret) {
- *ret = (void*)sslsock->s.socket;
+ *(int *)ret = sslsock->s.socket;
}
return SUCCESS;
default:
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.12.2.4&r2=1.77.2.11.2.12.2.5&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.4
php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.5
--- php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.4 Fri Feb 22 05:04:34 2008
+++ php-src/ext/soap/php_http.c Fri Apr 4 13:02:48 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_http.c,v 1.77.2.11.2.12.2.4 2008/02/22 05:04:34 rasmus Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.12.2.5 2008/04/04 13:02:48 jorton Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -33,7 +33,7 @@
static int stream_alive(php_stream *stream TSRMLS_DC)
{
- long socket;
+ int socket;
char buf;
/* maybe better to use:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_http.c
jorton Fri Apr 4 12:58:32 2008 UTC
Modified files:
/php-src/ext/soap php_http.c
Log:
Fix another case of a broken stream->fd cast in 64-bit builds.
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.112&r2=1.113&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.112 php-src/ext/soap/php_http.c:1.113
--- php-src/ext/soap/php_http.c:1.112 Fri Feb 22 05:05:50 2008
+++ php-src/ext/soap/php_http.c Fri Apr 4 12:58:32 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_http.c,v 1.112 2008/02/22 05:05:50 rasmus Exp $ */
+/* $Id: php_http.c,v 1.113 2008/04/04 12:58:32 jorton Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -33,7 +33,7 @@
static int stream_alive(php_stream *stream TSRMLS_DC)
{
- long socket;
+ int socket;
char buf;
/* maybe better to use:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl xp_ssl.c
jorton Fri Apr 4 12:49:57 2008 UTC
Modified files:
/php-src/ext/opensslxp_ssl.c
Log:
Fixed bug #32979 (OpenSSL stream->fd casts broken in 64-bit build)
(stotty at tvnet dot hu)
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.35&r2=1.36&diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.35 php-src/ext/openssl/xp_ssl.c:1.36
--- php-src/ext/openssl/xp_ssl.c:1.35 Mon Dec 31 07:12:12 2007
+++ php-src/ext/openssl/xp_ssl.cFri Apr 4 12:49:57 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.35 2007/12/31 07:12:12 sebastian Exp $ */
+/* $Id: xp_ssl.c,v 1.36 2008/04/04 12:49:57 jorton Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -727,7 +727,7 @@
case PHP_STREAM_AS_FD_FOR_SELECT:
if (ret) {
- *ret = (void*)sslsock->s.socket;
+ *(int *)ret = sslsock->s.socket;
}
return SUCCESS;
@@ -737,7 +737,7 @@
return FAILURE;
}
if (ret) {
- *ret = (void*)sslsock->s.socket;
+ *(int *)ret = sslsock->s.socket;
}
return SUCCESS;
default:
--
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 /main php_compat.h
jorton Wed Feb 1 13:52:46 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/main php_compat.h /php-srcNEWS Log: MFH: - Fixed bug #36208 (symbol namespace conflicts using bundled gd). (Jakub Moc) http://cvs.php.net/viewcvs.cgi/php-src/main/php_compat.h?r1=1.25.2.1&r2=1.25.2.2&diff_format=u Index: php-src/main/php_compat.h diff -u php-src/main/php_compat.h:1.25.2.1 php-src/main/php_compat.h:1.25.2.2 --- php-src/main/php_compat.h:1.25.2.1 Sun Jan 1 12:50:17 2006 +++ php-src/main/php_compat.h Wed Feb 1 13:52:46 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_compat.h,v 1.25.2.1 2006/01/01 12:50:17 sniper Exp $ */ +/* $Id: php_compat.h,v 1.25.2.2 2006/02/01 13:52:46 jorton Exp $ */ #ifndef PHP_COMPAT_H #define PHP_COMPAT_H @@ -319,6 +319,12 @@ #define term_source php_gd_term_source #define writewbmp php_gd_writewbmp #define ZeroDataBlock php_gd_ZeroDataBlock +#define gdCacheCreate php_gd_gdCacheCreate +#define gdCacheDelete php_gd_gdCacheDelete +#define gdCacheGet php_gd_gdCacheGet +#define gdFontCacheSetup php_gd_gdFontCacheSetup +#define gdFontCacheShutdown php_gd_gdFontCacheShutdown +#define gdFreeFontCache php_gd_gdFreeFontCache #endif /* HAVE_GD_BUNDLED */ /* Define to specify how much context to retain around the current parse http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.389&r2=1.2027.2.390&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.389 php-src/NEWS:1.2027.2.390 --- php-src/NEWS:1.2027.2.389 Wed Feb 1 10:31:57 2006 +++ php-src/NEWSWed Feb 1 13:52:46 2006 @@ -24,6 +24,7 @@ - Fixed bug #36224 (date(DATE_ATOM) gives wrong results). (Derick, Hannes Magnusson) - Fixed bug #36222 (errorInfo in PDOException is always NULL). (Ilia) +- Fixed bug #36208 (symbol namespace conflicts using bundled gd). (Jakub Moc) - Fixed bug #36185 (str_rot13(NULL) crash). (Pierre) - Fixed bug #36176 (PDO_PGSQL - PDO::exec() does not return number of rows affected by the operation). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_compat.h
jorton Wed Feb 1 13:10:04 2006 UTC Modified files: /php-src/main php_compat.h Log: Fixed bug #36208 (symbol namespace conflicts using bundled gd). (Jakub Moc) http://cvs.php.net/viewcvs.cgi/php-src/main/php_compat.h?r1=1.26&r2=1.27&diff_format=u Index: php-src/main/php_compat.h diff -u php-src/main/php_compat.h:1.26 php-src/main/php_compat.h:1.27 --- php-src/main/php_compat.h:1.26 Sun Jan 1 13:09:57 2006 +++ php-src/main/php_compat.h Wed Feb 1 13:10:04 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_compat.h,v 1.26 2006/01/01 13:09:57 sniper Exp $ */ +/* $Id: php_compat.h,v 1.27 2006/02/01 13:10:04 jorton Exp $ */ #ifndef PHP_COMPAT_H #define PHP_COMPAT_H @@ -319,6 +319,12 @@ #define term_source php_gd_term_source #define writewbmp php_gd_writewbmp #define ZeroDataBlock php_gd_ZeroDataBlock +#define gdCacheCreate php_gd_gdCacheCreate +#define gdCacheDelete php_gd_gdCacheDelete +#define gdCacheGet php_gd_gdCacheGet +#define gdFontCacheSetup php_gd_gdFontCacheSetup +#define gdFontCacheShutdown php_gd_gdFontCacheShutdown +#define gdFreeFontCache php_gd_gdFreeFontCache #endif /* HAVE_GD_BUNDLED */ /* Define to specify how much context to retain around the current parse -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pdo php_pdo_driver.h /ext/pdo_mysql mysql_driver.c mysql_statement.c /ext/pdo_pgsql pgsql_driver.c pgsql_statement.c
On Thu, May 19, 2005 at 03:17:20PM +0200, Marcus Boerger wrote: > Hello Ilia, > > gcc is becoming worse and worse. They completeley fuck up the c language. > We should disallow gcc 4. Both 3.4 and 4 are doing some things just wrong. M, nice tasty FUD, guys. Trailing comma in enum is a C99 extension to the C language - if you care about pre-C99 compilers you shouldn't use it. IIRC some versions of the Tru64 cc reject it, for example. Furthermore, I'm pretty sure GCC only warns about it if you use -pedantic, i.e. when you explicitly ask it to issue warnings about non-standard language construct. I bet that's in your CFLAGS somewhere, Ilia? > Thursday, May 19, 2005, 3:13:28 PM, you wrote: > > > Welcome to the GCC 4.0 world, in GCC 3.4 those only appear if you > > enabled pedantic flag, but in GCC 4.0 they appear as regular warning > > messages. > > > Ilia > > > > -- > Best regards, > Marcusmailto:[EMAIL PROTECTED] > > -- > 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_0) /ext/standard html.c
jorton Wed May 11 10:58:35 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard html.c
Log:
MFH: - Fixed bug #29119 (html_decode_entities handling of U+0152-U+0192 range)
(merge error from 4.3)
MFH: Mark pointers in entity tables as const.
http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.97.2.9&r2=1.97.2.10&ty=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.97.2.9
php-src/ext/standard/html.c:1.97.2.10
--- php-src/ext/standard/html.c:1.97.2.9Sun May 1 15:49:40 2005
+++ php-src/ext/standard/html.c Wed May 11 10:58:34 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: html.c,v 1.97.2.9 2005/05/01 19:49:40 iliaa Exp $ */
+/* $Id: html.c,v 1.97.2.10 2005/05/11 14:58:34 jorton Exp $ */
/*
* HTML entity resources:
@@ -58,7 +58,7 @@
cs_big5hkscs, cs_sjis, cs_eucjp,
cs_koi8r,
cs_cp1251, cs_8859_5, cs_cp866,
cs_macroman
};
-typedef const char *entity_table_t;
+typedef const char *const entity_table_t;
/* codepage 1252 is a Windows extension to iso-8859-1. */
static entity_table_t ent_cp_1252[] = {
@@ -113,11 +113,11 @@
"Scaron", "scaron", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- /* 376 (0x0178)
+ /* 376 (0x0178) */
"Yuml", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, */
- /* 400 (0x0192)*/
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ /* 400 (0x0190) */
NULL, NULL, "fnof"
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard html.c
jorton Wed May 11 08:54:32 2005 EDT
Modified files:
/php-src/ext/standard html.c
Log:
Mark pointers in entity tables as const.
http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.108&r2=1.109&ty=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.108 php-src/ext/standard/html.c:1.109
--- php-src/ext/standard/html.c:1.108 Wed May 11 08:43:07 2005
+++ php-src/ext/standard/html.c Wed May 11 08:54:29 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: html.c,v 1.108 2005/05/11 12:43:07 jorton Exp $ */
+/* $Id: html.c,v 1.109 2005/05/11 12:54:29 jorton Exp $ */
/*
* HTML entity resources:
@@ -60,7 +60,7 @@
cs_big5hkscs, cs_sjis, cs_eucjp,
cs_koi8r,
cs_cp1251, cs_8859_5, cs_cp866,
cs_macroman
};
-typedef const char *entity_table_t;
+typedef const char *const entity_table_t;
/* codepage 1252 is a Windows extension to iso-8859-1. */
static entity_table_t ent_cp_1252[] = {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard html.c
jorton Wed May 11 08:43:10 2005 EDT Modified files: /php-src/ext/standard html.c Log: - Fixed bug #29119 (html_decode_entities handling of U+0152-U+0192 range) (merge error from 4.3) http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.107&r2=1.108&ty=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.107 php-src/ext/standard/html.c:1.108 --- php-src/ext/standard/html.c:1.107 Sun May 1 15:48:55 2005 +++ php-src/ext/standard/html.c Wed May 11 08:43:07 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: html.c,v 1.107 2005/05/01 19:48:55 iliaa Exp $ */ +/* $Id: html.c,v 1.108 2005/05/11 12:43:07 jorton Exp $ */ /* * HTML entity resources: @@ -115,11 +115,11 @@ "Scaron", "scaron", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - /* 376 (0x0178) + /* 376 (0x0178) */ "Yuml", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, */ - /* 400 (0x0190)*/ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + /* 400 (0x0190) */ NULL, NULL, "fnof" }; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /sapi/cgi cgi_main.c
On Thu, Apr 28, 2005 at 01:14:26PM -, Jani Taskinen wrote:
> @@ -482,9 +482,14 @@
> static void sapi_cgi_log_message(char *message)
> {
> #if PHP_FASTCGI
> + int logging = 1;
> TSRMLS_FETCH();
>
> - if (!FCGX_IsCGI()) {
> + if (cfg_get_long("fastcgi.logging", &logging) == FAILURE) {
> + logging = 1;
> + }
long != int and the initialization is unnecessary too, I think?
joe
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/xmlrpc/libxmlrpc xml_element.c
jorton Fri Apr 22 07:57:53 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/xmlrpc/libxmlrpc xml_element.c
Log:
MFH: Fixed bug #32797 (invalid C code in xmlrpc extension).
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.3.4.3&r2=1.3.4.4&ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.3.4.3
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.3.4.4
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.3.4.3 Tue Jun 1 16:16:18 2004
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c Fri Apr 22 07:57:53 2005
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.3.4.3 2004/06/01
20:16:18 iliaa Exp $";
+static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.3.4.4 2005/04/22
11:57:53 jorton Exp $";
@@ -44,6 +44,9 @@
* 06/2000
* HISTORY
* $Log: xml_element.c,v $
+ * Revision 1.3.4.4 2005/04/22 11:57:53 jorton
+ * MFH: Fixed bug #32797 (invalid C code in xmlrpc extension).
+ *
* Revision 1.3.4.3 2004/06/01 20:16:18 iliaa
* MFH: Fixed bug #28597 (xmlrpc_encode_request() incorrectly encodes chars
in
* 200-210 range).
@@ -112,7 +115,7 @@
#include "expat.h"
#include "encodings.h"
-#define my_free(thing) if(thing) {free(thing); thing = 0;}
+#define my_free(thing) if(thing) {free(thing); thing = NULL;}
#define XML_DECL_START "children);
Q_Destroy(&root->attrs);
- my_free((char*)root->name);
+ if(root->name) {
+ free((char *)root->name);
+ root->name = NULL;
+ }
simplestring_free(&root->text);
my_free(root);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/xmlrpc/libxmlrpc xml_element.c
jorton Fri Apr 22 07:54:18 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/xmlrpc/libxmlrpc xml_element.c
Log:
MFH: Fixed bug #32797 (invalid C code in xmlrpc extension).
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.6&r2=1.6.2.1&ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.6
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.6.2.1
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.6 Tue Jun 1 16:16:06 2004
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c Fri Apr 22 07:54:17 2005
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.6 2004/06/01 20:16:06
iliaa Exp $";
+static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.6.2.1 2005/04/22
11:54:17 jorton Exp $";
@@ -44,6 +44,9 @@
* 06/2000
* HISTORY
* $Log: xml_element.c,v $
+ * Revision 1.6.2.1 2005/04/22 11:54:17 jorton
+ * MFH: Fixed bug #32797 (invalid C code in xmlrpc extension).
+ *
* Revision 1.6 2004/06/01 20:16:06 iliaa
* Fixed bug #28597 (xmlrpc_encode_request() incorrectly encodes chars in
* 200-210 range).
@@ -113,7 +116,7 @@
#include "expat.h"
#include "encodings.h"
-#define my_free(thing) if(thing) {free(thing); thing = 0;}
+#define my_free(thing) if(thing) {free(thing); thing = NULL;}
#define XML_DECL_START "children);
Q_Destroy(&root->attrs);
- my_free((char*)root->name);
+ if(root->name) {
+ free((char *)root->name);
+ root->name = NULL;
+ }
simplestring_free(&root->text);
my_free(root);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_element.c
jorton Fri Apr 22 07:06:55 2005 EDT
Modified files:
/php-src/ext/xmlrpc/libxmlrpc xml_element.c
Log:
Fixed bug #32797 (invalid C code in xmlrpc extension).
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.8
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.9
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.8 Sun Mar 27 19:07:24 2005
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c Fri Apr 22 07:06:53 2005
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.8 2005/03/28 00:07:24
edink Exp $";
+static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.9 2005/04/22 11:06:53
jorton Exp $";
@@ -44,6 +44,9 @@
* 06/2000
* HISTORY
* $Log: xml_element.c,v $
+ * Revision 1.9 2005/04/22 11:06:53 jorton
+ * Fixed bug #32797 (invalid C code in xmlrpc extension).
+ *
* Revision 1.8 2005/03/28 00:07:24 edink
* Reshufle includes to make it compile on windows
*
@@ -119,7 +122,7 @@
#include "queue.h"
#include "encodings.h"
-#define my_free(thing) if(thing) {free(thing); thing = 0;}
+#define my_free(thing) if(thing) {free(thing); thing = NULL;}
#define XML_DECL_START "children);
Q_Destroy(&root->attrs);
- my_free((char*)root->name);
+ if(root->name) {
+ free((char *)root->name);
+ root->name = NULL;
+ }
simplestring_free(&root->text);
my_free(root);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mssql config.m4
jorton Fri Apr 1 06:12:50 2005 EDT Modified files: /php-src/ext/mssql config.m4 Log: Use PHP_LIBDIR. http://cvs.php.net/diff.php/php-src/ext/mssql/config.m4?r1=1.7&r2=1.8&ty=u Index: php-src/ext/mssql/config.m4 diff -u php-src/ext/mssql/config.m4:1.7 php-src/ext/mssql/config.m4:1.8 --- php-src/ext/mssql/config.m4:1.7 Wed Dec 8 13:57:48 2004 +++ php-src/ext/mssql/config.m4 Fri Apr 1 06:12:45 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.7 2004/12/08 18:57:48 fmk Exp $ +dnl $Id: config.m4,v 1.8 2005/04/01 11:12:45 jorton Exp $ dnl PHP_ARG_WITH(mssql,for MSSQL support via FreeTDS, @@ -32,12 +32,12 @@ fi fi - if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then - AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so]) + if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then + AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so]) fi MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include - MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib + MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR PHP_ADD_INCLUDE($MSSQL_INCDIR) PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mysqli mysqli_prop.c
jorton Wed Mar 30 08:52:39 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli_prop.c
Log:
MFH: Mark private functions as static.
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.14.2.5&r2=1.14.2.6&ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.14.2.5
php-src/ext/mysqli/mysqli_prop.c:1.14.2.6
--- php-src/ext/mysqli/mysqli_prop.c:1.14.2.5 Fri Jan 28 12:37:42 2005
+++ php-src/ext/mysqli/mysqli_prop.cWed Mar 30 08:52:39 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_prop.c,v 1.14.2.5 2005/01/28 17:37:42 georg Exp $
+ $Id: mysqli_prop.c,v 1.14.2.6 2005/03/30 13:52:39 jorton Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -57,7 +57,7 @@
p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->stmt
#define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type,
__ret_type)\
-int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
+static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
{\
__ret_type l;\
__get_type;\
@@ -77,7 +77,7 @@
}
#define MYSQLI_MAP_PROPERTY_FUNC_STRING(__func, __int_func, __get_type)\
-int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
+static int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
{\
char *c;\
__get_type;\
@@ -95,7 +95,7 @@
}
/* {{{ property link_client_version_read */
-int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_client_version_read(mysqli_object *obj, zval **retval
TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_LONG(*retval, MYSQL_VERSION_ID);
@@ -104,7 +104,7 @@
/* }}} */
/* {{{ property link_client_info_read */
-int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
@@ -113,7 +113,7 @@
/* }}} */
/* {{{ property link_connect_errno_read */
-int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_LONG(*retval, (long)MyG(error_no));
@@ -122,7 +122,7 @@
/* }}} */
/* {{{ property link_connect_error_read */
-int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_STRING(*retval, MyG(error_msg), 1);
@@ -131,7 +131,7 @@
/* }}} */
/* {{{ property link_affected_rows_read */
-int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MY_MYSQL *mysql;
my_ulonglong rc;
@@ -175,7 +175,7 @@
/* result properties */
/* {{{ property result_type_read */
-int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MYSQL_RES *p;
@@ -194,7 +194,7 @@
/* }}} */
/* {{{ property result_lengths_read */
-int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MYSQL_RES *p;
@@ -229,7 +229,7 @@
/* statement properties */
/* {{{ property stmt_id_read */
-int stmt_id_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int stmt_id_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MY_STMT *p;
@@ -248,7 +248,7 @@
/* }}} */
/* {{{ property stmt_affected_rows_read */
-int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MY_STMT *stmt;
my_ulonglong rc;
--
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_driver.c mysqli_prop.c
jorton Wed Mar 30 08:43:37 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_driver.c mysqli_prop.c
Log:
Mark more private functions as static.
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_driver.c?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/mysqli/mysqli_driver.c
diff -u php-src/ext/mysqli/mysqli_driver.c:1.2
php-src/ext/mysqli/mysqli_driver.c:1.3
--- php-src/ext/mysqli/mysqli_driver.c:1.2 Sun Jan 16 14:28:55 2005
+++ php-src/ext/mysqli/mysqli_driver.c Wed Mar 30 08:43:36 2005
@@ -30,7 +30,7 @@
#define MAP_PROPERTY_MYG_BOOL_READ(name, value) \
-int name(mysqli_object *obj, zval **retval TSRMLS_DC) \
+static int name(mysqli_object *obj, zval **retval TSRMLS_DC) \
{ \
ALLOC_ZVAL(*retval); \
ZVAL_BOOL(*retval, MyG(value)); \
@@ -38,14 +38,14 @@
} \
#define MAP_PROPERTY_MYG_BOOL_WRITE(name, value) \
-int name(mysqli_object *obj, zval *value TSRMLS_DC) \
+static int name(mysqli_object *obj, zval *value TSRMLS_DC) \
{ \
MyG(value) = Z_LVAL_P(value) > 0; \
return SUCCESS; \
} \
#define MAP_PROPERTY_MYG_LONG_READ(name, value) \
-int name(mysqli_object *obj, zval **retval TSRMLS_DC) \
+static int name(mysqli_object *obj, zval **retval TSRMLS_DC) \
{ \
ALLOC_ZVAL(*retval); \
ZVAL_LONG(*retval, MyG(value)); \
@@ -53,14 +53,14 @@
} \
#define MAP_PROPERTY_MYG_LONG_WRITE(name, value) \
-int name(mysqli_object *obj, zval *value TSRMLS_DC) \
+static int name(mysqli_object *obj, zval *value TSRMLS_DC) \
{ \
MyG(value) = Z_LVAL_P(value); \
return SUCCESS; \
} \
#define MAP_PROPERTY_MYG_STRING_READ(name, value) \
-int name(mysqli_object *obj, zval **retval TSRMLS_DC) \
+static int name(mysqli_object *obj, zval **retval TSRMLS_DC) \
{ \
ALLOC_ZVAL(*retval); \
ZVAL_STRING(*retval, MyG(value), 1); \
@@ -68,14 +68,14 @@
} \
#define MAP_PROPERTY_MYG_STRING_WRITE(name, value) \
-int name(mysqli_object *obj, zval *value TSRMLS_DC) \
+static int name(mysqli_object *obj, zval *value TSRMLS_DC) \
{ \
MyG(value) = Z_STRVAL_P(value); \
return SUCCESS; \
} \
/* {{{ property driver_report_write */
-int driver_report_write(mysqli_object *obj, zval *value TSRMLS_DC)
+static int driver_report_write(mysqli_object *obj, zval *value TSRMLS_DC)
{
MyG(report_mode) = Z_LVAL_P(value);
php_set_error_handling(MyG(report_mode) & MYSQLI_REPORT_STRICT ?
EH_THROW : EH_NORMAL,
@@ -85,7 +85,7 @@
/* }}} */
/* {{{ property driver_embedded_read */
-int driver_embedded_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int driver_embedded_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
#ifdef HAVE_EMBEDDED_MYSQLI
@@ -98,7 +98,7 @@
/* }}} */
/* {{{ property driver_client_version_read */
-int driver_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int driver_client_version_read(mysqli_object *obj, zval **retval
TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_LONG(*retval, MYSQL_VERSION_ID);
@@ -107,7 +107,7 @@
/* }}} */
/* {{{ property driver_client_info_read */
-int driver_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int driver_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
@@ -116,7 +116,7 @@
/* }}} */
/* {{{ property driver_driver_version_read */
-int driver_driver_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int driver_driver_version_read(mysqli_object *obj, zval **retval
TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_LONG(*retval, MYSQLI_VERSION_ID);
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.21&r2=1.22&ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.21
php-src/ext/mysqli/mysqli_prop.c:1.22
--- php-src/ext/mysqli/mysqli_prop.c:1.21 Wed Mar 30 07:56:58 2005
+++ php-src/ext/mysqli/mysqli_prop.cWed Mar 30 08:43:36 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_prop.c,v 1.21 2005/03/30 12:56:58 jorton Exp $
+ $Id: mysqli_prop.c,v 1.22 2005/03/30 13:43:36 jorton Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -129,7 +129,7 @@
/* }}} */
/* {{{ property link_affected_rows_read */
-int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MY_MYSQL *mysql;
my_ulonglong rc;
@@ -225,7 +225,7 @@
/* statement properties */
/* {{{ property stmt_id_read */
-int stmt_id_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int stmt_id_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MY_STMT *p;
@@ -244,7 +244,7 @@
/* }}} */
/* {{{ property stmt_affected_rows_read */
-int stmt
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_prop.c
jorton Wed Mar 30 07:56:59 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_prop.c
Log:
Mark private functions as static.
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.20&r2=1.21&ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.20
php-src/ext/mysqli/mysqli_prop.c:1.21
--- php-src/ext/mysqli/mysqli_prop.c:1.20 Fri Jan 28 12:35:37 2005
+++ php-src/ext/mysqli/mysqli_prop.cWed Mar 30 07:56:58 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_prop.c,v 1.20 2005/01/28 17:35:37 georg Exp $
+ $Id: mysqli_prop.c,v 1.21 2005/03/30 12:56:58 jorton Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -55,7 +55,7 @@
p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->stmt
#define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type,
__ret_type)\
-int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
+static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
{\
__ret_type l;\
__get_type;\
@@ -75,7 +75,7 @@
}
#define MYSQLI_MAP_PROPERTY_FUNC_STRING(__func, __int_func, __get_type)\
-int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
+static int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
{\
char *c;\
__get_type;\
@@ -93,7 +93,7 @@
}
/* {{{ property link_client_version_read */
-int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_client_version_read(mysqli_object *obj, zval **retval
TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_LONG(*retval, MYSQL_VERSION_ID);
@@ -102,7 +102,7 @@
/* }}} */
/* {{{ property link_client_info_read */
-int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
@@ -111,7 +111,7 @@
/* }}} */
/* {{{ property link_connect_errno_read */
-int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_LONG(*retval, (long)MyG(error_no));
@@ -120,7 +120,7 @@
/* }}} */
/* {{{ property link_connect_error_read */
-int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
ZVAL_STRING(*retval, MyG(error_msg), 1);
@@ -173,7 +173,7 @@
/* result properties */
/* {{{ property result_type_read */
-int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MYSQL_RES *p;
@@ -191,7 +191,7 @@
/* }}} */
/* {{{ property result_lengths_read */
-int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MYSQL_RES *p;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard html.c
jorton Thu Mar 10 06:40:03 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/standard html.c Log: MFH: fix /*-within-comment warning. http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.97.2.6&r2=1.97.2.7&ty=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.97.2.6 php-src/ext/standard/html.c:1.97.2.7 --- php-src/ext/standard/html.c:1.97.2.6Wed Mar 9 05:12:41 2005 +++ php-src/ext/standard/html.c Thu Mar 10 06:40:03 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: html.c,v 1.97.2.6 2005/03/09 10:12:41 derick Exp $ */ +/* $Id: html.c,v 1.97.2.7 2005/03/10 11:40:03 jorton Exp $ */ /* * HTML entity resources: @@ -118,7 +118,7 @@ /* 376 (0x0178) "Yuml", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, */ /* 400 (0x0190)*/ NULL, NULL, "fnof" }; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/apache2handler sapi_apache2.c
jorton Thu Mar 10 06:39:04 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH: - Fixed bug #31717: Reject PATH_INFO if "AcceptPathInfo off" is used.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.38&r2=1.1.2.39&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.38
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.39
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.38 Mon Jan 17 07:36:44 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Mar 10 06:39:04 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.38 2005/01/17 12:36:44 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.39 2005/03/10 11:39:04 jorton Exp $ */
#include
@@ -471,6 +471,16 @@
}
}
+ /* Give a 404 if PATH_INFO is used but is explicitly disabled in
+* the configuration; default behaviour is to accept. */
+ if (r->used_path_info == AP_REQ_REJECT_PATH_INFO
+ && r->path_info && r->path_info[0]) {
+ zend_try {
+ zend_ini_deactivate(TSRMLS_C);
+ } zend_end_try();
+ return HTTP_NOT_FOUND;
+ }
+
/* handle situations where user turns the engine off */
if (!AP2(engine)) {
zend_try {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/apache2handler sapi_apache2.c
jorton Thu Mar 10 06:23:58 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH: - Fixed bug #31717: Reject PATH_INFO if "AcceptPathInfo off" is used.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.6&r2=1.40.2.7&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.6
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.7
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.6 Mon Jan 17 07:35:28 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Mar 10 06:23:57 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.40.2.6 2005/01/17 12:35:28 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.7 2005/03/10 11:23:57 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -466,6 +466,16 @@
}
}
+ /* Give a 404 if PATH_INFO is used but is explicitly disabled in
+* the configuration; default behaviour is to accept. */
+ if (r->used_path_info == AP_REQ_REJECT_PATH_INFO
+ && r->path_info && r->path_info[0]) {
+ zend_try {
+ zend_ini_deactivate(TSRMLS_C);
+ } zend_end_try();
+ return HTTP_NOT_FOUND;
+ }
+
/* handle situations where user turns the engine off */
if (!AP2(engine)) {
zend_try {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard html.c
jorton Thu Mar 10 06:19:32 2005 EDT Modified files: /php-src/ext/standard html.c Log: Fix /*-within-comment warning from GCC. http://cvs.php.net/diff.php/php-src/ext/standard/html.c?r1=1.105&r2=1.106&ty=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.105 php-src/ext/standard/html.c:1.106 --- php-src/ext/standard/html.c:1.105 Wed Mar 9 05:13:05 2005 +++ php-src/ext/standard/html.c Thu Mar 10 06:19:32 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: html.c,v 1.105 2005/03/09 10:13:05 derick Exp $ */ +/* $Id: html.c,v 1.106 2005/03/10 11:19:32 jorton Exp $ */ /* * HTML entity resources: @@ -118,7 +118,7 @@ /* 376 (0x0178) "Yuml", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, */ /* 400 (0x0190)*/ NULL, NULL, "fnof" }; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c
jorton Thu Mar 10 06:09:32 2005 EDT
Modified files:
/php-src/sapi/apache2handlersapi_apache2.c
Log:
- Fixed bug #31717: Reject PATH_INFO if "AcceptPathInfo off" is used.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.51&r2=1.52&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.51
php-src/sapi/apache2handler/sapi_apache2.c:1.52
--- php-src/sapi/apache2handler/sapi_apache2.c:1.51 Mon Jan 17 07:24:40 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Mar 10 06:09:32 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.51 2005/01/17 12:24:40 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.52 2005/03/10 11:09:32 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -472,6 +472,16 @@
}
}
+ /* Give a 404 if PATH_INFO is used but is explicitly disabled in
+* the configuration; default behaviour is to accept. */
+ if (r->used_path_info == AP_REQ_REJECT_PATH_INFO
+ && r->path_info && r->path_info[0]) {
+ zend_try {
+ zend_ini_deactivate(TSRMLS_C);
+ } zend_end_try();
+ return HTTP_NOT_FOUND;
+ }
+
/* handle situations where user turns the engine off */
if (!AP2(engine)) {
zend_try {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c
jorton Mon Feb 28 08:30:53 2005 EDT
Modified files:
/php-src/ext/pdopdo_dbh.c
Log:
Fix type mismatch.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.64&r2=1.65&ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.64 php-src/ext/pdo/pdo_dbh.c:1.65
--- php-src/ext/pdo/pdo_dbh.c:1.64 Sat Feb 26 12:27:51 2005
+++ php-src/ext/pdo/pdo_dbh.c Mon Feb 28 08:30:50 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.64 2005/02/26 17:27:51 wez Exp $ */
+/* $Id: pdo_dbh.c,v 1.65 2005/02/28 13:30:50 jorton Exp $ */
/* The PDO Database Handle Class */
@@ -889,7 +889,7 @@
int str_len;
long paramtype = PDO_PARAM_STR;
char *qstr;
- size_t qlen;
+ int qlen;
if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s|l", &str, &str_len,
¶mtype)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite/sqlite/src .cvsignore
jorton Wed Feb 23 06:14:28 2005 EDT Modified files: /php-src/ext/pdo_sqlite/sqlite/src .cvsignore Log: Ignore generated files. http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite/src/.cvsignore?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo_sqlite/sqlite/src/.cvsignore diff -u php-src/ext/pdo_sqlite/sqlite/src/.cvsignore:1.1 php-src/ext/pdo_sqlite/sqlite/src/.cvsignore:1.2 --- php-src/ext/pdo_sqlite/sqlite/src/.cvsignore:1.1Wed Feb 16 23:23:15 2005 +++ php-src/ext/pdo_sqlite/sqlite/src/.cvsignoreWed Feb 23 06:14:28 2005 @@ -1 +1,4 @@ +*.lo config.h +*.gcda +*.gcno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml compat.c
jorton Thu Feb 17 10:05:18 2005 EDT
Modified files:
/php-src/ext/xmlcompat.c
Log:
Declare error_mapping array as static and more const.
http://cvs.php.net/diff.php/php-src/ext/xml/compat.c?r1=1.39&r2=1.40&ty=u
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.39 php-src/ext/xml/compat.c:1.40
--- php-src/ext/xml/compat.c:1.39 Fri Dec 17 07:20:50 2004
+++ php-src/ext/xml/compat.cThu Feb 17 10:05:16 2005
@@ -497,7 +497,7 @@
return parser->parser->errNo;
}
-const XML_Char *error_mapping[] = {
+static const XML_Char *const error_mapping[] = {
"No error",
"Internal error",
"No memory",
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/apache2handler php_functions.c
jorton Mon Jan 24 06:48:36 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/apache2handlerphp_functions.c
Log:
MFH: Fixed regression #31645 - only flush before running the subrequest.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/php_functions.c?r1=1.1.2.11&r2=1.1.2.12&ty=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.1.2.11
php-src/sapi/apache2handler/php_functions.c:1.1.2.12
--- php-src/sapi/apache2handler/php_functions.c:1.1.2.11Tue Jan 11
09:09:56 2005
+++ php-src/sapi/apache2handler/php_functions.c Mon Jan 24 06:48:35 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_functions.c,v 1.1.2.11 2005/01/11 14:09:56 jorton Exp $ */
+/* $Id: php_functions.c,v 1.1.2.12 2005/01/24 11:48:35 jorton Exp $ */
#include "php.h"
#include "ext/standard/php_smart_str.h"
@@ -64,10 +64,6 @@
ctx = SG(server_context);
- /* Ensure that the ap_r* layer is flushed, to work around 2.0 bug:
-* http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */
- ap_rflush(ctx->r);
-
return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters);
}
@@ -100,6 +96,10 @@
php_end_ob_buffers(1 TSRMLS_CC);
php_header();
+ /* Ensure that the ap_r* layer for the main request is flushed, to
+* work around http://issues.apache.org/bugzilla/show_bug.cgi?id=17629
*/
+ ap_rflush(rr->main);
+
if (ap_run_sub_req(rr)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include
'%s' - request execution failed", Z_STRVAL_PP(filename));
ap_destroy_sub_req(rr);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/apache2handler php_functions.c
jorton Mon Jan 24 06:47:00 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/apache2handlerphp_functions.c
Log:
MFH: Fixed regression #31645 - only flush before running the subrequest.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/php_functions.c?r1=1.13.2.1&r2=1.13.2.2&ty=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.13.2.1
php-src/sapi/apache2handler/php_functions.c:1.13.2.2
--- php-src/sapi/apache2handler/php_functions.c:1.13.2.1Tue Jan 11
09:07:27 2005
+++ php-src/sapi/apache2handler/php_functions.c Mon Jan 24 06:46:59 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_functions.c,v 1.13.2.1 2005/01/11 14:07:27 jorton Exp $ */
+/* $Id: php_functions.c,v 1.13.2.2 2005/01/24 11:46:59 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -66,10 +66,6 @@
ctx = SG(server_context);
- /* Ensure that the ap_r* layer is flushed, to work around 2.0 bug:
-* http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */
- ap_rflush(ctx->r);
-
return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters);
}
@@ -102,6 +98,10 @@
php_end_ob_buffers(1 TSRMLS_CC);
php_header(TSRMLS_C);
+ /* Ensure that the ap_r* layer for the main request is flushed, to
+* work around http://issues.apache.org/bugzilla/show_bug.cgi?id=17629
*/
+ ap_rflush(rr->main);
+
if (ap_run_sub_req(rr)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include
'%s' - request execution failed", Z_STRVAL_PP(filename));
ap_destroy_sub_req(rr);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler php_functions.c
jorton Mon Jan 24 06:44:57 2005 EDT
Modified files:
/php-src/sapi/apache2handlerphp_functions.c
Log:
Fixed regression #31645 - only flush before running the subrequest.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/php_functions.c?r1=1.16&r2=1.17&ty=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.16
php-src/sapi/apache2handler/php_functions.c:1.17
--- php-src/sapi/apache2handler/php_functions.c:1.16Tue Jan 11 09:01:32 2005
+++ php-src/sapi/apache2handler/php_functions.c Mon Jan 24 06:44:56 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_functions.c,v 1.16 2005/01/11 14:01:32 jorton Exp $ */
+/* $Id: php_functions.c,v 1.17 2005/01/24 11:44:56 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -66,10 +66,6 @@
ctx = SG(server_context);
- /* Ensure that the ap_r* layer is flushed, to work around 2.0 bug:
-* http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */
- ap_rflush(ctx->r);
-
return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters);
}
@@ -102,6 +98,10 @@
php_end_ob_buffers(1 TSRMLS_CC);
php_header(TSRMLS_C);
+ /* Ensure that the ap_r* layer for the main request is flushed, to
+* work around http://issues.apache.org/bugzilla/show_bug.cgi?id=17629
*/
+ ap_rflush(rr->main);
+
if (ap_run_sub_req(rr)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include
'%s' - request execution failed", Z_STRVAL_PP(filename));
ap_destroy_sub_req(rr);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/apache2handler sapi_apache2.c
jorton Mon Jan 17 07:36:44 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH - Fixed bug #31519: Set r->status_line to SAPI-provided status-line.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.37&r2=1.1.2.38&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.37
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.38
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.37 Thu Dec 16 07:36:43 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jan 17 07:36:44 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.37 2004/12/16 12:36:43 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.38 2005/01/17 12:36:44 jorton Exp $ */
#include
@@ -119,9 +119,17 @@
php_apache_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
php_struct *ctx = SG(server_context);
+ const char *sline = SG(sapi_headers).http_status_line;
ctx->r->status = SG(sapi_headers).http_response_code;
+ /* httpd requires that r->status_line is set to the first digit of
+* the status-code: */
+ if (sline && strlen(sline) > 12 && strncmp(sline, "HTTP/1.", 7) == 0
+ && sline[8] == ' ') {
+ ctx->r->status_line = apr_pstrdup(ctx->r->pool, sline + 9);
+ }
+
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/apache2handler sapi_apache2.c
jorton Mon Jan 17 07:35:29 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH - Fixed bug #31519: Set r->status_line to SAPI-provided status-line.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.5&r2=1.40.2.6&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.5
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.6
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.5 Thu Dec 16 07:35:43 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jan 17 07:35:28 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.40.2.5 2004/12/16 12:35:43 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.6 2005/01/17 12:35:28 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -121,9 +121,17 @@
php_apache_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
php_struct *ctx = SG(server_context);
+ const char *sline = SG(sapi_headers).http_status_line;
ctx->r->status = SG(sapi_headers).http_response_code;
+ /* httpd requires that r->status_line is set to the first digit of
+* the status-code: */
+ if (sline && strlen(sline) > 12 && strncmp(sline, "HTTP/1.", 7) == 0
+ && sline[8] == ' ') {
+ ctx->r->status_line = apr_pstrdup(ctx->r->pool, sline + 9);
+ }
+
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c
jorton Mon Jan 17 07:24:41 2005 EDT
Modified files:
/php-src/sapi/apache2handlersapi_apache2.c
Log:
Fixed bug #31519: Set r->status_line to SAPI-provided status-line.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.50&r2=1.51&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.50
php-src/sapi/apache2handler/sapi_apache2.c:1.51
--- php-src/sapi/apache2handler/sapi_apache2.c:1.50 Thu Dec 16 07:34:32 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jan 17 07:24:40 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.50 2004/12/16 12:34:32 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.51 2005/01/17 12:24:40 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -121,9 +121,17 @@
php_apache_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
php_struct *ctx = SG(server_context);
+ const char *sline = SG(sapi_headers).http_status_line;
ctx->r->status = SG(sapi_headers).http_response_code;
+ /* httpd requires that r->status_line is set to the first digit of
+* the status-code: */
+ if (sline && strlen(sline) > 12 && strncmp(sline, "HTTP/1.", 7) == 0
+ && sline[8] == ' ') {
+ ctx->r->status_line = apr_pstrdup(ctx->r->pool, sline + 9);
+ }
+
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /sapi/apache2handler php_functions.c
On Tue, Jan 11, 2005 at 03:14:16PM +0100, Derick Rethans wrote: > On Tue, 11 Jan 2005, Joe Orton wrote: > > > jorton Tue Jan 11 09:01:32 2005 EDT > > > > Modified files: > > /php-src/sapi/apache2handlerphp_functions.c > > Log: > > Fixed bug #30446 - virtual() includes files out of sequence, > > work around 2.0 subrequest/internal redirect issue. > > > ctx = SG(server_context); > > + > > + /* Ensure that the ap_r* layer is flushed, to work around 2.0 bug: > > +* http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */ > > + ap_rflush(ctx->r); > > + > > return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters); > > } > > Why not fix the Apache bug instead? It feels a bit wrong adding > workarounds to PHP for bugs in other software. The two actions are not mutually exclusive; the fix will take longer, the workaround has negligible risk+impact. joe -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /sapi/apache2handler php_functions.c
jorton Tue Jan 11 09:09:57 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/sapi/apache2handlerphp_functions.c Log: MFH: Fixed bug #30446 - virtual() includes files out of sequence, work around 2.0 subrequest/internal redirect issue. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.797&r2=1.1247.2.798&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.797 php-src/NEWS:1.1247.2.798 --- php-src/NEWS:1.1247.2.797 Mon Jan 10 10:39:20 2005 +++ php-src/NEWSTue Jan 11 09:09:56 2005 @@ -23,6 +23,7 @@ y2k_compliance is On). (Ilia) - Fixed bug #31055 (apache2filter: per request leak proportional to the full path of the request URI). (kameshj at fastmail dot fm) +- Fixed bug #30446 (apache2handler: virtual() includes files out of sequence) - Fixed bug #28930 (PHP sources pick wrong header files generated by bison). (eggert at gnu dot org) - Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream). http://cvs.php.net/diff.php/php-src/sapi/apache2handler/php_functions.c?r1=1.1.2.10&r2=1.1.2.11&ty=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.1.2.10 php-src/sapi/apache2handler/php_functions.c:1.1.2.11 --- php-src/sapi/apache2handler/php_functions.c:1.1.2.10Tue Nov 11 15:04:19 2003 +++ php-src/sapi/apache2handler/php_functions.c Tue Jan 11 09:09:56 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_functions.c,v 1.1.2.10 2003/11/11 20:04:19 iliaa Exp $ */ +/* $Id: php_functions.c,v 1.1.2.11 2005/01/11 14:09:56 jorton Exp $ */ #include "php.h" #include "ext/standard/php_smart_str.h" @@ -63,6 +63,11 @@ } ctx = SG(server_context); + + /* Ensure that the ap_r* layer is flushed, to work around 2.0 bug: +* http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */ + ap_rflush(ctx->r); + return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /sapi/apache2handler php_functions.c
jorton Tue Jan 11 09:07:28 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS /php-src/sapi/apache2handlerphp_functions.c Log: MFH: Fixed bug #30446 - virtual() includes files out of sequence, work around 2.0 subrequest/internal redirect issue. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.182&r2=1.1760.2.183&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.182 php-src/NEWS:1.1760.2.183 --- php-src/NEWS:1.1760.2.182 Mon Jan 10 10:38:50 2005 +++ php-src/NEWSTue Jan 11 09:07:27 2005 @@ -24,6 +24,7 @@ y2k_compliance is On). (Ilia) - Fixed bug #31055 (apache2filter: per request leak proportional to the full path of the request URI). (kameshj at fastmail dot fm) +- Fixed bug #30446 (apache2handler: virtual() includes files out of sequence) - Fixed bug #28930 (PHP sources pick wrong header files generated by bison). (eggert at gnu dot org, Jani) - Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream). http://cvs.php.net/diff.php/php-src/sapi/apache2handler/php_functions.c?r1=1.13&r2=1.13.2.1&ty=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.13 php-src/sapi/apache2handler/php_functions.c:1.13.2.1 --- php-src/sapi/apache2handler/php_functions.c:1.13Thu Jan 8 03:18:05 2004 +++ php-src/sapi/apache2handler/php_functions.c Tue Jan 11 09:07:27 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_functions.c,v 1.13 2004/01/08 08:18:05 andi Exp $ */ +/* $Id: php_functions.c,v 1.13.2.1 2005/01/11 14:07:27 jorton Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -65,6 +65,11 @@ } ctx = SG(server_context); + + /* Ensure that the ap_r* layer is flushed, to work around 2.0 bug: +* http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */ + ap_rflush(ctx->r); + return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler php_functions.c
jorton Tue Jan 11 09:01:32 2005 EDT Modified files: /php-src/sapi/apache2handlerphp_functions.c Log: Fixed bug #30446 - virtual() includes files out of sequence, work around 2.0 subrequest/internal redirect issue. http://cvs.php.net/diff.php/php-src/sapi/apache2handler/php_functions.c?r1=1.15&r2=1.16&ty=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.15 php-src/sapi/apache2handler/php_functions.c:1.16 --- php-src/sapi/apache2handler/php_functions.c:1.15Sat Oct 23 09:48:05 2004 +++ php-src/sapi/apache2handler/php_functions.c Tue Jan 11 09:01:32 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_functions.c,v 1.15 2004/10/23 13:48:05 jorton Exp $ */ +/* $Id: php_functions.c,v 1.16 2005/01/11 14:01:32 jorton Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -65,6 +65,11 @@ } ctx = SG(server_context); + + /* Ensure that the ap_r* layer is flushed, to work around 2.0 bug: +* http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */ + ap_rflush(ctx->r); + return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring/libmbfl/filters mbfilter_htmlent.c
On Mon, Jan 10, 2005 at 12:52:15PM +0100, Derick Rethans wrote: > > jorton Mon Jan 10 06:26:56 2005 EDT > > > > Modified files: > > /php-src/ext/mbstring/libmbfl/filters mbfilter_htmlent.c > > Log: > > Don't scribble over the stack; icc compiler warning fix > > from [EMAIL PROTECTED] via Red Hat bugzilla #143795. > > You can't change this code, it's LGPL so it should be fixed in the > original library too otherwise we get into license problems :( I mailed the diff to Moriyoshi too, or is it prefered that there are *no* local changes made to the libmbfl in the PHP tree? Should I back it out? (I can't see what license problems there could be) joe -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mbstring/libmbfl/filters mbfilter_htmlent.c
jorton Mon Jan 10 06:30:01 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mbstring/libmbfl/filters mbfilter_htmlent.c
Log:
MFH: Don't scribble over the stack; icc compiler warning fix
from [EMAIL PROTECTED] via Red Hat bugzilla #143795.
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c?r1=1.5&r2=1.5.2.1&ty=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5
php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5.2.1
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5 Wed Feb 4
02:24:06 2004
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c Mon Jan 10
06:30:01 2005
@@ -120,7 +120,7 @@
}
{
- int *p = tmp + sizeof(tmp);
+ int *p = tmp + sizeof(tmp) / sizeof(tmp[0]);
CK((*filter->output_function)('#', filter->data));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/libmbfl/filters mbfilter_htmlent.c
jorton Mon Jan 10 06:26:56 2005 EDT
Modified files:
/php-src/ext/mbstring/libmbfl/filters mbfilter_htmlent.c
Log:
Don't scribble over the stack; icc compiler warning fix
from [EMAIL PROTECTED] via Red Hat bugzilla #143795.
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5
php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.6
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5 Wed Feb 4
02:24:06 2004
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c Mon Jan 10
06:26:56 2005
@@ -120,7 +120,7 @@
}
{
- int *p = tmp + sizeof(tmp);
+ int *p = tmp + sizeof(tmp) / sizeof(tmp[0]);
CK((*filter->output_function)('#', filter->data));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/curl curl.c
jorton Thu Jan 6 05:34:04 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/curl curl.c
Log:
MFH: - Fixed bug #31413 (curl POSTFIELDS crashes on 64-bit platforms).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.793&r2=1.1247.2.794&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.793 php-src/NEWS:1.1247.2.794
--- php-src/NEWS:1.1247.2.793 Tue Jan 4 01:53:42 2005
+++ php-src/NEWSThu Jan 6 05:34:02 2005
@@ -2,6 +2,7 @@
|||
?? ??? , Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
+- Fixed bug #31413 (curl POSTFIELDS crashes on 64-bit platforms). (Joe)
- Fixed bug #31396 (compile fails with gd 2.0.33 without freetype). (Jani)
- Fixed bug #31371 (highlight_file() trims new line after heredoc). (Ilia)
- Fixed bug #31270 (missing safe_mode/open_basedir check in swf_openfile()).
(Ilia)
http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.27&r2=1.124.2.28&ty=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.27 php-src/ext/curl/curl.c:1.124.2.28
--- php-src/ext/curl/curl.c:1.124.2.27 Sun Oct 31 23:56:10 2004
+++ php-src/ext/curl/curl.c Thu Jan 6 05:34:03 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: curl.c,v 1.124.2.27 2004/11/01 04:56:10 iliaa Exp $ */
+/* $Id: curl.c,v 1.124.2.28 2005/01/06 10:34:03 jorton Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -955,16 +955,16 @@
if (*postval == '@') {
error = curl_formadd(&first,
&last,
CURLFORM_COPYNAME, string_key,
-
CURLFORM_NAMELENGTH, string_key_len - 1,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_FILE, ++postval,
CURLFORM_END);
}
else {
error = curl_formadd(&first,
&last,
CURLFORM_COPYNAME, string_key,
-
CURLFORM_NAMELENGTH, string_key_len - 1,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_COPYCONTENTS, postval,
-
CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(current),
+
CURLFORM_CONTENTSLENGTH, (long)Z_STRLEN_PP(current),
CURLFORM_END);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/curl interface.c
jorton Thu Jan 6 05:21:09 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/curl interface.c
Log:
MFH: - Fixed bug #31413 (curl POSTFIELDS crashes on 64-bit platforms).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.178&r2=1.1760.2.179&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.178 php-src/NEWS:1.1760.2.179
--- php-src/NEWS:1.1760.2.178 Tue Jan 4 02:41:07 2005
+++ php-src/NEWSThu Jan 6 05:21:07 2005
@@ -4,6 +4,7 @@
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
- Added length and charsetnr for field array and object in mysqli. (Georg)
- Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values).
(Georg)
+- Fixed bug #31413 (curl POSTFIELDS crashes on 64-bit platforms). (Joe)
- Fixed bug #31396 (compile fails with gd 2.0.33 without freetype). (Jani)
- Fixed bug #31371 (highlight_file() trims new line after heredoc). (Ilia)
- Fixed bug #31361 (simplexml/domxml segfault when adding node twice). (Rob)
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.46.2.5&r2=1.46.2.6&ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.46.2.5
php-src/ext/curl/interface.c:1.46.2.6
--- php-src/ext/curl/interface.c:1.46.2.5 Sun Oct 31 23:52:51 2004
+++ php-src/ext/curl/interface.cThu Jan 6 05:21:09 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.46.2.5 2004/11/01 04:52:51 iliaa Exp $ */
+/* $Id: interface.c,v 1.46.2.6 2005/01/06 10:21:09 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1086,18 +1086,22 @@
zend_hash_get_current_key_ex(postfields, &string_key, &string_key_len,
&num_key, 0, NULL);
postval = Z_STRVAL_PP(current);
+
+ /* The arguments after _NAMELENGTH and
_CONTENTSLENGTH
+* must be explicitly cast to long in
curl_formadd
+* use since curl needs a long not an
int. */
if (*postval == '@') {
error = curl_formadd(&first,
&last,
CURLFORM_COPYNAME, string_key,
-
CURLFORM_NAMELENGTH, string_key_len - 1,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_FILE, ++postval,
CURLFORM_END);
} else {
error = curl_formadd(&first,
&last,
CURLFORM_COPYNAME, string_key,
-
CURLFORM_NAMELENGTH, string_key_len - 1,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_COPYCONTENTS, postval,
-
CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(current),
+
CURLFORM_CONTENTSLENGTH, (long)Z_STRLEN_PP(current),
CURLFORM_END);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/curl interface.c
On Wed, Jan 05, 2005 at 08:30:57PM -0800, Andi Gutmans wrote: > Isn't the compiler supposed to take care of that? curl_formadd takes a varargs array so the compiler is completely ignorant about what types should be used unfortunately :( joe -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
jorton Wed Jan 5 16:33:57 2005 EDT
Modified files:
/php-src/ext/curl interface.c
Log:
Fix #31413: curl POSTFIELDS usage on 64-bit platforms.
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.53&r2=1.54&ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.53 php-src/ext/curl/interface.c:1.54
--- php-src/ext/curl/interface.c:1.53 Thu Nov 18 11:35:04 2004
+++ php-src/ext/curl/interface.cWed Jan 5 16:33:56 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.53 2004/11/18 16:35:04 rrichards Exp $ */
+/* $Id: interface.c,v 1.54 2005/01/05 21:33:56 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1096,18 +1096,22 @@
zend_hash_get_current_key_ex(postfields, &string_key, &string_key_len,
&num_key, 0, NULL);
postval = Z_STRVAL_PP(current);
+
+ /* The arguments after _NAMELENGTH and
_CONTENTSLENGTH
+* must be explicitly cast to long in
curl_formadd
+* use since curl needs a long not an
int. */
if (*postval == '@') {
error = curl_formadd(&first,
&last,
CURLFORM_COPYNAME, string_key,
-
CURLFORM_NAMELENGTH, string_key_len - 1,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_FILE, ++postval,
CURLFORM_END);
} else {
error = curl_formadd(&first,
&last,
CURLFORM_COPYNAME, string_key,
-
CURLFORM_NAMELENGTH, string_key_len - 1,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_COPYCONTENTS, postval,
-
CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(current),
+
CURLFORM_CONTENTSLENGTH, (long)Z_STRLEN_PP(current),
CURLFORM_END);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.m4
jorton Mon Dec 13 05:30:22 2004 EDT Modified files: /php-src/ext/gd config.m4 Log: More PHP_LIBDIR fixes for lib64 platforms. http://cvs.php.net/diff.php/php-src/ext/gd/config.m4?r1=1.148&r2=1.149&ty=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.148 php-src/ext/gd/config.m4:1.149 --- php-src/ext/gd/config.m4:1.148 Wed Nov 3 09:32:49 2004 +++ php-src/ext/gd/config.m4Mon Dec 13 05:30:21 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.148 2004/11/03 14:32:49 jorton Exp $ +dnl $Id: config.m4,v 1.149 2004/12/13 10:30:21 jorton Exp $ dnl dnl @@ -220,7 +220,7 @@ ],[ AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ - -L$GD_T1_DIR/lib + -L$GD_T1_DIR/$PHP_LIBDIR ]) fi ]) @@ -363,7 +363,7 @@ done dnl Library path - for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do + for i in $PHP_LIBDIR/gd1.3 $PHP_LIBDIR/gd $PHP_LIBDIR gd1.3 gd ""; do test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / acinclude.m4
jorton Wed Dec 8 07:52:12 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcacinclude.m4 Log: MFH: Fix VPATH build again. http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.218.2.36&r2=1.218.2.37&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.218.2.36 php-src/acinclude.m4:1.218.2.37 --- php-src/acinclude.m4:1.218.2.36 Mon Dec 6 15:37:56 2004 +++ php-src/acinclude.m4Wed Dec 8 07:52:12 2004 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.218.2.36 2004/12/06 20:37:56 derick Exp $ +dnl $Id: acinclude.m4,v 1.218.2.37 2004/12/08 12:52:12 jorton Exp $ -*- autoconf -*- dnl dnl This file contains local autoconf functions. @@ -1699,6 +1699,10 @@ found_iconv=no unset ICONV_DIR + # Create the directories for a VPATH build: + test -d ext || mkdir ext + test -d ext/iconv || mkdir ext/iconv + echo > ext/iconv/php_have_libiconv.h echo > ext/iconv/php_have_iconv.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
jorton Wed Dec 8 07:50:00 2004 EDT Modified files: /php-srcacinclude.m4 Log: Fix VPATH build again. http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.277&r2=1.278&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.277 php-src/acinclude.m4:1.278 --- php-src/acinclude.m4:1.277 Mon Dec 6 15:39:20 2004 +++ php-src/acinclude.m4Wed Dec 8 07:50:00 2004 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.277 2004/12/06 20:39:20 derick Exp $ +dnl $Id: acinclude.m4,v 1.278 2004/12/08 12:50:00 jorton Exp $ dnl dnl This file contains local autoconf functions. @@ -1692,6 +1692,10 @@ found_iconv=no unset ICONV_DIR + # Create the directories for a VPATH build: + test -d ext || mkdir ext + test -d ext/iconv || mkdir ext/iconv + echo > ext/iconv/php_have_libiconv.h echo > ext/iconv/php_have_iconv.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_0) / acinclude.m4
jorton Wed Dec 8 07:55:34 2004 EDT Modified files: (Branch: PHP_5_0) /php-srcacinclude.m4 Log: MFH: Fix VPATH build again. http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271.2.1&r2=1.271.2.2&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.271.2.1 php-src/acinclude.m4:1.271.2.2 --- php-src/acinclude.m4:1.271.2.1 Mon Dec 6 15:38:55 2004 +++ php-src/acinclude.m4Wed Dec 8 07:55:33 2004 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.271.2.1 2004/12/06 20:38:55 derick Exp $ +dnl $Id: acinclude.m4,v 1.271.2.2 2004/12/08 12:55:33 jorton Exp $ -*- autoconf -*- dnl dnl This file contains local autoconf functions. @@ -1695,6 +1695,10 @@ found_iconv=no unset ICONV_DIR + # Create the directories for a VPATH build: + test -d ext || mkdir ext + test -d ext/iconv || mkdir ext/iconv + echo > ext/iconv/php_have_libiconv.h echo > ext/iconv/php_have_iconv.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard file.c
On Mon, Dec 06, 2004 at 11:30:38PM -, Ilia Alshanetsky wrote:
> http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.391&r2=1.392&ty=u
> Index: php-src/ext/standard/file.c
> diff -u php-src/ext/standard/file.c:1.391 php-src/ext/standard/file.c:1.392
> --- php-src/ext/standard/file.c:1.391 Thu Oct 28 20:37:22 2004
> +++ php-src/ext/standard/file.c Mon Dec 6 18:30:37 2004
> +#ifndef PHP_WIN32
> + {
> + char *z = memchr(p, 'b', Z_STRLEN_PP(arg2));
> + if (z) {
> + memmove(p + (z - p), z + 1, Z_STRLEN_PP(arg2) - (z -
> p));
p + z - p == z?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard config.m4
On Tue, Nov 09, 2004 at 08:39:53PM +0100, Derick Rethans wrote: > On Tue, 9 Nov 2004, Joe Orton wrote: > > > jorton Tue Nov 9 10:58:17 2004 EDT > > > > Modified files: > > /php-src/ext/standard config.m4 > > Log: > > Make the "rounding fuzz" check work again with gcc 3.3 and later, > > fixing the bug24142 test. > > Doesn't this need to be fixed in PHP_5_0 and PHP_4_3 either? Probably, but I'd rather hear so from someone who really understands this code in case I'm missing something fundamental. > And can it have something to do with bug #30729? Again no idea really, sorry! joe -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/recode config9.m4
jorton Tue Nov 9 11:11:13 2004 EDT Modified files: /php-src/ext/recode config9.m4 Log: Fix --with-recode since PHP_YAZ is never defined. http://cvs.php.net/diff.php/php-src/ext/recode/config9.m4?r1=1.1&r2=1.2&ty=u Index: php-src/ext/recode/config9.m4 diff -u php-src/ext/recode/config9.m4:1.1 php-src/ext/recode/config9.m4:1.2 --- php-src/ext/recode/config9.m4:1.1 Sun Feb 15 12:54:19 2004 +++ php-src/ext/recode/config9.m4 Tue Nov 9 11:11:13 2004 @@ -1,12 +1,11 @@ dnl -dnl $Id: config9.m4,v 1.1 2004/02/15 17:54:19 sniper Exp $ +dnl $Id: config9.m4,v 1.2 2004/11/09 16:11:13 jorton Exp $ dnl dnl Check for extensions with which Recode can not work if test "$PHP_RECODE" != "no"; then test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap" test "$PHP_MYSQL" != "no" && recode_conflict="$recode_conflict mysql" - test "$PHP_YAZ" != "no" && recode_conflict="$recode_conflict yaz" if test -n "$recode_conflict"; then AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard config.m4
jorton Tue Nov 9 10:58:17 2004 EDT
Modified files:
/php-src/ext/standard config.m4
Log:
Make the "rounding fuzz" check work again with gcc 3.3 and later,
fixing the bug24142 test.
http://cvs.php.net/diff.php/php-src/ext/standard/config.m4?r1=1.76&r2=1.77&ty=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.76 php-src/ext/standard/config.m4:1.77
--- php-src/ext/standard/config.m4:1.76 Tue Sep 28 16:42:56 2004
+++ php-src/ext/standard/config.m4 Tue Nov 9 10:58:16 2004
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.76 2004/09/28 20:42:56 sniper Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.77 2004/11/09 15:58:16 jorton Exp $ -*- autoconf -*-
divert(3)dnl
@@ -275,8 +275,12 @@
AC_MSG_CHECKING([whether rounding works as expected])
AC_TRY_RUN([
#include
+ /* keep this out-of-line to prevent use of gcc inline floor() */
+ double somefn(double n) {
+return floor(n*pow(10,2) + 0.5);
+ }
int main() {
-return floor(0.045*pow(10,2) + 0.5)/10.0 != 0.5;
+return somefn(0.045)/10.0 != 0.5;
}
],[
PHP_ROUND_FUZZ=0.5
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/bz2 config.m4 /ext/cpdf config.m4 /ext/curl config.m4 /ext/dba config.m4 /ext/fam config.m4 /ext/gd config.m4 /ext/gettext config.m4 /ext/gmp config.m4 /ext/iconv config.m4 /ext/imap config.m4 /ext/ldap config.m4 /ext/mbstring config.m4 /ext/mysql config.m4 /ext/ncurses config.m4 /ext/odbc config.m4 /ext/pcre config.m4 /ext/pgsql config.m4 /ext/pspell config.m4 /ext/readline config.m4 /ext/recode config.m4 /ext/session config.m4 /ext/sqlite config.m4 /ext/xml config.m4 /ext/xmlrpc config.m4 /ext/xsl config.m4 /ext/zlib config0.m4
jorton Wed Nov 3 09:32:53 2004 EDT Modified files: /php-src/ext/bz2config.m4 /php-src/ext/cpdf config.m4 /php-src/ext/curl config.m4 /php-src/ext/dbaconfig.m4 /php-src/ext/famconfig.m4 /php-src/ext/gd config.m4 /php-src/ext/gettextconfig.m4 /php-src/ext/gmpconfig.m4 /php-src/ext/iconv config.m4 /php-src/ext/imap config.m4 /php-src/ext/ldap config.m4 /php-src/ext/mbstring config.m4 /php-src/ext/mysql config.m4 /php-src/ext/ncursesconfig.m4 /php-src/ext/odbc config.m4 /php-src/ext/pcre config.m4 /php-src/ext/pgsql config.m4 /php-src/ext/pspell config.m4 /php-src/ext/readline config.m4 /php-src/ext/recode config.m4 /php-src/ext/sessionconfig.m4 /php-src/ext/sqlite config.m4 /php-src/ext/xmlconfig.m4 /php-src/ext/xmlrpc config.m4 /php-src/ext/xslconfig.m4 /php-src/ext/zlib config0.m4 Log: Update extensions to use /path/to/$PHP_LIBDIR rather than /path/to/lib to support multi-ABI platforms. http://cvs.php.net/diff.php/php-src/ext/bz2/config.m4?r1=1.4&r2=1.5&ty=u Index: php-src/ext/bz2/config.m4 diff -u php-src/ext/bz2/config.m4:1.4 php-src/ext/bz2/config.m4:1.5 --- php-src/ext/bz2/config.m4:1.4 Tue Jul 20 01:26:33 2004 +++ php-src/ext/bz2/config.m4 Wed Nov 3 09:32:48 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.4 2004/07/20 05:26:33 pollita Exp $ +dnl $Id: config.m4,v 1.5 2004/11/03 14:32:48 jorton Exp $ dnl PHP_ARG_WITH(bz2, for BZip2 support, @@ -27,12 +27,12 @@ PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, [ PHP_ADD_INCLUDE($BZIP_DIR/include) -PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD) +PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD) AC_DEFINE(HAVE_BZ2,1,[ ]) ], [ AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0) ], [ --L$BZIP_DIR/lib +-L$BZIP_DIR/$PHP_LIBDIR ]) PHP_NEW_EXTENSION(bz2, bz2.c bz2_filter.c, $ext_shared) http://cvs.php.net/diff.php/php-src/ext/cpdf/config.m4?r1=1.20&r2=1.21&ty=u Index: php-src/ext/cpdf/config.m4 diff -u php-src/ext/cpdf/config.m4:1.20 php-src/ext/cpdf/config.m4:1.21 --- php-src/ext/cpdf/config.m4:1.20 Tue Dec 9 15:10:22 2003 +++ php-src/ext/cpdf/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,10 +1,10 @@ -dnl $Id: config.m4,v 1.20 2003/12/09 20:10:22 sniper Exp $ +dnl $Id: config.m4,v 1.21 2004/11/03 14:32:49 jorton Exp $ AC_DEFUN(CPDF_JPEG_TEST,[ AC_ARG_WITH(jpeg-dir, [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ for i in $withval /usr/local /usr; do - if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then + if test -f "$i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/$PHP_LIBDIR/libjpeg.a"; then CPDF_JPEG_DIR=$i break; fi @@ -26,7 +26,7 @@ AC_ARG_WITH(tiff-dir, [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ for i in $withval /usr/local /usr; do - if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then + if test -f "$i/$PHP_LIBDIR/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/$PHP_LIBDIR/libtiff.a"; then CPDF_TIFF_DIR=$i break; fi @@ -64,7 +64,7 @@ ], [ AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.]) ], [ --L$i/lib $CPDF_SHARED_LIBADD +-L$i/$PHP_LIBDIR $CPDF_SHARED_LIBADD ]) break fi http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.25&r2=1.26&ty=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.25 php-src/ext/curl/config.m4:1.26 --- php-src/ext/curl/config.m4:1.25 Thu May 22 09:08:49 2003 +++ php-src/ext/curl/config.m4 Wed Nov 3 09:32:49 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25 2003/05/22 13:08:49 derick Exp $ +dnl $Id: config.m4,v 1.26 2004/11/03 14:32:49 jorton Exp $ dnl PHP_ARG_WITH(curl, for CURL support, @@ -51,7 +51,7 @@ PHP_ADD_INCLUDE($CURL_DIR/include) PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, CURL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD) PHP_CHECK_LIBRARY(curl,curl_easy_perform, [ @@ -59,14 +59,14 @@ ],[ AC_MSG_ERROR(There is something wrong. Please check config.log for more information.) ],[ -$CURL_LIBS -L$CURL_DIR/lib +$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ]) PHP_CHECK_LIBRARY(curl,curl_version_info, [ AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ]) ],[],[ -$CURL_LIBS -L$CURL_DIR/lib +$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ]) if test "$PHP_CURLWRAPPERS" != "no" ; then http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.61&r2=1.62&ty=u Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.61 php-src/ext/dba/config.m4
[PHP-CVS] cvs: php-src / acinclude.m4 configure.in
jorton Wed Nov 3 09:07:09 2004 EDT Modified files: /php-srcacinclude.m4 configure.in Log: Core changes to support multi-ABI platforms with libraries in /usr/lib64 rather than /usr/lib. * configure.in: Add --with-libdir flag; define PHP_LIBDIR. * acinclude.m4 (PHP_REMOVE_USR_LIB, PHP_RUNPATH_SWITCH, PHP_ADD_LIBPATH): Check for /usr/$PHP_LIBDIR rather than /usr/lib. (PHP_SETUP_OPENSSL, PHP_SETUP_ICONV): Use /path/to/$PHP_LIBDIR in place of /path/to/lib. http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.274&r2=1.275&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.274 php-src/acinclude.m4:1.275 --- php-src/acinclude.m4:1.274 Wed Nov 3 08:04:10 2004 +++ php-src/acinclude.m4Wed Nov 3 09:07:09 2004 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.274 2004/11/03 13:04:10 jorton Exp $ +dnl $Id: acinclude.m4,v 1.275 2004/11/03 14:07:09 jorton Exp $ dnl dnl This file contains local autoconf functions. @@ -176,7 +176,7 @@ unset ac_new_flags for i in [$]$1; do case [$]i in --L/usr/lib|-L/usr/lib/[)] ;; +-L/usr/$PHP_LIBDIR|-L/usr/$PHP_LIBDIR/[)] ;; *[)] ac_new_flags="[$]ac_new_flags [$]i" ;; esac done @@ -638,7 +638,7 @@ AC_MSG_CHECKING([if compiler supports -R]) AC_CACHE_VAL(php_cv_cc_dashr,[ SAVE_LIBS=$LIBS - LIBS="-R /usr/lib $LIBS" + LIBS="-R /usr/$PHP_LIBDIR $LIBS" AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no) LIBS=$SAVE_LIBS]) AC_MSG_RESULT([$php_cv_cc_dashr]) @@ -648,7 +648,7 @@ AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) AC_CACHE_VAL(php_cv_cc_rpath,[ SAVE_LIBS=$LIBS - LIBS="-Wl,-rpath,/usr/lib $LIBS" + LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no) LIBS=$SAVE_LIBS]) AC_MSG_RESULT([$php_cv_cc_rpath]) @@ -832,7 +832,7 @@ dnl add a library to linkpath/runpath dnl AC_DEFUN([PHP_ADD_LIBPATH],[ - if test "$1" != "/usr/lib"; then + if test "$1" != "/usr/$PHP_LIBDIR"; then PHP_EXPAND_PATH($1, ai_p) ifelse([$2],,[ _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) @@ -1622,8 +1622,8 @@ if test -r $i/include/openssl/evp.h; then OPENSSL_INCDIR=$i/include fi - if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then -OPENSSL_LIBDIR=$i/lib + if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then +OPENSSL_LIBDIR=$i/$PHP_LIBDIR fi test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break done @@ -1732,8 +1732,8 @@ AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=]) fi -if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a || - test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME +if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || + test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME then PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ found_iconv=yes @@ -1743,10 +1743,10 @@ found_iconv=yes PHP_DEFINE(HAVE_ICONV) ], [], [ - -L$ICONV_DIR/lib + -L$ICONV_DIR/$PHP_LIBDIR ]) ], [ --L$ICONV_DIR/lib +-L$ICONV_DIR/$PHP_LIBDIR ]) fi fi @@ -1754,7 +1754,7 @@ if test "$found_iconv" = "yes"; then if test -n "$ICONV_DIR"; then AC_DEFINE(HAVE_ICONV, 1, [ ]) - PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1) + PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1) PHP_ADD_INCLUDE($ICONV_DIR/include) fi $2 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.522&r2=1.523&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.522 php-src/configure.in:1.523 --- php-src/configure.in:1.522 Fri Oct 22 06:46:42 2004 +++ php-src/configure.inWed Nov 3 09:07:09 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.522 2004/10/22 10:46:42 edink Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.523 2004/11/03 14:07:09 jorton Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -124,6 +124,11 @@ dnl AC_PROG_CXX dnl AC_PROG_CXXCPP +dnl Support systems with system libraries in e.g. /usr/lib64 +AC_ARG_WITH(libdir, +[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib], +[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib]) + dnl check for -R, etc. switch PHP_RUNPATH_SWITCH -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl xp_ssl.c
jorton Wed Nov 3 08:12:41 2004 EDT
Modified files:
/php-src/ext/opensslxp_ssl.c
Log:
Remove unused variable.
http://cvs.php.net/diff.php/php-src/ext/openssl/xp_ssl.c?r1=1.19&r2=1.20&ty=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.19 php-src/ext/openssl/xp_ssl.c:1.20
--- php-src/ext/openssl/xp_ssl.c:1.19 Wed Sep 29 06:28:16 2004
+++ php-src/ext/openssl/xp_ssl.cWed Nov 3 08:12:40 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.19 2004/09/29 10:28:16 hyanantha Exp $ */
+/* $Id: xp_ssl.c,v 1.20 2004/11/03 13:12:40 jorton Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -501,7 +501,6 @@
switch (option) {
case PHP_STREAM_OPTION_CHECK_LIVENESS:
{
- fd_set rfds;
struct timeval tv;
char buf;
int alive = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
jorton Wed Nov 3 08:04:11 2004 EDT Modified files: /php-srcacinclude.m4 Log: Fix extraction of httpd version if httpd is linked against -lefence. http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.273&r2=1.274&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.273 php-src/acinclude.m4:1.274 --- php-src/acinclude.m4:1.273 Sun Sep 12 02:35:51 2004 +++ php-src/acinclude.m4Wed Nov 3 08:04:10 2004 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.273 2004/09/12 06:35:51 tony2001 Exp $ +dnl $Id: acinclude.m4,v 1.274 2004/11/03 13:04:10 jorton Exp $ dnl dnl This file contains local autoconf functions. @@ -1886,7 +1886,7 @@ dnl version for apache1/2. dnl AC_DEFUN([PHP_AP_EXTRACT_VERSION],[ - ac_output=`$1 -v 2>&1` + ac_output=`$1 -v 2>&1 | grep version` ac_IFS=$IFS IFS="- /. " -- 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_apache2.c /sapi/apache2handler php_functions.c sapi_apache2.c
jorton Sat Oct 23 09:48:05 2004 EDT Modified files: /php-src/sapi/apache2filter sapi_apache2.c php_functions.c /php-src/sapi/apache2handlerphp_functions.c sapi_apache2.c Log: - always convert apr_time_t to time_t using apr_time_sec() to be future-proof. - print apr_time_t values using APR_TIME_T and apr_snprintf. - remove redundant add_property_long calls. http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.130&r2=1.131&ty=u Index: php-src/sapi/apache2filter/sapi_apache2.c diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.130 php-src/sapi/apache2filter/sapi_apache2.c:1.131 --- php-src/sapi/apache2filter/sapi_apache2.c:1.130 Sat Oct 23 08:56:20 2004 +++ php-src/sapi/apache2filter/sapi_apache2.c Sat Oct 23 09:48:04 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.130 2004/10/23 12:56:20 jorton Exp $ */ +/* $Id: sapi_apache2.c,v 1.131 2004/10/23 13:48:04 jorton Exp $ */ #include @@ -174,13 +174,13 @@ ctx->finfo.st_dev = ctx->r->finfo.device; ctx->finfo.st_ino = ctx->r->finfo.inode; #ifdef NETWARE - ctx->finfo.st_atime.tv_sec = ctx->r->finfo.atime/100; - ctx->finfo.st_mtime.tv_sec = ctx->r->finfo.mtime/100; - ctx->finfo.st_ctime.tv_sec = ctx->r->finfo.ctime/100; + ctx->finfo.st_atime.tv_sec = apr_time_sec(ctx->r->finfo.atime); + ctx->finfo.st_mtime.tv_sec = apr_time_sec(ctx->r->finfo.mtime); + ctx->finfo.st_ctime.tv_sec = apr_time_sec(ctx->r->finfo.ctime); #else - ctx->finfo.st_atime = ctx->r->finfo.atime/100; - ctx->finfo.st_mtime = ctx->r->finfo.mtime/100; - ctx->finfo.st_ctime = ctx->r->finfo.ctime/100; + ctx->finfo.st_atime = apr_time_sec(ctx->r->finfo.atime); + ctx->finfo.st_mtime = apr_time_sec(ctx->r->finfo.mtime); + ctx->finfo.st_ctime = apr_time_sec(ctx->r->finfo.ctime); #endif ctx->finfo.st_size = ctx->r->finfo.size; http://cvs.php.net/diff.php/php-src/sapi/apache2filter/php_functions.c?r1=1.42&r2=1.43&ty=u Index: php-src/sapi/apache2filter/php_functions.c diff -u php-src/sapi/apache2filter/php_functions.c:1.42 php-src/sapi/apache2filter/php_functions.c:1.43 --- php-src/sapi/apache2filter/php_functions.c:1.42 Mon Jul 19 03:19:49 2004 +++ php-src/sapi/apache2filter/php_functions.c Sat Oct 23 09:48:04 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_functions.c,v 1.42 2004/07/19 07:19:49 andi Exp $ */ +/* $Id: php_functions.c,v 1.43 2004/10/23 13:48:04 jorton Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -92,7 +92,7 @@ #define ADD_LONG(name) \ add_property_long(return_value, #name, rr->name) #define ADD_TIME(name) \ - add_property_long(return_value, #name, rr->name / APR_USEC_PER_SEC); + add_property_long(return_value, #name, apr_time_sec(rr->name)); #define ADD_STRING(name) \ if (rr->name) add_property_string(return_value, #name, (char *) rr->name, 1) @@ -138,7 +138,6 @@ ADD_LONG(allowed); ADD_LONG(sent_bodyct); ADD_LONG(bytes_sent); - ADD_LONG(request_time); ADD_LONG(mtime); ADD_TIME(request_time); http://cvs.php.net/diff.php/php-src/sapi/apache2handler/php_functions.c?r1=1.14&r2=1.15&ty=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.14 php-src/sapi/apache2handler/php_functions.c:1.15 --- php-src/sapi/apache2handler/php_functions.c:1.14Mon Jul 19 03:19:50 2004 +++ php-src/sapi/apache2handler/php_functions.c Sat Oct 23 09:48:05 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_functions.c,v 1.14 2004/07/19 07:19:50 andi Exp $ */ +/* $Id: php_functions.c,v 1.15 2004/10/23 13:48:05 jorton Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -110,7 +110,7 @@ #define ADD_LONG(name) \ add_property_long(return_value, #name, rr->name) #define ADD_TIME(name) \ - add_property_long(return_value, #name, rr->name / APR_USEC_PER_SEC); + add_property_long(return_value, #name, apr_time_sec(rr->name)); #define ADD_STRING(name) \ if (rr->name) add_property_string(return_value, #name, (char *) rr->name, 1) @@ -156,7 +156,6 @@ ADD_LONG(allowed); ADD_LONG(sent_bodyct); ADD_LONG(bytes_sent); - ADD_LONG(request_time); ADD_LONG(mtime); ADD_TIME(request_time); @@ -402,7 +401,9 @@ sprintf(tmp, "Per Child: %d - Keep Alive: %s - Max Per Connection: %d", max_requests, (serv->keep_alive ? "on":"off"), serv->keep_alive_max); php_info_print_table_row(2, "Max Requests",
[PHP-CVS] cvs: php-src /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c
jorton Sat Oct 23 08:56:20 2004 EDT
Modified files:
/php-src/sapi/apache2handlersapi_apache2.c
/php-src/sapi/apache2filter sapi_apache2.c
Log:
Fix the get_request_time implementation for the 2.0 SAPIs to return
seconds not microseconds and to use TSRM stuff correctly.
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.45&r2=1.46&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.45
php-src/sapi/apache2handler/sapi_apache2.c:1.46
--- php-src/sapi/apache2handler/sapi_apache2.c:1.45 Wed Oct 20 05:28:47 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Sat Oct 23 08:56:19 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.45 2004/10/20 09:28:47 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.46 2004/10/23 12:56:19 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -277,13 +277,9 @@
}
}
-static time_t php_apache_sapi_get_request_time(void) {
- php_struct *ctx;
- TSRMLS_FETCH();
-
- ctx = SG(server_context);
-
- return ctx->r->request_time;
+static time_t php_apache_sapi_get_request_time(TSRMLS_D) {
+ php_struct *ctx = SG(server_context);
+ return apr_time_sec(ctx->r->request_time);
}
extern zend_module_entry php_apache_module;
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.129&r2=1.130&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.129
php-src/sapi/apache2filter/sapi_apache2.c:1.130
--- php-src/sapi/apache2filter/sapi_apache2.c:1.129 Fri Sep 24 11:44:57 2004
+++ php-src/sapi/apache2filter/sapi_apache2.c Sat Oct 23 08:56:20 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.129 2004/09/24 15:44:57 hyanantha Exp $ */
+/* $Id: sapi_apache2.c,v 1.130 2004/10/23 12:56:20 jorton Exp $ */
#include
@@ -299,13 +299,10 @@
return OK;
}
-static time_t
-php_apache_sapi_get_request_time(void)
+static time_t php_apache_sapi_get_request_time(TSRMLS_D)
{
- TSRMLS_FETCH();
php_struct *ctx = SG(server_context);
-
- return ctx->r->request_time;
+ return apr_time_sec(ctx->r->request_time);
}
extern zend_module_entry php_apache_module;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/apache2handler sapi_apache2.c
jorton Thu Oct 21 15:43:37 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH: Fix case where php_handle_aborted_connection was called
outside a try/end_try block (#25570).
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.33&r2=1.1.2.34&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.33
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.34
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.33 Tue Jul 20 16:48:01 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Oct 21 15:43:37 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.33 2004/07/20 20:48:01 moriyoshi Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.34 2004/10/21 19:43:37 jorton Exp $ */
#include
@@ -562,7 +562,9 @@
rv = ap_pass_brigade(r->output_filters, brigade);
if (rv != APR_SUCCESS || r->connection->aborted) {
+zend_first_try {
php_handle_aborted_connection();
+} zend_end_try();
}
apr_brigade_cleanup(brigade);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
jorton Thu Oct 21 15:41:56 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/apache2filter config.m4 /php-src/sapi/apache2handlerconfig.m4 Log: MFH: Fixed apache2* SAPI build against httpd 2.1. http://cvs.php.net/diff.php/php-src/sapi/apache2filter/config.m4?r1=1.25.2.10&r2=1.25.2.11&ty=u Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.25.2.10 php-src/sapi/apache2filter/config.m4:1.25.2.11 --- php-src/sapi/apache2filter/config.m4:1.25.2.10 Fri Oct 3 01:25:44 2003 +++ php-src/sapi/apache2filter/config.m4Thu Oct 21 15:41:54 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.10 2003/10/03 05:25:44 sniper Exp $ +dnl $Id: config.m4,v 1.25.2.11 2004/10/21 19:41:54 jorton Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS) @@ -40,8 +40,14 @@ APU_BINDIR=`$APXS -q APU_BINDIR` APR_BINDIR=`$APXS -q APR_BINDIR` - APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`" - APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`" + # Pick up ap[ru]-N-config if using httpd >=2.1 + APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null || +echo $APR_BINDIR/apr-config` + APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null || +echo $APU_BINDIR/apu-config` + + APR_CFLAGS="`$APR_CONFIG --cppflags --includes`" + APU_CFLAGS="`$APU_CONFIG --includes`" for flag in $APXS_CFLAGS; do case $flag in @@ -49,7 +55,7 @@ esac done - APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR" + APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS" # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4?r1=1.1.2.7&r2=1.1.2.8&ty=u Index: php-src/sapi/apache2handler/config.m4 diff -u php-src/sapi/apache2handler/config.m4:1.1.2.7 php-src/sapi/apache2handler/config.m4:1.1.2.8 --- php-src/sapi/apache2handler/config.m4:1.1.2.7 Wed Jul 16 01:46:46 2003 +++ php-src/sapi/apache2handler/config.m4 Thu Oct 21 15:41:55 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.1.2.7 2003/07/16 05:46:46 sniper Exp $ +dnl $Id: config.m4,v 1.1.2.8 2004/10/21 19:41:55 jorton Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS) @@ -39,8 +39,14 @@ APU_BINDIR=`$APXS -q APU_BINDIR` APR_BINDIR=`$APXS -q APR_BINDIR` - APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`" - APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`" + # Pick up ap[ru]-N-config if using httpd >=2.1 + APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null || +echo $APR_BINDIR/apr-config` + APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null || +echo $APU_BINDIR/apu-config` + + APR_CFLAGS="`$APR_CONFIG --cppflags --includes`" + APU_CFLAGS="`$APU_CONFIG --includes`" for flag in $APXS_CFLAGS; do case $flag in @@ -48,7 +54,7 @@ esac done - APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR" + APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS" # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/apache2handler sapi_apache2.c
jorton Thu Oct 21 04:22:59 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH: Fix case where php_handle_aborted_connection was called
outside a try/end_try block (#25570).
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.1&r2=1.40.2.2&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.1
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.2
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.1 Sat Jul 17 17:31:43 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Oct 21 04:22:58 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.40.2.1 2004/07/17 21:31:43 moriyoshi Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.2 2004/10/21 08:22:58 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -557,7 +557,9 @@
rv = ap_pass_brigade(r->output_filters, brigade);
if (rv != APR_SUCCESS || r->connection->aborted) {
+zend_first_try {
php_handle_aborted_connection();
+} zend_end_try();
}
apr_brigade_cleanup(brigade);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c
jorton Wed Oct 20 05:28:47 2004 EDT
Modified files:
/php-src/sapi/apache2handlersapi_apache2.c
Log:
Fix case where php_handle_aborted_connection was called outside a
try/end_try block (#25570).
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.44&r2=1.45&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.44
php-src/sapi/apache2handler/sapi_apache2.c:1.45
--- php-src/sapi/apache2handler/sapi_apache2.c:1.44 Wed Aug 11 16:51:41 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Wed Oct 20 05:28:47 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.44 2004/08/11 20:51:41 helly Exp $ */
+/* $Id: sapi_apache2.c,v 1.45 2004/10/20 09:28:47 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -567,7 +567,9 @@
rv = ap_pass_brigade(r->output_filters, brigade);
if (rv != APR_SUCCESS || r->connection->aborted) {
+zend_first_try {
php_handle_aborted_connection();
+} zend_end_try();
}
apr_brigade_cleanup(brigade);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h gdtables.c wbmp.h /main php_compat.h
jorton Tue Aug 31 12:41:29 2004 EDT
Modified files:
/php-src/ext/gd/libgd gd.h gdtables.c wbmp.h
/php-src/main php_compat.h
Log:
Move global symbols defined by bundled copy of libgd into private
php_gd_* namespace, to avoid symbol conflicts with, for instance,
another Apache module which loads a different copy of libgd.
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.h?r1=1.24&r2=1.25&ty=u
Index: php-src/ext/gd/libgd/gd.h
diff -u php-src/ext/gd/libgd/gd.h:1.24 php-src/ext/gd/libgd/gd.h:1.25
--- php-src/ext/gd/libgd/gd.h:1.24 Thu Jul 22 18:38:59 2004
+++ php-src/ext/gd/libgd/gd.h Tue Aug 31 12:41:29 2004
@@ -5,6 +5,8 @@
extern "C" {
#endif
+#include "php_compat.h"
+
#ifndef WIN32
/* default fontpath for unix systems */
#define DEFAULT_FONTPATH
"/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:."
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdtables.c?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/gd/libgd/gdtables.c
diff -u php-src/ext/gd/libgd/gdtables.c:1.1 php-src/ext/gd/libgd/gdtables.c:1.2
--- php-src/ext/gd/libgd/gdtables.c:1.1 Fri Apr 12 22:03:09 2002
+++ php-src/ext/gd/libgd/gdtables.c Tue Aug 31 12:41:29 2004
@@ -1,4 +1,6 @@
+#include "php_compat.h"
+
int gdCosT[] =
{
1024,
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/wbmp.h?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/gd/libgd/wbmp.h
diff -u php-src/ext/gd/libgd/wbmp.h:1.2 php-src/ext/gd/libgd/wbmp.h:1.3
--- php-src/ext/gd/libgd/wbmp.h:1.2 Sun Dec 28 15:11:08 2003
+++ php-src/ext/gd/libgd/wbmp.h Tue Aug 31 12:41:29 2004
@@ -12,6 +12,7 @@
#ifndef __WBMP_H
#define __WBMP_H 1
+#include "php_compat.h"
/* WBMP struct
** ---
http://cvs.php.net/diff.php/php-src/main/php_compat.h?r1=1.20&r2=1.21&ty=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.20 php-src/main/php_compat.h:1.21
--- php-src/main/php_compat.h:1.20 Thu Jan 8 12:33:04 2004
+++ php-src/main/php_compat.h Tue Aug 31 12:41:29 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_compat.h,v 1.20 2004/01/08 17:33:04 sniper Exp $ */
+/* $Id: php_compat.h,v 1.21 2004/08/31 16:41:29 jorton Exp $ */
#ifndef PHP_COMPAT_H
#define PHP_COMPAT_H
@@ -125,6 +125,203 @@
#define XML_UseForeignDTD php_XML_UseForeignDTD
#define XML_GetFeatureList php_XML_GetFeatureList
#define XML_ParserReset php_XML_ParserReset
+
+#ifdef HAVE_GD_BUNDLED
+#define any2eucjp php_gd_any2eucjp
+#define createwbmp php_gd_createwbmp
+#define empty_output_buffer php_gd_empty_output_buffer
+#define fill_input_buffer php_gd_fill_input_buffer
+#define freewbmp php_gd_freewbmp
+#define gdAlphaBlend php_gd_gdAlphaBlend
+#define gdCompareInt php_gd_gdCompareInt
+#define gdCosT php_gd_gdCosT
+#define gdCtxPrintf php_gd_gdCtxPrintf
+#define gdDPExtractData php_gd_gdDPExtractData
+#define gdFontGetGiant php_gd_gdFontGetGiant
+#define gdFontGetLarge php_gd_gdFontGetLarge
+#define gdFontGetMediumBold php_gd_gdFontGetMediumBold
+#define gdFontGetSmall php_gd_gdFontGetSmall
+#define gdFontGetTiny php_gd_gdFontGetTiny
+#define gdFontGiant php_gd_gdFontGiant
+#define gdFontGiantData php_gd_gdFontGiantData
+#define gdFontGiantRep php_gd_gdFontGiantRep
+#define gdFontLarge php_gd_gdFontLarge
+#define gdFontLargeData php_gd_gdFontLargeData
+#define gdFontLargeRep php_gd_gdFontLargeRep
+#define gdFontMediumBold php_gd_gdFontMediumBold
+#define gdFontMediumBoldData php_gd_gdFontMediumBoldData
+#define gdFontMediumBoldRep php_gd_gdFontMediumBoldRep
+#define gdFontSmall php_gd_gdFontSmall
+#define gdFontSmallData php_gd_gdFontSmallData
+#define gdFontSmallRep php_gd_gdFontSmallRep
+#define gdFontTiny php_gd_gdFontTiny
+#define gdFontTinyData php_gd_gdFontTinyData
+#define gdFontTinyRep php_gd_gdFontTinyRep
+#define gdGetBuf php_gd_gdGetBuf
+#define gdGetByte php_gd_gdGetByte
+#define gdGetC php_gd_gdGetC
+#define _gdGetColors php_gd__gdGetColors
+#define gd_getin php_gd_gd_getin
+#define gdGetInt php_gd_gdGetInt
+#define gdGetWord php_gd_gdGetWord
+#define gdImageAABlend php_gd_gdImageAABlend
+#define gdImageAALine php_gd_gdImageAALine
+#define gdImageAlphaBlending php_gd_gdImageAlphaBlending
+#define gdImageAntialias php_gd_gdImageAntialias
+#define gdImageArc php_gd_gdImageArc
+#define gdImageBrightness php_gd_gdImageBrightness
+#define gdImageChar php_gd_gdImageChar
+#define gdImageCharUp php_gd_gdImageCharUp
+#define gdImageColor php_gd_gdImageColor
+#define gdImageColorAllocate php_gd_gdImageColorAllocate
+#define gdImageColorAllocateAlpha php_gd_gdImageColorAllocateAlpha
+#define gdImageColorClosest php_gd_gdImageColorClosest
+#define gdImageColorClosestAlpha php_gd_gdImageColorClosestAlpha
+#define gdImageColorClosestHWB php_gd_gdImageColorClosestHWB
+#define gdImageColorDealloca
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard/tests/time 001.phpt
On Tue, Aug 31, 2004 at 02:44:34PM +0200, Derick Rethans wrote: > On Tue, 31 Aug 2004, Joe Orton wrote: > > > jorton Tue Aug 31 06:34:15 2004 EDT > > > > Modified files: (Branch: PHP_4_3) > > /php-src/ext/standard/tests/time001.phpt > > Log: > > MFH: fix gettimeofday() tests to not fail if the same time is > > returned by successive calls. > > Was this committed to HEAD too? I didn't see a commit message for it. Yes, Andi committed it to HEAD last month. joe -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /tests/lang bug27354.phpt
jorton Tue Aug 31 08:13:41 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/tests/lang bug27354.phpt Log: MFH: Do not rely on handling of integers which might be outside the range of a 32-bit signed long. http://cvs.php.net/diff.php/php-src/tests/lang/bug27354.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: php-src/tests/lang/bug27354.phpt diff -u php-src/tests/lang/bug27354.phpt:1.1.2.1 php-src/tests/lang/bug27354.phpt:1.1.2.2 --- php-src/tests/lang/bug27354.phpt:1.1.2.1Sun Feb 22 15:07:17 2004 +++ php-src/tests/lang/bug27354.phptTue Aug 31 08:13:41 2004 @@ -7,8 +7,8 @@ var_dump(-2147483648 % -1); var_dump(-2147483648 % -2); ?> ---EXPECT-- -int(0) -int(0) -int(0) -int(0) +--EXPECTF-- +int(%i) +int(%i) +int(%i) +int(%i) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /tests/lang bug27354.phpt
jorton Tue Aug 31 08:11:07 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/tests/lang bug27354.phpt Log: MFH: Do not rely on handling of integers which might be outside the range of a 32-bit signed long. http://cvs.php.net/diff.php/php-src/tests/lang/bug27354.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/tests/lang/bug27354.phpt diff -u php-src/tests/lang/bug27354.phpt:1.1 php-src/tests/lang/bug27354.phpt:1.1.4.1 --- php-src/tests/lang/bug27354.phpt:1.1Sun Feb 22 15:04:30 2004 +++ php-src/tests/lang/bug27354.phptTue Aug 31 08:11:06 2004 @@ -7,8 +7,8 @@ var_dump(-2147483648 % -1); var_dump(-2147483648 % -2); ?> ---EXPECT-- -int(0) -int(0) -int(0) -int(0) +--EXPECTF-- +int(%i) +int(%i) +int(%i) +int(%i) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard/tests/time 001.phpt
jorton Tue Aug 31 07:49:19 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard/tests/time001.phpt
Log:
MFH: fix gettimeofday() tests to not fail if the same time is
returned by successive calls.
http://cvs.php.net/diff.php/php-src/ext/standard/tests/time/001.phpt?r1=1.6&r2=1.6.2.1&ty=u
Index: php-src/ext/standard/tests/time/001.phpt
diff -u php-src/ext/standard/tests/time/001.phpt:1.6
php-src/ext/standard/tests/time/001.phpt:1.6.2.1
--- php-src/ext/standard/tests/time/001.phpt:1.6Fri May 23 16:51:49 2003
+++ php-src/ext/standard/tests/time/001.phptTue Aug 31 07:49:19 2004
@@ -17,7 +17,7 @@
for ($i=1;$i<=10;$i++) {
list($micro,$time)=explode(" ",microtime());
- if ($time > $last_t || ($time == $last_t && $micro > $last_m)) {
+ if ($time > $last_t || ($time == $last_t && $micro >= $last_m)) {
$passed++;
} else if ($failed++ <=10) {
$result .= sprintf('%06d', $i).": $time $micro < $last_t $last_m\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard/tests/time 001.phpt
jorton Tue Aug 31 06:34:15 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/time001.phpt
Log:
MFH: fix gettimeofday() tests to not fail if the same time is
returned by successive calls.
http://cvs.php.net/diff.php/php-src/ext/standard/tests/time/001.phpt?r1=1.4.2.2&r2=1.4.2.3&ty=u
Index: php-src/ext/standard/tests/time/001.phpt
diff -u php-src/ext/standard/tests/time/001.phpt:1.4.2.2
php-src/ext/standard/tests/time/001.phpt:1.4.2.3
--- php-src/ext/standard/tests/time/001.phpt:1.4.2.2Fri May 23 16:56:33 2003
+++ php-src/ext/standard/tests/time/001.phptTue Aug 31 06:34:15 2004
@@ -17,7 +17,7 @@
for ($i=1;$i<=10;$i++) {
list($micro,$time)=explode(" ",microtime());
- if ($time > $last_t || ($time == $last_t && $micro > $last_m)) {
+ if ($time > $last_t || ($time == $last_t && $micro >= $last_m)) {
$passed++;
} else if ($failed++ <=10) {
$result .= sprintf('%06d', $i).": $time $micro < $last_t $last_m\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug27354.phpt
jorton Tue Aug 31 06:23:22 2004 EDT Modified files: /php-src/tests/lang bug27354.phpt Log: Do not rely on behaviour of integers which might be greater than LONG_MAX on 32-bit architectures. http://cvs.php.net/diff.php/php-src/tests/lang/bug27354.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/tests/lang/bug27354.phpt diff -u php-src/tests/lang/bug27354.phpt:1.1 php-src/tests/lang/bug27354.phpt:1.2 --- php-src/tests/lang/bug27354.phpt:1.1Sun Feb 22 15:04:30 2004 +++ php-src/tests/lang/bug27354.phptTue Aug 31 06:23:22 2004 @@ -7,8 +7,8 @@ var_dump(-2147483648 % -1); var_dump(-2147483648 % -2); ?> ---EXPECT-- -int(0) -int(0) -int(0) -int(0) +--EXPECTF-- +int(%i) +int(%i) +int(%i) +int(%i) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
On Wed, Nov 12, 2003 at 10:02:38PM -, Ilia Alshanetsky wrote:
> iliaa Wed Nov 12 17:02:38 2003 EDT
>
> Modified files:
> /php-src NEWS
> /php-src/ext/standard basic_functions.c basic_functions.h
> Log:
> Added nanosleep(), in addition to allowing setting of very short states.
> This function is signal safe.
nanosleep() does not exist on all Unixes at least, this will need an
autoconf check...
> +/* {{{ proto mixed nanosleep(long seconds, long nanoseconds)
> + Delay for a number of seconds and nano seconds */
> +PHP_FUNCTION(nanosleep)
> +{
> + long tv_sec, tv_nsec;
> + struct timespec php_req, php_rem;
> +
> + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &tv_sec, &tv_nsec))
> {
> + WRONG_PARAM_COUNT;
> + }
> +
> + php_req.tv_sec = (time_t) tv_sec;
> + php_req.tv_nsec = tv_nsec;
> + if (!nanosleep(&php_req, &php_rem)) {
> + RETURN_TRUE;
> + } else if (errno == EINTR) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
On Tue, Nov 11, 2003 at 05:35:33PM -, Moriyoshi Koizumi wrote: > moriyoshi Tue Nov 11 12:35:33 2003 EDT > > Modified files: > /php-src/ext/mbstring mbstring.c > Log: > Compiler warning fix (patch by Joe Orton) The fix is needed on the 4.3 branch too BTW. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
