Re: [PHP-CVS] cvs: php4 / configure.in /sapi/cgi README.FastCGIcgi_main.c config9.m4 /sapi/cgi/libfcgi fcgiapp.c os_unix.c /sapi/cgi/libfcgi/includefcgi_config.h fcgi_config_win32.h fcgios.h
Marcus Börger wrote:
I just hoped you could have a look into that since you worked on it.
sorry for any inconvenience
Ahh...my mistake, didn't read the message thoroughly. Too focused on
other things. I'll look at that.
Shane
At 07:32 26.11.2002, Shane Caraveo wrote:
> ??? I didn't touch that code, and my diff from just before commit did
> not show that either (still have the diff). What the hell?
>
> Shane
>
>>
>>
>> Another thing i saw in cgi:
>> len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
>>"%s\r\n",
>> SG(sapi_headers).http_status_line);
>>
>> if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
>> len = SAPI_CGI_MAX_HEADER_LENGTH;
>> }
>>
>> The problem here is that the headers could be cut of so that "\r\n" is
>> lost.
>> As this is needed i suggest the following patch. Please check it
>> since i am
>> not sure if it is really correct (the question is length
calculation/and
>> sorry
>> for not having the time to check myself).
>> cvs -z3 -q diff cgi_main.c (in directory S:\php4-HEAD\sapi\cgi)
>> Index: cgi_main.c
>> ===
>> RCS file: /repository/php4/sapi/cgi/cgi_main.c,v
>> retrieving revision 1.198
>> diff -u -r1.198 cgi_main.c
>> --- cgi_main.c 26 Nov 2002 05:57:03 - 1.198
>> +++ cgi_main.c 26 Nov 2002 06:12:54 -
>> @@ -238,11 +238,9 @@
>> }
>> }
>>
>> -#define SAPI_CGI_MAX_HEADER_LENGTH 1024
>> -
>> static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers
>> TSRMLS_DC)
>> {
>> - char buf[SAPI_CGI_MAX_HEADER_LENGTH];
>> + char *buf;
>> sapi_header_struct *h;
>> zend_llist_position pos;
>> long rfc2616_headers = 0;
>> @@ -260,18 +258,15 @@
>> int len;
>>
>> if (rfc2616_headers) {
>> - len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
>> + len = spprintf(&buf, 0,
>>"%s\r\n",
>> SG(sapi_headers).http_status_line);
>>
>> - if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
>> - len = SAPI_CGI_MAX_HEADER_LENGTH;
>> - }
>> -
>> } else {
>> - len = sprintf(buf, "Status: %d\r\n",
>> SG(sapi_headers).http_response_code);
>> + len = spprintf(&buf, 0, "Status: %d\r\n",
>> SG(sapi_headers).http_response_code);
>> }
>>
>> PHPWRITE_H(buf, len);
>> + efree(buf);
>> }
>>
>> if (SG(sapi_headers).send_default_content_type) {
>>
>>
>> *CVS exited normally with code 1*
>>
>>
>>
>> At 06:51 26.11.2002, Shane Caraveo wrote:
>>
>> > shane Tue Nov 26 00:51:16 2002 EDT
>> >
>> > Added files:
>> > /php4/sapi/cgi/libfcgi/include fcgi_config_win32.h
>> >
>> > Modified files:
>> > /php4 configure.in
>> > /php4/sapi/cgi README.FastCGI cgi_main.c config9.m4
>> > /php4/sapi/cgi/libfcgi fcgiapp.c os_unix.c
>> > /php4/sapi/cgi/libfcgi/include fcgi_config.h fcgios.h
>> > Log:
>> > configure now supports building the cgi-fcgi module
>> > configure --enable-fastcgi
>> >
>> >
>> > --
>> > 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: php4 /ext/imap php_imap.c
fmk Tue Nov 26 02:04:33 2002 EDT
Modified files:
/php4/ext/imap php_imap.c
Log:
Avoid , at the end of each string (to, cc and bcc)
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.143 php4/ext/imap/php_imap.c:1.144
--- php4/ext/imap/php_imap.c:1.143 Mon Nov 25 07:30:23 2002
+++ php4/ext/imap/php_imap.cTue Nov 26 02:04:31 2002
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.143 2002/11/25 12:30:23 hholzgra Exp $ */
+/* $Id: php_imap.c,v 1.144 2002/11/26 07:04:31 fmk Exp $ */
#define IMAP41
@@ -3162,7 +3162,7 @@
addr = addr->next;
}
efree(tempMailTo);
- bufferTo[offset] = 0;
+ if (offset>0) bufferTo[offset-1] = 0;
}
if (cc && *cc) {
@@ -3180,7 +3180,7 @@
addr = addr->next;
}
efree(tempMailTo);
- bufferCc[offset] = 0;
+ if (offset>0) bufferCc[offset-1] = 0;
}
if (bcc && *bcc) {
@@ -3198,7 +3198,7 @@
addr = addr->next;
}
efree(tempMailTo);
- bufferBcc[offset] = 0;
+ if (offset>0) bufferBcc[offset-1] = 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /main SAPI.h /sapi/activescript php4activescript.c /sapi/aolserver aolserver.c /sapi/apache2filter sapi_apache2.c /sapi/apache_hooks mod_php4.c /sapi/caudium caudium.c /s
On Tue, 26 Nov 2002, Sascha Schumann wrote: >> - Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is. > >Actually, it can savely be dropped. There is no reason for >letting it in. Err...letting what in? This define? It was already in? --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /main SAPI.h /sapi/activescript php4activescript.c /sapi/aolserver aolserver.c /sapi/apache2filter sapi_apache2.c /sapi/apache_hooks mod_php4.c /sapi/caudium caudium.c /s
On Tue, 26 Nov 2002, Jani Taskinen wrote: > On Tue, 26 Nov 2002, Sascha Schumann wrote: > > >> - Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is. > > > >Actually, it can savely be dropped. There is no reason for > >letting it in. > > > Err...letting what in? This define? It was already in? s/in/stay/. It's safe to say that the macro does not apply - the absence of the "standard" macro in two SAPI modules (more soon) just demonstrates its obsolescence. I've always been a fan of automatic structure initialization (used in the smart_str interface, for example). This is another case where it makes a lot of sense. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 / configure.in /sapi/cgi README.FastCGI cgi_main.c config9.m4 /sapi/cgi/libfcgi fcgiapp.c os_unix.c /sapi/cgi/libfcgi/include fcgi_config.h fcgi_config_win32.h fcgios.h
I just hoped you could have a look into that since you worked on it.
sorry for any inconvenience
At 07:32 26.11.2002, Shane Caraveo wrote:
??? I didn't touch that code, and my diff from just before commit did not
show that either (still have the diff). What the hell?
Shane
Another thing i saw in cgi:
len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
"%s\r\n",
SG(sapi_headers).http_status_line);
if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
len = SAPI_CGI_MAX_HEADER_LENGTH;
}
The problem here is that the headers could be cut of so that "\r\n" is
lost.
As this is needed i suggest the following patch. Please check it since i am
not sure if it is really correct (the question is length calculation/and
sorry
for not having the time to check myself).
cvs -z3 -q diff cgi_main.c (in directory S:\php4-HEAD\sapi\cgi)
Index: cgi_main.c
===
RCS file: /repository/php4/sapi/cgi/cgi_main.c,v
retrieving revision 1.198
diff -u -r1.198 cgi_main.c
--- cgi_main.c 26 Nov 2002 05:57:03 - 1.198
+++ cgi_main.c 26 Nov 2002 06:12:54 -
@@ -238,11 +238,9 @@
}
}
-#define SAPI_CGI_MAX_HEADER_LENGTH 1024
-
static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers
TSRMLS_DC)
{
- char buf[SAPI_CGI_MAX_HEADER_LENGTH];
+ char *buf;
sapi_header_struct *h;
zend_llist_position pos;
long rfc2616_headers = 0;
@@ -260,18 +258,15 @@
int len;
if (rfc2616_headers) {
- len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
+ len = spprintf(&buf, 0,
"%s\r\n",
SG(sapi_headers).http_status_line);
- if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
- len = SAPI_CGI_MAX_HEADER_LENGTH;
- }
-
} else {
- len = sprintf(buf, "Status: %d\r\n",
SG(sapi_headers).http_response_code);
+ len = spprintf(&buf, 0, "Status: %d\r\n",
SG(sapi_headers).http_response_code);
}
PHPWRITE_H(buf, len);
+ efree(buf);
}
if (SG(sapi_headers).send_default_content_type) {
*CVS exited normally with code 1*
At 06:51 26.11.2002, Shane Caraveo wrote:
> shane Tue Nov 26 00:51:16 2002 EDT
>
> Added files:
> /php4/sapi/cgi/libfcgi/include fcgi_config_win32.h
>
> Modified files:
> /php4 configure.in
> /php4/sapi/cgi README.FastCGI cgi_main.c config9.m4
> /php4/sapi/cgi/libfcgi fcgiapp.c os_unix.c
> /php4/sapi/cgi/libfcgi/include fcgi_config.h fcgios.h
> Log:
> configure now supports building the cgi-fcgi module
> configure --enable-fastcgi
>
>
> --
> 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
Re: [PHP-CVS] cvs: php4 / configure.in /sapi/cgi README.FastCGIcgi_main.c config9.m4 /sapi/cgi/libfcgi fcgiapp.c os_unix.c /sapi/cgi/libfcgi/includefcgi_config.h fcgi_config_win32.h fcgios.h
Marcus Börger wrote: You have to check the test files. Some of them check for sapi name cgi. Now we have another name "cgi-fcgi". But you will have to verify that all those tests can be done by cgi-fgi as well. I take it no one tests on windows, since this has been in the source for quite a while. Shane -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /win32 php4ts.dsp
shane Tue Nov 26 01:51:45 2002 EDT Modified files: /php4/win32 php4ts.dsp Log: fix windows build of cgi/fastcgi Index: php4/win32/php4ts.dsp diff -u php4/win32/php4ts.dsp:1.14 php4/win32/php4ts.dsp:1.15 --- php4/win32/php4ts.dsp:1.14 Thu Apr 11 13:52:26 2002 +++ php4/win32/php4ts.dsp Tue Nov 26 01:51:44 2002 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\sapi\cgi\libfcgi\include" /D "FCGI_STATIC" /D "PHP_FASTCGI" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_CONSOLE" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I +"..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\sapi\cgi\libfcgi\include" /D +FCGI_STATIC=1 /D PHP_FASTCGI=1 /D "NDEBUG" /D ZEND_DEBUG=0 /D "_CONSOLE" /D "MSVC5" +/D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\sapi\cgi\libfcgi\include" /D "FCGI_STATIC" /D "PHP_FASTCGI" /D "DEBUG" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_CONSOLE" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I +"..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\sapi\cgi\libfcgi\include" /D +FCGI_STATIC=1 /D PHP_FASTCGI=1 /D "DEBUG" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_CONSOLE" +/D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG" @@ -78,7 +78,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 winmm.lib netapi32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS/php-cgi.exe" /pdbtype:sept /libpath:"..\Debug_TS" +# ADD LINK32 winmm.lib netapi32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib +winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib +odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /version:4.0 /subsystem:console +/debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" +/out:"Debug_TS/php-cgi.exe" /pdbtype:sept /libpath:"..\Debug_TS" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "php4ts - Win32 Release_TS_inline" @@ -97,7 +97,7 @@ # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\sapi\cgi\libfcgi\include" /D "FCGI_STATIC" /D "PHP_FASTCGI" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_CONSOLE" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I +"..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\sapi\cgi\libfcgi\include" /D +FCGI_STATIC=1 /D PHP_FASTCGI=1 /D "NDEBUG" /D ZEND_DEBUG=0 /D +"ZEND_WIN32_FORCE_INLINE" /D "_CONSOLE" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D +"PHP_WIN32" /D "WIN32" /D "_MBCS" /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -124,7 +124,7 @@ # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_CONSOLE" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /Fr /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\sapi\cgi\libfcgi\include" /D "FCGI_STATIC" /D "PHP_FASTCGI" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_CONSOLE" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /
Re: [PHP-CVS] cvs: php4 /main SAPI.h /sapi/activescript php4activescript.c /sapi/aolserver aolserver.c /sapi/apache2filter sapi_apache2.c /sapi/apache_hooks mod_php4.c /sapi/caudium caudium.c /sapi/
> - Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is. Actually, it can savely be dropped. There is no reason for letting it in. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 / configure.in /sapi/cgi README.FastCGIcgi_main.c config9.m4 /sapi/cgi/libfcgi fcgiapp.c os_unix.c /sapi/cgi/libfcgi/includefcgi_config.h fcgi_config_win32.h fcgios.h
Quit messin with my head. That stuff isn't in the diff cvs sent to the
cvs email list.
Shane
Shane Caraveo wrote:
??? I didn't touch that code, and my diff from just before commit did
not show that either (still have the diff). What the hell?
Shane
>
>
> Another thing i saw in cgi:
> len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
>"%s\r\n",
> SG(sapi_headers).http_status_line);
>
> if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
> len = SAPI_CGI_MAX_HEADER_LENGTH;
> }
>
> The problem here is that the headers could be cut of so that "\r\n" is
> lost.
> As this is needed i suggest the following patch. Please check it since
> i am
> not sure if it is really correct (the question is length calculation/and
> sorry
> for not having the time to check myself).
> cvs -z3 -q diff cgi_main.c (in directory S:\php4-HEAD\sapi\cgi)
> Index: cgi_main.c
> ===
> RCS file: /repository/php4/sapi/cgi/cgi_main.c,v
> retrieving revision 1.198
> diff -u -r1.198 cgi_main.c
> --- cgi_main.c 26 Nov 2002 05:57:03 - 1.198
> +++ cgi_main.c 26 Nov 2002 06:12:54 -
> @@ -238,11 +238,9 @@
> }
> }
>
> -#define SAPI_CGI_MAX_HEADER_LENGTH 1024
> -
> static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers
> TSRMLS_DC)
> {
> - char buf[SAPI_CGI_MAX_HEADER_LENGTH];
> + char *buf;
> sapi_header_struct *h;
> zend_llist_position pos;
> long rfc2616_headers = 0;
> @@ -260,18 +258,15 @@
> int len;
>
> if (rfc2616_headers) {
> - len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
> + len = spprintf(&buf, 0,
>"%s\r\n",
> SG(sapi_headers).http_status_line);
>
> - if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
> - len = SAPI_CGI_MAX_HEADER_LENGTH;
> - }
> -
> } else {
> - len = sprintf(buf, "Status: %d\r\n",
> SG(sapi_headers).http_response_code);
> + len = spprintf(&buf, 0, "Status: %d\r\n",
> SG(sapi_headers).http_response_code);
> }
>
> PHPWRITE_H(buf, len);
> + efree(buf);
> }
>
> if (SG(sapi_headers).send_default_content_type) {
>
>
> *CVS exited normally with code 1*
>
>
>
> At 06:51 26.11.2002, Shane Caraveo wrote:
>
> > shane Tue Nov 26 00:51:16 2002 EDT
> >
> > Added files:
> > /php4/sapi/cgi/libfcgi/include fcgi_config_win32.h
> >
> > Modified files:
> > /php4 configure.in
> > /php4/sapi/cgi README.FastCGI cgi_main.c config9.m4
> > /php4/sapi/cgi/libfcgi fcgiapp.c os_unix.c
> > /php4/sapi/cgi/libfcgi/include fcgi_config.h fcgios.h
> > Log:
> > configure now supports building the cgi-fcgi module
> > configure --enable-fastcgi
> >
> >
> > --
> > 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
Re: [PHP-CVS] cvs: php4 / configure.in /sapi/cgi README.FastCGIcgi_main.c config9.m4 /sapi/cgi/libfcgi fcgiapp.c os_unix.c /sapi/cgi/libfcgi/includefcgi_config.h fcgi_config_win32.h fcgios.h
??? I didn't touch that code, and my diff from just before commit did
not show that either (still have the diff). What the hell?
Shane
Another thing i saw in cgi:
len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
"%s\r\n",
SG(sapi_headers).http_status_line);
if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
len = SAPI_CGI_MAX_HEADER_LENGTH;
}
The problem here is that the headers could be cut of so that "\r\n" is
lost.
As this is needed i suggest the following patch. Please check it since
i am
not sure if it is really correct (the question is length calculation/and
sorry
for not having the time to check myself).
cvs -z3 -q diff cgi_main.c (in directory S:\php4-HEAD\sapi\cgi)
Index: cgi_main.c
===
RCS file: /repository/php4/sapi/cgi/cgi_main.c,v
retrieving revision 1.198
diff -u -r1.198 cgi_main.c
--- cgi_main.c 26 Nov 2002 05:57:03 - 1.198
+++ cgi_main.c 26 Nov 2002 06:12:54 -
@@ -238,11 +238,9 @@
}
}
-#define SAPI_CGI_MAX_HEADER_LENGTH 1024
-
static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers
TSRMLS_DC)
{
- char buf[SAPI_CGI_MAX_HEADER_LENGTH];
+ char *buf;
sapi_header_struct *h;
zend_llist_position pos;
long rfc2616_headers = 0;
@@ -260,18 +258,15 @@
int len;
if (rfc2616_headers) {
- len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
+ len = spprintf(&buf, 0,
"%s\r\n",
SG(sapi_headers).http_status_line);
- if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
- len = SAPI_CGI_MAX_HEADER_LENGTH;
- }
-
} else {
- len = sprintf(buf, "Status: %d\r\n",
SG(sapi_headers).http_response_code);
+ len = spprintf(&buf, 0, "Status: %d\r\n",
SG(sapi_headers).http_response_code);
}
PHPWRITE_H(buf, len);
+ efree(buf);
}
if (SG(sapi_headers).send_default_content_type) {
*CVS exited normally with code 1*
At 06:51 26.11.2002, Shane Caraveo wrote:
> shane Tue Nov 26 00:51:16 2002 EDT
>
> Added files:
> /php4/sapi/cgi/libfcgi/include fcgi_config_win32.h
>
> Modified files:
> /php4 configure.in
> /php4/sapi/cgi README.FastCGI cgi_main.c config9.m4
> /php4/sapi/cgi/libfcgi fcgiapp.c os_unix.c
> /php4/sapi/cgi/libfcgi/include fcgi_config.h fcgios.h
> Log:
> configure now supports building the cgi-fcgi module
> configure --enable-fastcgi
>
>
> --
> 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
Re: [PHP-CVS] cvs: php4 / configure.in /sapi/cgi README.FastCGI cgi_main.c config9.m4 /sapi/cgi/libfcgi fcgiapp.c os_unix.c /sapi/cgi/libfcgi/include fcgi_config.h fcgi_config_win32.h fcgios.h
You have to check the test files. Some of them check for sapi name cgi.
Now we have another name "cgi-fcgi". But you will have to verify that all
those tests can be done by cgi-fgi as well.
Another thing i saw in cgi:
len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
"%s\r\n",
SG(sapi_headers).http_status_line);
if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
len = SAPI_CGI_MAX_HEADER_LENGTH;
}
The problem here is that the headers could be cut of so that "\r\n" is lost.
As this is needed i suggest the following patch. Please check it since i am
not sure if it is really correct (the question is length calculation/and sorry
for not having the time to check myself).
cvs -z3 -q diff cgi_main.c (in directory S:\php4-HEAD\sapi\cgi)
Index: cgi_main.c
===
RCS file: /repository/php4/sapi/cgi/cgi_main.c,v
retrieving revision 1.198
diff -u -r1.198 cgi_main.c
--- cgi_main.c 26 Nov 2002 05:57:03 - 1.198
+++ cgi_main.c 26 Nov 2002 06:12:54 -
@@ -238,11 +238,9 @@
}
}
-#define SAPI_CGI_MAX_HEADER_LENGTH 1024
-
static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
{
- char buf[SAPI_CGI_MAX_HEADER_LENGTH];
+ char *buf;
sapi_header_struct *h;
zend_llist_position pos;
long rfc2616_headers = 0;
@@ -260,18 +258,15 @@
int len;
if (rfc2616_headers) {
- len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
+ len = spprintf(&buf, 0,
"%s\r\n",
SG(sapi_headers).http_status_line);
- if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
- len = SAPI_CGI_MAX_HEADER_LENGTH;
- }
-
} else {
- len = sprintf(buf, "Status: %d\r\n",
SG(sapi_headers).http_response_code);
+ len = spprintf(&buf, 0, "Status: %d\r\n",
SG(sapi_headers).http_response_code);
}
PHPWRITE_H(buf, len);
+ efree(buf);
}
if (SG(sapi_headers).send_default_content_type) {
*CVS exited normally with code 1*
At 06:51 26.11.2002, Shane Caraveo wrote:
shane Tue Nov 26 00:51:16 2002 EDT
Added files:
/php4/sapi/cgi/libfcgi/include fcgi_config_win32.h
Modified files:
/php4 configure.in
/php4/sapi/cgi README.FastCGI cgi_main.c config9.m4
/php4/sapi/cgi/libfcgi fcgiapp.c os_unix.c
/php4/sapi/cgi/libfcgi/include fcgi_config.h fcgios.h
Log:
configure now supports building the cgi-fcgi module
configure --enable-fastcgi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main SAPI.h /sapi/activescript php4activescript.c /sapi/aolserver aolserver.c /sapi/apache2filter sapi_apache2.c /sapi/apache_hooks mod_php4.c /sapi/caudium caudium.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/embed php_embed.c /sapi/fastcgi fastcgi.c /sapi/isapi php4isapi.c /sapi/nsapi nsapi.c /sapi/phttpd phttpd.c /sapi/pi3web pi3web_sapi.c /sapi/roxen roxen.c /sapi/servlet servlet.c /sapi/tux php_tux.c /sapi/webjames webjames.c
sniper Tue Nov 26 00:57:06 2002 EDT Modified files: /php4/main SAPI.h /php4/sapi/activescript php4activescript.c /php4/sapi/aolserveraolserver.c /php4/sapi/apache2filtersapi_apache2.c /php4/sapi/apache_hooks mod_php4.c /php4/sapi/caudium caudium.c /php4/sapi/cgi cgi_main.c /php4/sapi/cli php_cli.c /php4/sapi/embedphp_embed.c /php4/sapi/fastcgi fastcgi.c /php4/sapi/isapiphp4isapi.c /php4/sapi/nsapinsapi.c /php4/sapi/phttpd phttpd.c /php4/sapi/pi3web pi3web_sapi.c /php4/sapi/roxenroxen.c /php4/sapi/servlet servlet.c /php4/sapi/tux php_tux.c /php4/sapi/webjames webjames.c Log: - Made the STANDARD_SAPI_MODULE_PROPERTIES be what it says it is. Index: php4/main/SAPI.h diff -u php4/main/SAPI.h:1.90 php4/main/SAPI.h:1.91 --- php4/main/SAPI.h:1.90 Tue Nov 26 00:15:55 2002 +++ php4/main/SAPI.hTue Nov 26 00:57:01 2002 @@ -215,12 +215,12 @@ void (*register_server_variables)(zval *track_vars_array TSRMLS_DC); void (*log_message)(char *message); + char *php_ini_path_override; void (*block_interruptions)(void); void (*unblock_interruptions)(void); - void (*default_post_reader)(TSRMLS_D); void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC); char *executable_location; @@ -262,7 +262,7 @@ SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader); SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data); -#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, 0 +#define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL #endif /* SAPI_H */ Index: php4/sapi/activescript/php4activescript.c diff -u php4/sapi/activescript/php4activescript.c:1.2 php4/sapi/activescript/php4activescript.c:1.3 --- php4/sapi/activescript/php4activescript.c:1.2 Wed Sep 18 17:57:29 2002 +++ php4/sapi/activescript/php4activescript.c Tue Nov 26 00:57:01 2002 @@ -15,7 +15,7 @@ | Authors: Wez Furlong <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php4activescript.c,v 1.2 2002/09/18 21:57:29 zeev Exp $ */ +/* $Id: php4activescript.c,v 1.3 2002/11/26 05:57:01 sniper Exp $ */ #include "php.h" #include "php_main.h" @@ -117,9 +117,6 @@ sapi_activescript_register_server_variables,/* register server variables */ NULL, /* Log message */ - - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.72 php4/sapi/aolserver/aolserver.c:1.73 --- php4/sapi/aolserver/aolserver.c:1.72Thu Sep 26 13:54:53 2002 +++ php4/sapi/aolserver/aolserver.c Tue Nov 26 00:57:01 2002 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.72 2002/09/26 17:54:53 cmv Exp $ */ +/* $Id: aolserver.c,v 1.73 2002/11/26 05:57:01 sniper Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -205,7 +205,7 @@ int i; php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.72 2002/09/26 17:54:53 cmv Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.73 +2002/11/26 05:57:01 sniper Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -387,11 +387,6 @@ php_ns_sapi_register_variables, NULL, /* Log message */ - - NULL, /* php.ini path override */ - - NULL, /* Block interruptions */ - NULL, /* Unblock interruptions */ STANDARD_SAPI_MODULE_PROPERTIES }; Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.91 php4/sapi/apache2filter/sapi_apache2.c:1.92 --- php4/sapi/apache2filter/sapi_apache2.c:1.91 Sat Nov 2 11:04:27 2002 +++ php4/sapi/apache2filter/sapi_apache2.c Tue Nov 26 00:57:02 2002 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.91 2002/11/02 16:04:27 imajes Exp $ */ +/* $Id: sapi_apache2.c,v 1.92 2002/11/26 05:57:02 sniper
[PHP-CVS] cvs: php4 / configure.in /sapi/cgi README.FastCGI cgi_main.c config9.m4 /sapi/cgi/libfcgi fcgiapp.c os_unix.c /sapi/cgi/libfcgi/include fcgi_config.h fcgi_config_win32.h fcgios.h
shane Tue Nov 26 00:51:16 2002 EDT
Added files:
/php4/sapi/cgi/libfcgi/include fcgi_config_win32.h
Modified files:
/php4 configure.in
/php4/sapi/cgi README.FastCGI cgi_main.c config9.m4
/php4/sapi/cgi/libfcgi fcgiapp.c os_unix.c
/php4/sapi/cgi/libfcgi/include fcgi_config.h fcgios.h
Log:
configure now supports building the cgi-fcgi module
configure --enable-fastcgi
Index: php4/configure.in
diff -u php4/configure.in:1.401 php4/configure.in:1.402
--- php4/configure.in:1.401 Fri Nov 15 10:35:11 2002
+++ php4/configure.in Tue Nov 26 00:51:15 2002
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.401 2002/11/15 15:35:11 helly Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.402 2002/11/26 05:51:15 shane Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -242,6 +242,11 @@
PTHREADS_FLAGS
fi
+if test "$PHP_ENABLE_FASTCGI" = "yes"; then
+ PHP_CONFIGURE_PART(Running FastCGI checks)
+ sinclude(sapi/cgi/libfcgi/acinclude.m4)
+ sinclude(sapi/cgi/libfcgi/libfcgi.m4)
+fi
divert(3)
Index: php4/sapi/cgi/README.FastCGI
diff -u php4/sapi/cgi/README.FastCGI:1.1 php4/sapi/cgi/README.FastCGI:1.2
--- php4/sapi/cgi/README.FastCGI:1.1Sun Oct 13 05:40:44 2002
+++ php4/sapi/cgi/README.FastCGITue Nov 26 00:51:15 2002
@@ -1,6 +1,13 @@
Credits:
Ben Mansell, Stephen Landamore, Daniel Silverstone, Shane Caraveo
+Building PHP
+
+
+You must add '--enable-fastcgi' to the configure command on Linux or
+OSX based systems to get fastcgi support in the php-cgi binary. You
+also must not use '--enable-discard-path'.
+
Running the FastCGI PHP module
--
@@ -58,7 +65,8 @@
Now, we'll create a fcgi-bin directory, just like you would do with normal
CGI scripts. You'll need to create a directory somewhere to store your
FastCGI binaries. We'll use /space/fcgi-bin/ for this example. Remember to
-copy the FastCGI-PHP binary in there. (named just 'php')
+copy the FastCGI-PHP binary in there. (named 'php-cgi') This sets up
+php to run under mod_fastcgi as a dynamic server.
ScriptAlias /fcgi-bin/ /space/fcgi-bin/
@@ -66,14 +74,17 @@
SetHandler fastcgi-script
-To have mod_fastcgi manage your php fastcgi processes for you, use the
-configuration directive FCGIServer (see mod_fastcgi docs for more
-configuration information):
-
-FastCgiServer /fcgi-bin/php-cgi -processes 5
-
-Next, we need to tell Apache to use the FastCGI binary /fcgi-bin/php to
-deliver PHP pages. All that is needed is:
+To setup a specific static configuration for php, you have to use
+the FastCgiServer configuration for mod_fastcgi. For this, do not
+use the above configuration, but rather the following.
+(see mod_fastcgi docs for more configuration information):
+
+Alias /fcgi-bin/ /space/fcgi-bin/
+FastCgiServer /path/to/php-cgi -processes 5
+
+For either of the above configurations, we need to tell Apache to
+use the FastCGI binary /fcgi-bin/php to deliver PHP pages.
+All that is needed is:
AddType application/x-httpd-fastphp .php
Action application/x-httpd-fastphp /fcgi-bin/php-cgi
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.196 php4/sapi/cgi/cgi_main.c:1.197
--- php4/sapi/cgi/cgi_main.c:1.196 Fri Nov 22 10:47:39 2002
+++ php4/sapi/cgi/cgi_main.cTue Nov 26 00:51:15 2002
@@ -76,12 +76,16 @@
#include "php_getopt.h"
-#ifdef PHP_FASTCGI
+#if PHP_FASTCGI
#include "fcgi_config.h"
#include "fcgiapp.h"
/* don't want to include fcgios.h, causes conflicts */
#ifdef PHP_WIN32
extern int OS_SetImpersonate(void);
+#else
+/* XXX this will need to change later when threaded fastcgi is
+ implemented. shane */
+struct sigaction act, old_term, old_quit, old_int;
#endif
static void (*php_php_import_environment_variables)(zval *array_ptr TSRMLS_DC);
@@ -179,7 +183,7 @@
size_t ret;
#endif
-#ifdef PHP_FASTCGI
+#if PHP_FASTCGI
if (!FCGX_IsCGI()) {
FCGX_Request *request = (FCGX_Request *)SG(server_context);
long ret = FCGX_PutStr( str, str_length, request->out );
@@ -221,7 +225,7 @@
static void sapi_cgibin_flush(void *server_context)
{
-#ifdef PHP_FASTCGI
+#if PHP_FASTCGI
if (!FCGX_IsCGI()) {
FCGX_Request *request = (FCGX_Request *)server_context;
if(!request || FCGX_FFlush( request->out ) == -1 ) {
@@ -295,13 +299,13 @@
static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
{
uint read_bytes=0, tmp_read_bytes;
-#ifdef PHP_FASTCGI
+#if PHP_FASTCGI
char *pos = buffer;
#endif
count_bytes = MIN(count_bytes,
(uint)SG(request_info).content_length-SG(read_post_bytes));
while (read_bytes < count_bytes) {
-#ifdef PHP_FASTCGI
+#if PHP_FASTCGI
if (!FCGX_IsCGI()) {
FCGX_Request *request = (F
[PHP-CVS] cvs: php4 /main SAPI.c SAPI.h /sapi/apache mod_php4.c /sapi/thttpd thttpd.c
sas Tue Nov 26 00:15:55 2002 EDT
Modified files:
/php4/main SAPI.c SAPI.h
/php4/sapi/apache mod_php4.c
/php4/sapi/thttpd thttpd.c
Log:
Add sapi_get_fd() and implement it for the Apache/thttpd SAPIs.
Index: php4/main/SAPI.c
diff -u php4/main/SAPI.c:1.157 php4/main/SAPI.c:1.158
--- php4/main/SAPI.c:1.157 Thu Nov 21 05:29:11 2002
+++ php4/main/SAPI.cTue Nov 26 00:15:55 2002
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.157 2002/11/21 10:29:11 hholzgra Exp $ */
+/* $Id: SAPI.c,v 1.158 2002/11/26 05:15:55 sas Exp $ */
#include
#include
@@ -848,6 +848,15 @@
return sapi_module.getenv(name, name_len TSRMLS_CC);
} else {
return NULL;
+ }
+}
+
+SAPI_API int sapi_get_fd(int *fd TSRMLS_DC)
+{
+ if (sapi_module.get_fd) {
+ return sapi_module.get_fd(fd TSRMLS_CC);
+ } else {
+ return -1;
}
}
Index: php4/main/SAPI.h
diff -u php4/main/SAPI.h:1.89 php4/main/SAPI.h:1.90
--- php4/main/SAPI.h:1.89 Mon Nov 18 01:04:06 2002
+++ php4/main/SAPI.hTue Nov 26 00:15:55 2002
@@ -186,6 +186,8 @@
SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len TSRMLS_DC);
SAPI_API void sapi_activate_headers_only(TSRMLS_D);
+SAPI_API int sapi_get_fd(int *fd TSRMLS_DC);
+
struct _sapi_module_struct {
char *name;
char *pretty_name;
@@ -217,12 +219,16 @@
void (*block_interruptions)(void);
void (*unblock_interruptions)(void);
+
void (*default_post_reader)(TSRMLS_D);
void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC);
char *executable_location;
int php_ini_ignore;
+
+ int (*get_fd)(int *fd TSRMLS_DC);
+
};
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.146 php4/sapi/apache/mod_php4.c:1.147
--- php4/sapi/apache/mod_php4.c:1.146 Sun Nov 10 14:34:09 2002
+++ php4/sapi/apache/mod_php4.c Tue Nov 26 00:15:55 2002
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: mod_php4.c,v 1.146 2002/11/10 19:34:09 iliaa Exp $ */
+/* $Id: mod_php4.c,v 1.147 2002/11/26 05:15:55 sas Exp $ */
#include "php_apache_http.h"
@@ -343,6 +343,23 @@
}
/* }}} */
+/* {{{ sapi_apache_get_fd
+ */
+static int sapi_apache_get_fd(int *nfd TSRMLS_DC)
+{
+ request_rec *r = SG(server_context);
+ int fd;
+
+ fd = r->connection->client->fd;
+
+ if (fd >= 0) {
+ if (nfd) *nfd = fd;
+ return 0;
+ }
+ return -1;
+}
+/* }}} */
+
/* {{{ sapi_module_struct apache_sapi_module
*/
static sapi_module_struct apache_sapi_module = {
@@ -382,7 +399,11 @@
unblock_alarms, /* Unblock interruptions */
#endif
- STANDARD_SAPI_MODULE_PROPERTIES
+ NULL, /* default post reader
+*/
+ NULL, /* treat data */
+ NULL, /* exe location */
+ 0, /* ini ignore
+*/
+ sapi_apache_get_fd
};
/* }}} */
Index: php4/sapi/thttpd/thttpd.c
diff -u php4/sapi/thttpd/thttpd.c:1.77 php4/sapi/thttpd/thttpd.c:1.78
--- php4/sapi/thttpd/thttpd.c:1.77 Fri Nov 8 08:29:32 2002
+++ php4/sapi/thttpd/thttpd.c Tue Nov 26 00:15:55 2002
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: thttpd.c,v 1.77 2002/11/08 13:29:32 sas Exp $ */
+/* $Id: thttpd.c,v 1.78 2002/11/26 05:15:55 sas Exp $ */
#include "php.h"
#include "SAPI.h"
@@ -382,6 +382,12 @@
return SUCCESS;
}
+static int sapi_thttpd_get_fd(int *nfd TSRMLS_DC)
+{
+ if (nfd) *nfd = TG(hc)->conn_fd;
+ return 0;
+}
+
static sapi_module_struct thttpd_sapi_module = {
"thttpd",
"thttpd",
@@ -411,7 +417,11 @@
NULL, /*
Block interruptions */
NULL, /*
Unblock interruptions */
- STANDARD_SAPI_MODULE_PROPERTIES
+ NULL,
+ NULL,
+ NULL,
+ 0,
+ sapi_thttpd_get_fd
};
static void thttpd_module_main(int show_source TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c
yohgaki Mon Nov 25 21:15:59 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/pgsql pgsql.c
Log:
MFH
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.244 php4/ext/pgsql/pgsql.c:1.244.2.1
--- php4/ext/pgsql/pgsql.c:1.244Tue Nov 12 04:07:36 2002
+++ php4/ext/pgsql/pgsql.c Mon Nov 25 21:15:58 2002
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.244 2002/11/12 09:07:36 yohgaki Exp $ */
+/* $Id: pgsql.c,v 1.244.2.1 2002/11/26 02:15:58 yohgaki Exp $ */
#include
@@ -2710,15 +2710,13 @@
case 3:
if (isdigit(*sp)) /* state=4 */
{
- unsigned int v,i;
- unsigned char buf[4]; /* 000 + '\0' */
-
+ unsigned char *start, *end, buf[4]; /* 000 +
+'\0' */
+
bp -= 3;
- for (i = 0; i < 3; i++)
- buf[i] = *((sp-2)+i);
- buf[i] = '\0';
- sscanf(buf, "%03o", &v);
- *bp = v;
+ memcpy(buf, sp-2, 3);
+ buf[3] = '\0';
+ start = buf;
+ *bp = (unsigned char)strtoul(start, (char
+**)&end, 8);
buflen -= 3;
state = 0;
}
@@ -2730,9 +2728,8 @@
break;
}
}
- buffer = erealloc(buffer, buflen);
- if (buffer == NULL)
- return NULL;
+ buffer = erealloc(buffer, buflen+1);
+ buffer[buflen] = '\0';
*retbuflen = buflen;
return buffer;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c
yohgaki Mon Nov 25 21:13:35 2002 EDT Modified files: /php4/ext/pgsql pgsql.c Log: Remove a warning Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.248 php4/ext/pgsql/pgsql.c:1.249 --- php4/ext/pgsql/pgsql.c:1.248Sun Nov 24 20:38:29 2002 +++ php4/ext/pgsql/pgsql.c Mon Nov 25 21:13:35 2002 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: pgsql.c,v 1.248 2002/11/25 01:38:29 yohgaki Exp $ */ +/* $Id: pgsql.c,v 1.249 2002/11/26 02:13:35 yohgaki Exp $ */ #include @@ -2714,7 +2714,7 @@ memcpy(buf, sp-2, 3); buf[3] = '\0'; start = buf; - *bp = (unsigned char)strtoul(start, &end, 8); + *bp = (unsigned char)strtoul(start, (char +**)&end, 8); buflen -= 3; state = 0; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008-php4.2.3.phpt 009.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt
iliaa Mon Nov 25 18:20:05 2002 EDT Modified files: /php4/ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008-php4.2.3.phpt 009.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt Log: MFH (test failure if session.serialize_handler is not set to php). Index: php4/ext/session/tests/001.phpt diff -u php4/ext/session/tests/001.phpt:1.8 php4/ext/session/tests/001.phpt:1.9 --- php4/ext/session/tests/001.phpt:1.8 Thu Oct 3 12:14:54 2002 +++ php4/ext/session/tests/001.phpt Mon Nov 25 18:20:05 2002 @@ -6,6 +6,7 @@ session.use_cookies=0 session.cache_limiter= register_globals=1 +session.serialize_handler=php --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008-php4.2.3.phpt 009.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt
iliaa Mon Nov 25 18:19:20 2002 EDT Modified files: (Branch: PHP_4_3) /php4/ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008-php4.2.3.phpt 009.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt Log: Set serialize_handler to php to prevent test failures. Index: php4/ext/session/tests/001.phpt diff -u php4/ext/session/tests/001.phpt:1.8 php4/ext/session/tests/001.phpt:1.8.2.1 --- php4/ext/session/tests/001.phpt:1.8 Thu Oct 3 12:14:54 2002 +++ php4/ext/session/tests/001.phpt Mon Nov 25 18:19:18 2002 @@ -6,6 +6,7 @@ session.use_cookies=0 session.cache_limiter= register_globals=1 +session.serialize_handler=php --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd config.m4 /ext/gd/libgd gdxpm.c
iliaa Mon Nov 25 18:12:15 2002 EDT Modified files: (Branch: PHP_4_3) /php4/ext/gdconfig.m4 /php4/ext/gd/libgd gdxpm.c Log: MFH (fixed a compile failure when --with-xpm-dir is used). Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.120.2.3 php4/ext/gd/config.m4:1.120.2.4 --- php4/ext/gd/config.m4:1.120.2.3 Sun Nov 17 19:43:48 2002 +++ php4/ext/gd/config.m4 Mon Nov 25 18:12:15 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.120.2.3 2002/11/18 00:43:48 sniper Exp $ +dnl $Id: config.m4,v 1.120.2.4 2002/11/25 23:12:15 iliaa Exp $ dnl dnl @@ -112,7 +112,7 @@ fi for i in include include/X11; do - test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/$i + test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/include done if test -z "$GD_XPM_INC"; then Index: php4/ext/gd/libgd/gdxpm.c diff -u php4/ext/gd/libgd/gdxpm.c:1.2 php4/ext/gd/libgd/gdxpm.c:1.2.2.1 --- php4/ext/gd/libgd/gdxpm.c:1.2 Wed Oct 30 12:54:36 2002 +++ php4/ext/gd/libgd/gdxpm.c Mon Nov 25 18:12:15 2002 @@ -20,7 +20,7 @@ #else -#include "xpm.h" +#include #include gdImagePtr -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard ftp_fopen_wrapper.c
sesser Mon Nov 25 17:58:26 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard ftp_fopen_wrapper.c
Log:
MFH
Index: php4/ext/standard/ftp_fopen_wrapper.c
diff -u php4/ext/standard/ftp_fopen_wrapper.c:1.38.2.1
php4/ext/standard/ftp_fopen_wrapper.c:1.38.2.2
--- php4/ext/standard/ftp_fopen_wrapper.c:1.38.2.1 Mon Nov 25 17:01:46 2002
+++ php4/ext/standard/ftp_fopen_wrapper.c Mon Nov 25 17:58:26 2002
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.38.2.1 2002/11/25 22:01:46 iliaa Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.38.2.2 2002/11/25 22:58:26 sesser Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -149,6 +149,8 @@
#endif
char *tpath, *ttpath, *hoststart=NULL;
size_t file_size = 0;
+
+ tmp_line[0] = '\0';
if (strchr(mode, 'a') || strchr(mode, '+')) {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "FTP does not
support simultaneous read/write connections.");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard ftp_fopen_wrapper.c
sesser Mon Nov 25 17:53:58 2002 EDT
Modified files:
/php4/ext/standard ftp_fopen_wrapper.c
Log:
tmp_line was possible uninitialised, resulting in crap error messages.
Index: php4/ext/standard/ftp_fopen_wrapper.c
diff -u php4/ext/standard/ftp_fopen_wrapper.c:1.39
php4/ext/standard/ftp_fopen_wrapper.c:1.40
--- php4/ext/standard/ftp_fopen_wrapper.c:1.39 Mon Nov 25 17:00:52 2002
+++ php4/ext/standard/ftp_fopen_wrapper.c Mon Nov 25 17:53:57 2002
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.39 2002/11/25 22:00:52 iliaa Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.40 2002/11/25 22:53:57 sesser Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -149,6 +149,8 @@
#endif
char *tpath, *ttpath, *hoststart=NULL;
size_t file_size = 0;
+
+ tmp_line[0] = '\0';
if (strchr(mode, 'a') || strchr(mode, '+')) {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "FTP does not
support simultaneous read/write connections.");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard ftp_fopen_wrapper.c
iliaa Mon Nov 25 17:01:46 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard ftp_fopen_wrapper.c
Log:
MFH
Index: php4/ext/standard/ftp_fopen_wrapper.c
diff -u php4/ext/standard/ftp_fopen_wrapper.c:1.38
php4/ext/standard/ftp_fopen_wrapper.c:1.38.2.1
--- php4/ext/standard/ftp_fopen_wrapper.c:1.38 Thu Nov 7 22:02:51 2002
+++ php4/ext/standard/ftp_fopen_wrapper.c Mon Nov 25 17:01:46 2002
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.38 2002/11/08 03:02:51 iliaa Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.38.2.1 2002/11/25 22:01:46 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -402,21 +402,32 @@
php_stream_write_string(stream, "/");
}
php_stream_write_string(stream, "\r\n");
+
+ /* open the data channel */
+ if (hoststart == NULL) {
+ hoststart = resource->host;
+ }
+ datastream = php_stream_sock_open_host(hoststart, portno, SOCK_STREAM, 0, 0);
+ if (datastream == NULL) {
+ goto errexit;
+ }
+ result = GET_FTP_RESULT(stream);
+ if (result != 150) {
+ /* Could not retrieve or send the file
+* this data will only be sent to us after connection on the data port
+was initiated.
+*/
+ php_stream_close(datastream);
+ datastream = NULL;
+ goto errexit;
+ }
+
/* close control connection if not in ssl mode */
if (!use_ssl) {
php_stream_write_string(stream, "QUIT\r\n");
php_stream_close(stream);
stream = NULL;
}
-
- /* open the data channel */
- if (hoststart == NULL) {
- hoststart = resource->host;
- }
- datastream = php_stream_sock_open_host(hoststart, portno, SOCK_STREAM, 0, 0);
- if (datastream == NULL)
- goto errexit;
php_stream_context_set(datastream, context);
php_stream_notify_progress_init(context, 0, file_size);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard ftp_fopen_wrapper.c
iliaa Mon Nov 25 17:00:53 2002 EDT
Modified files:
/php4/ext/standard ftp_fopen_wrapper.c
Log:
Added a check to determine if the file can be retrieved or sent.
This check also prevents incorrect error reporting in the event the retrieval
or the sending of the file cannot be accomplished.
Index: php4/ext/standard/ftp_fopen_wrapper.c
diff -u php4/ext/standard/ftp_fopen_wrapper.c:1.38
php4/ext/standard/ftp_fopen_wrapper.c:1.39
--- php4/ext/standard/ftp_fopen_wrapper.c:1.38 Thu Nov 7 22:02:51 2002
+++ php4/ext/standard/ftp_fopen_wrapper.c Mon Nov 25 17:00:52 2002
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.38 2002/11/08 03:02:51 iliaa Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.39 2002/11/25 22:00:52 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -402,21 +402,32 @@
php_stream_write_string(stream, "/");
}
php_stream_write_string(stream, "\r\n");
+
+ /* open the data channel */
+ if (hoststart == NULL) {
+ hoststart = resource->host;
+ }
+ datastream = php_stream_sock_open_host(hoststart, portno, SOCK_STREAM, 0, 0);
+ if (datastream == NULL) {
+ goto errexit;
+ }
+ result = GET_FTP_RESULT(stream);
+ if (result != 150) {
+ /* Could not retrieve or send the file
+* this data will only be sent to us after connection on the data port
+was initiated.
+*/
+ php_stream_close(datastream);
+ datastream = NULL;
+ goto errexit;
+ }
+
/* close control connection if not in ssl mode */
if (!use_ssl) {
php_stream_write_string(stream, "QUIT\r\n");
php_stream_close(stream);
stream = NULL;
}
-
- /* open the data channel */
- if (hoststart == NULL) {
- hoststart = resource->host;
- }
- datastream = php_stream_sock_open_host(hoststart, portno, SOCK_STREAM, 0, 0);
- if (datastream == NULL)
- goto errexit;
php_stream_context_set(datastream, context);
php_stream_notify_progress_init(context, 0, file_size);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/oci8 oci8.c
maxim Mon Nov 25 13:14:46 2002 EDT
Modified files:
/php4/ext/oci8 oci8.c
Log:
Bug# 16798. Tests appreciated by someone with Oracle 8.0
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.192 php4/ext/oci8/oci8.c:1.193
--- php4/ext/oci8/oci8.c:1.192 Thu Nov 21 16:26:18 2002
+++ php4/ext/oci8/oci8.cMon Nov 25 13:14:45 2002
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.192 2002/11/21 21:26:18 maxim Exp $ */
+/* $Id: oci8.c,v 1.193 2002/11/25 18:14:45 maxim Exp $ */
/* TODO list:
*
@@ -628,7 +628,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.192 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.193 $");
#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
@@ -3391,7 +3391,7 @@
OCI_DEFAULT,
OCI_TEMP_CLOB,
OCI_ATTR_NOCACHE,
- OCI_DURATION_STATEMENT));
+ OCI_DURATION_SESSION));
if (connection->error) {
oci_error(connection->pError, "OCILobCreateTemporary",
connection->error);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mbstring config.m4
moriyoshi Mon Nov 25 12:44:14 2002 EDT Modified files: /php4/ext/mbstring config.m4 Log: @- Enabled mbregex by default when mbstring is also enabled (Moriyoshi) Index: php4/ext/mbstring/config.m4 diff -u php4/ext/mbstring/config.m4:1.29 php4/ext/mbstring/config.m4:1.30 --- php4/ext/mbstring/config.m4:1.29Sat Nov 23 15:08:44 2002 +++ php4/ext/mbstring/config.m4 Mon Nov 25 12:44:14 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.29 2002/11/23 20:08:44 moriyoshi Exp $ +dnl $Id: config.m4,v 1.30 2002/11/25 17:44:14 moriyoshi Exp $ dnl PHP_ARG_ENABLE(mbstring, whether to enable multibyte string support, @@ -34,10 +34,9 @@ PHP_NEW_EXTENSION(mbstring, mbfilter_ja.c mbfilter_cn.c mbfilter_tw.c mbfilter_kr.c mbfilter_ru.c mbfilter.c mbstring.c mbregex.c php_mbregex.c html_entities.c php_unicode.c mb_gpc.c, $ext_shared) fi - PHP_ARG_ENABLE(mbregex, whether to enable multibyte regex support, -[ --enable-mbregexEnable multibyte regex support], no, no) +[ --disable-mbregex Disable multibyte regex support], yes, no) -if test "$PHP_MBREGEX" != "no" ; then +if test "$PHP_MBREGEX" != "no" -a "$PHP_MBSTRING" != "no"; then AC_DEFINE(HAVE_MBREGEX, 1, [whether to have multibyte regex support]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mbstring mbstring.c
moriyoshi Mon Nov 25 12:21:51 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c
Log:
Forgot to adjust this one
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.151 php4/ext/mbstring/mbstring.c:1.152
--- php4/ext/mbstring/mbstring.c:1.151 Mon Nov 25 12:20:19 2002
+++ php4/ext/mbstring/mbstring.cMon Nov 25 12:21:50 2002
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.151 2002/11/25 17:20:19 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.152 2002/11/25 17:21:50 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -721,7 +721,7 @@
}
/* }}} */
-/* {{{ static void mbstring_globals_dtor() */
+/* {{{ static void _php_mb_globals_dtor() */
static void _php_mb_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
{
#if HAVE_MBREGEX
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mbstring mbstring.c php_mbregex.c php_mbregex.h
moriyoshi Mon Nov 25 12:20:20 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c php_mbregex.c php_mbregex.h
Log:
Renamed several internal functions for consistency
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.150 php4/ext/mbstring/mbstring.c:1.151
--- php4/ext/mbstring/mbstring.c:1.150 Sat Nov 23 15:14:33 2002
+++ php4/ext/mbstring/mbstring.cMon Nov 25 12:20:19 2002
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.150 2002/11/23 20:14:33 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.151 2002/11/25 17:20:19 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -80,6 +80,11 @@
#endif
/* }}} */
+/* {{{ prototypes */
+static void _php_mb_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC);
+static void _php_mb_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC);
+/* }}} */
+
/* {{{ php_mb_default_identify_list[] */
#if defined(HAVE_MBSTR_JA)
static const enum mbfl_no_encoding php_mb_default_identify_list[] = {
@@ -680,8 +685,7 @@
/* }}} */
/* {{{ module global initialize handler */
-static void
-php_mb_init_globals(zend_mbstring_globals *pglobals TSRMLS_DC)
+static void _php_mb_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
{
MBSTRG(language) = mbfl_no_language_uni;
MBSTRG(current_language) = MBSTRG(language);
@@ -712,17 +716,16 @@
MBSTRG(encoding_translation) = 0;
pglobals->outconv = NULL;
#if HAVE_MBREGEX
- php_mb_regex_globals_ctor(pglobals TSRMLS_CC);
+ _php_mb_regex_globals_ctor(pglobals TSRMLS_CC);
#endif
}
/* }}} */
/* {{{ static void mbstring_globals_dtor() */
-static void
-mbstring_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
+static void _php_mb_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
{
#if HAVE_MBREGEX
- php_mb_regex_globals_dtor(pglobals TSRMLS_CC);
+ _php_mb_regex_globals_dtor(pglobals TSRMLS_CC);
#endif
}
/* }}} */
@@ -732,10 +735,10 @@
{
#ifdef ZTS
ts_allocate_id(&mbstring_globals_id, sizeof(zend_mbstring_globals),
- (ts_allocate_ctor) php_mb_init_globals,
- (ts_allocate_dtor) mbstring_globals_dtor);
+ (ts_allocate_ctor) _php_mb_globals_ctor,
+ (ts_allocate_dtor) _php_mb_globals_dtor);
#else
- php_mb_init_globals(&mbstring_globals TSRMLS_CC);
+ _php_mb_globals_ctor(&mbstring_globals TSRMLS_CC);
#endif
REGISTER_INI_ENTRIES();
@@ -787,7 +790,7 @@
#ifdef ZTS
ts_free_id(mbstring_globals_id);
#else
- mbstring_globals_dtor(&mbstring_globals TSRMLS_CC);
+ _php_mb_globals_dtor(&mbstring_globals TSRMLS_CC);
#endif
return SUCCESS;
Index: php4/ext/mbstring/php_mbregex.c
diff -u php4/ext/mbstring/php_mbregex.c:1.22 php4/ext/mbstring/php_mbregex.c:1.23
--- php4/ext/mbstring/php_mbregex.c:1.22Sat Nov 23 15:14:33 2002
+++ php4/ext/mbstring/php_mbregex.c Mon Nov 25 12:20:19 2002
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.c,v 1.22 2002/11/23 20:14:33 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.23 2002/11/25 17:20:19 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -91,8 +91,8 @@
}
/* }}} */
-/* {{{ php_mb_regex_globals_ctor */
-void php_mb_regex_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
+/* {{{ _php_mb_regex_globals_ctor */
+void _php_mb_regex_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
{
MBSTRG(default_mbctype) = MBCTYPE_EUC;
MBSTRG(current_mbctype) = MBCTYPE_EUC;
@@ -105,8 +105,8 @@
}
/* }}} */
-/* {{{ php_mb_regex_globals_dtor */
-void php_mb_regex_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
+/* {{{ _php_mb_regex_globals_dtor */
+void _php_mb_regex_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC)
{
zend_hash_destroy(&MBSTRG(ht_rc));
}
Index: php4/ext/mbstring/php_mbregex.h
diff -u php4/ext/mbstring/php_mbregex.h:1.4 php4/ext/mbstring/php_mbregex.h:1.5
--- php4/ext/mbstring/php_mbregex.h:1.4 Thu Nov 14 13:54:42 2002
+++ php4/ext/mbstring/php_mbregex.h Mon Nov 25 12:20:20 2002
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.h,v 1.4 2002/11/14 18:54:42 moriyoshi Exp $ */
+/* $Id: php_mbregex.h,v 1.5 2002/11/25 17:20:20 moriyoshi Exp $ */
#ifndef _PHP_MBREGEX_H
#define _PHP_MBREGEX_H
@@ -85,8 +85,8 @@
PHP_MSHUTDOWN_FUNCTION(mb_regex);
PHP_RINIT_FUNCTION(mb_regex);
PHP_RSHUTDOWN_FUNCTION(mb_regex);
-void php_mb_regex_globals_ctor(zend_mbstring_globals_ptr pglobals TSRMLS_DC);
-void php_mb_regex_globals_dtor(zend_mbstring_globals_ptr pglobals TSRMLS_DC);
+void _php_mb_regex_globals_ctor(zend_mbstring_globals_ptr pglobals TSRMLS_DC);
+void _php_mb_regex_globals_dtor(zend_mbstring_globals_ptr pglobals TSRMLS_DC);
PHP_FUNCTION(mb_regex_
[PHP-CVS] cvs: php4 /ext/gd/libgd gd_gd2.c
iliaa Mon Nov 25 09:25:52 2002 EDT
Modified files:
/php4/ext/gd/libgd gd_gd2.c
Log:
Removed un-needed zlib check.
Index: php4/ext/gd/libgd/gd_gd2.c
diff -u php4/ext/gd/libgd/gd_gd2.c:1.5 php4/ext/gd/libgd/gd_gd2.c:1.6
--- php4/ext/gd/libgd/gd_gd2.c:1.5 Sun Nov 24 20:51:53 2002
+++ php4/ext/gd/libgd/gd_gd2.c Mon Nov 25 09:25:52 2002
@@ -18,10 +18,6 @@
#include "gd.h"
#include "gdhelpers.h"
-/* 2.03: gd2 is no longer mandatory */
-/* JCE - test after including gd.h so that HAVE_LIBZ can be set in
- * a config.h file included by gd.h */
-#ifdef HAVE_ZLIB
#include
#define TRUE 1
@@ -926,18 +922,3 @@
out->gd_free (out);
return rv;
}
-
-#else /* no HAVE_ZLIB */
-gdImagePtr
-gdImageCreateFromGd2 (FILE * inFile)
-{
- fprintf(stderr,"GD2 support is not available - no libz\n");
- return NULL;
-}
-gdImagePtr
-gdImageCreateFromGd2Ctx (gdIOCtxPtr in)
-{
- fprintf(stderr,"GD2 support is not available - no libz\n");
- return NULL;
-}
-#endif /* HAVE_ZLIB */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / EXTENSIONS /ext/calendar cal_unix.c calendar.c easter.c /ext/ctype ctype.c php_ctype.h /ext/fdf fdf.c /ext/imap php_imap.c php_imap.h /ext/mime_magic mime_magic.c /ext/ncurses ncurses.c ncurses_fe.c ncurses_functions.c php_ncurses.h php_ncurses_fe.h /ext/standard levenshtein.c url_scanner.c /ext/zlib zlib_fopen_wrapper.c /main php_logos.c
hholzgraMon Nov 25 07:30:29 2002 EDT Modified files: /php4 EXTENSIONS /php4/ext/calendar cal_unix.c calendar.c easter.c /php4/ext/ctype ctype.c php_ctype.h /php4/ext/fdf fdf.c /php4/ext/imap php_imap.c php_imap.h /php4/ext/mime_magicmime_magic.c /php4/ext/ncurses ncurses.c ncurses_fe.c ncurses_functions.c php_ncurses.h php_ncurses_fe.h /php4/ext/standard levenshtein.c url_scanner.c /php4/ext/zlib zlib_fopen_wrapper.c /php4/main php_logos.c Log: email address change Index: php4/EXTENSIONS diff -u php4/EXTENSIONS:1.51 php4/EXTENSIONS:1.52 --- php4/EXTENSIONS:1.51Sat Nov 2 07:58:12 2002 +++ php4/EXTENSIONS Mon Nov 25 07:30:21 2002 @@ -197,7 +197,7 @@ STATUS: Unknown --- EXTENSION: bz2 -PRIMARY MAINTAINER: Hartmut Holzgraefe <[EMAIL PROTECTED]> +PRIMARY MAINTAINER: Hartmut Holzgraefe <[EMAIL PROTECTED]> MAINTENANCE: Odd Fixes STATUS: Working SINCE: 4.0.3 @@ -215,7 +215,7 @@ SINCE: 4.0.6 --- EXTENSION: calendar -PRIMARY MAINTAINER: Hartmut Holzgraefe <[EMAIL PROTECTED]> +PRIMARY MAINTAINER: Hartmut Holzgraefe <[EMAIL PROTECTED]> MAINTENANCE: Odd Fixes STATUS: Working --- @@ -235,7 +235,7 @@ SINCE: 4.0.5 --- EXTENSION: ctype -PRIMARY MAINTAINER: Hartmut Holzgraefe <[EMAIL PROTECTED]> +PRIMARY MAINTAINER: Hartmut Holzgraefe <[EMAIL PROTECTED]> MAINTENANCE: Maintained STATUS: Working --- @@ -469,7 +469,7 @@ STATUS: Working --- EXTENSION: xslt -PRIMARY MAINTAINER: Hartmut Holzgraefe <[EMAIL PROTECTED]> +PRIMARY MAINTAINER: Hartmut Holzgraefe <[EMAIL PROTECTED]> MAINTENANCE: Odd Fixes STATUS: Working (mostly) --- @@ -489,7 +489,7 @@ STATUS: Working --- EXTENSION: zziplib -PRIMARY MAINTAINER: Hartmut Holzgraefe <[EMAIL PROTECTED]> +PRIMARY MAINTAINER: Hartmut Holzgraefe <[EMAIL PROTECTED]> MAINTENANCE: Odd Fixes STATUS: Working SINCE: 4.0.5 Index: php4/ext/calendar/cal_unix.c diff -u php4/ext/calendar/cal_unix.c:1.12 php4/ext/calendar/cal_unix.c:1.13 --- php4/ext/calendar/cal_unix.c:1.12 Thu Sep 19 17:51:34 2002 +++ php4/ext/calendar/cal_unix.cMon Nov 25 07:30:22 2002 @@ -14,7 +14,7 @@ +--+ | Authors: Shane Caraveo <[EMAIL PROTECTED]> | | Colin Viebrock<[EMAIL PROTECTED]> | - | Hartmut Holzgraefe<[EMAIL PROTECTED]> | + | Hartmut Holzgraefe<[EMAIL PROTECTED]>| +--+ */ /* $Id: */ Index: php4/ext/calendar/calendar.c diff -u php4/ext/calendar/calendar.c:1.30 php4/ext/calendar/calendar.c:1.31 --- php4/ext/calendar/calendar.c:1.30 Thu Nov 7 09:52:02 2002 +++ php4/ext/calendar/calendar.cMon Nov 25 07:30:22 2002 @@ -14,11 +14,11 @@ +--+ | Authors: Shane Caraveo <[EMAIL PROTECTED]> | | Colin Viebrock<[EMAIL PROTECTED]> | - | Hartmut Holzgraefe<[EMAIL PROTECTED]> | + | Hartmut Holzgraefe<[EMAIL PROTECTED]>| | Wez Furlong <[EMAIL PROTECTED]>| +--+ */ -/* $Id: calendar.c,v 1.30 2002/11/07 14:52:02 wez Exp $ */ +/* $Id: calendar.c,v 1.31 2002/11/25 12:30:22 hholzgra Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" Index: php4/ext/calendar/easter.c diff -u php4/ext/calendar/easter.c:1.12 php4/ext/calendar/easter.c:1.13 --- php4/ext/calendar/easter.c:1.12 Thu Sep 19 17:51:34 2002 +++ php4/ext/calendar/easter.c Mon Nov 25 07:30:22 2002 @@ -14,7 +14,7 @@ +--+ | Authors: Shane Caraveo <[EMAIL PROTECTED]> | | Colin Viebrock<[EMAIL
