[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/soap/ php_http.c
fmk Wed, 13 Jan 2010 05:32:02 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=293487
Log:
Don't free soap_headers just before comparing the length. This causes
SoapClient to fail when requesting a URL
Changed paths:
U php/php-src/branches/PHP_5_3/ext/soap/php_http.c
Modified: php/php-src/branches/PHP_5_3/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_3/ext/soap/php_http.c2010-01-13 05:16:53 UTC
(rev 293486)
+++ php/php-src/branches/PHP_5_3/ext/soap/php_http.c2010-01-13 05:32:02 UTC
(rev 293487)
@@ -759,7 +759,6 @@
smart_str_0(soap_headers);
err = php_stream_write(stream, soap_headers.c,
soap_headers.len);
- smart_str_free(soap_headers);
if (err != soap_headers.len) {
if (request != buf) {efree(request);}
php_stream_close(stream);
@@ -770,6 +769,7 @@
smart_str_free(soap_headers_z);
return FALSE;
}
+ smart_str_free(soap_headers);
} else {
add_soap_fault(this_ptr, HTTP, Failed to create stream??,
NULL, NULL TSRMLS_CC);
smart_str_free(soap_headers_z);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/soap/ php_http.c
fmk Wed, 13 Jan 2010 07:22:21 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=293490
Log:
MFB. Don't free soap_headers just before comparing the length. This causes
SoapClient to fail when requesting a URL
Changed paths:
U php/php-src/trunk/ext/soap/php_http.c
Modified: php/php-src/trunk/ext/soap/php_http.c
===
--- php/php-src/trunk/ext/soap/php_http.c 2010-01-13 06:55:03 UTC (rev
293489)
+++ php/php-src/trunk/ext/soap/php_http.c 2010-01-13 07:22:21 UTC (rev
293490)
@@ -764,7 +764,6 @@
smart_str_0(soap_headers);
err = php_stream_write(stream, soap_headers.c,
soap_headers.len);
- smart_str_free(soap_headers);
if (err != soap_headers.len) {
if (request != buf) {efree(request);}
php_stream_close(stream);
@@ -778,6 +777,7 @@
smart_str_free(soap_headers_z);
return FALSE;
}
+ smart_str_free(soap_headers);
} else {
add_soap_fault(this_ptr, HTTP, Failed to create stream??,
NULL, NULL TSRMLS_CC);
smart_str_free(soap_headers_z);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/soap/ php_http.c
fmk Wed, 13 Jan 2010 07:26:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=293491
Log:
MFB. Don't free soap_headers just before comparing the length. This causes
SoapClient to fail when requesting a URL
Changed paths:
U php/php-src/branches/PHP_5_2/ext/soap/php_http.c
Modified: php/php-src/branches/PHP_5_2/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_2/ext/soap/php_http.c2010-01-13 07:22:21 UTC
(rev 293490)
+++ php/php-src/branches/PHP_5_2/ext/soap/php_http.c2010-01-13 07:26:08 UTC
(rev 293491)
@@ -709,7 +709,6 @@
smart_str_0(soap_headers);
err = php_stream_write(stream, soap_headers.c,
soap_headers.len);
- smart_str_free(soap_headers);
if (err != soap_headers.len) {
if (request != buf) {efree(request);}
php_stream_close(stream);
@@ -720,6 +719,7 @@
smart_str_free(soap_headers_z);
return FALSE;
}
+ smart_str_free(soap_headers);
} else {
add_soap_fault(this_ptr, HTTP, Failed to create stream??,
NULL, NULL TSRMLS_CC);
smart_str_free(soap_headers_z);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/soap/ php_http.c
Hi Kalle, Done. It has been too long since I have committed anything :-) Thanks for reminding me. - Frank Kalle Sommer Nielsen wrote: Hi Frank 2010/1/13 Frank M. Kromann f...@php.net: fmk Wed, 13 Jan 2010 05:32:02 + Revision: http://svn.php.net/viewvc?view=revisionrevision=293487 Log: Don't free soap_headers just before comparing the length. This causes SoapClient to fail when requesting a URL Please merge this change into trunk (HEAD) and PHP_5_2 if needed. -- Frank M. Kromann, M.Sc.E.E. Web by Pixel, Inc. Phone: +1 949 742 7533 Cell: +1 949 702 1794 Denmark: +45 88 33 64 80
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/ming ming.c php_ming.h
Hi Derick, I'm working on optimizing the version checking to make it possible to compile and link against at least 0.3, but older versions might not be possible as it would create too much spaghetti code. - Frank On Fri, 25 Jul 2008, Derick Rethans wrote: On Thu, 24 Jul 2008, Frank M. Kromann wrote: fmk Thu Jul 24 08:02:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/ming ming.c php_ming.h Log: Syncronize the ming extension with libming 0.4 [DOC] PHP 5.3 requires libming 0.4 Is that really necessary? libming 0.3 has been working fine, and it's the latest that debian unstable has - could you please see if it'd be possible to support that as well? This is even more useful as PHP 5.3 doesn't compile against libming 0.4. In order to be able to run both 5.2 and 5.3 I need both version of the lib - something that many distributions don't do. regards, Derick -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- 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/ming ming.c php_ming.h
Hi Antony, That's next step. I'm going to upgrade the version checks so we can get rid of some of the many #ifdef's and clean the code even more. - Frank On 24.07.2008 12:02, Frank M. Kromann wrote: fmk Thu Jul 24 08:02:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/ming ming.c php_ming.h Log: Syncronize the ming extension with libming 0.4 [DOC] PHP 5.3 requires libming 0.4 Didn't you forget to update version checks in config.m4 ? -- Wbr, Antony Dovgal -- 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/ming ming.c
fmk Thu Jul 24 08:22:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ming ming.c
Log:
Add a couple of methods to SWFVideoStream
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.8.2.6r2=1.79.2.4.2.8.2.7diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.79.2.4.2.8.2.6
php-src/ext/ming/ming.c:1.79.2.4.2.8.2.7
--- php-src/ext/ming/ming.c:1.79.2.4.2.8.2.6Thu Jul 24 08:17:54 2008
+++ php-src/ext/ming/ming.c Thu Jul 24 08:22:47 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: ming.c,v 1.79.2.4.2.8.2.6 2008/07/24 08:17:54 tony2001 Exp $ */
+/* $Id: ming.c,v 1.79.2.4.2.8.2.7 2008/07/24 08:22:47 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3519,6 +3519,48 @@
}
/* }}} */
+/* {{{ proto swfvideostream::nextFrame */
+PHP_METHOD(swfvideostream, nextFrame)
+{
+ if (ZEND_NUM_ARGS() != 0) {
+ WRONG_PARAM_COUNT;
+ }
+
+ RETURN_LONG(SWFVideoStream_nextFrame(getVideoStream(getThis()
TSRMLS_CC)));
+}
+/* }}} */
+
+/* {{{ proto swfvideostream::setFrameMode */
+PHP_METHOD(swfvideostream, setFrameMode)
+{
+ long mode;
+ SWFVideoStream stream = getVideoStream(getThis() TSRMLS_CC);
+ if(!stream)
+php_error(E_ERROR, getVideoStream returned NULL);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, mode) ==
FAILURE) {
+ return;
+ }
+
+ RETURN_LONG(SWFVideoStream_setFrameMode(stream, mode));
+}
+/* }}} */
+
+/* {{{ proto swfvideostream::seek(frame, whence) */
+PHP_METHOD(swfvideostream, seek)
+{
+ long frame, whence;
+ SWFVideoStream stream = getVideoStream(getThis() TSRMLS_CC);
+ if(!stream)
+php_error(E_ERROR, getVideoStream returned NULL);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ll, frame,
whence) == FAILURE) {
+ return;
+ }
+
+ RETURN_LONG(SWFVideoStream_seek(stream, frame, whence));
+}
+/* }}} */
static zend_function_entry swfvideostream_functions[] = {
@@ -3526,6 +3568,9 @@
PHP_ME(swfvideostream, setdimension, NULL, 0)
PHP_ME(swfvideostream, getnumframes, NULL, 0)
PHP_ME(swfvideostream, hasaudio, NULL, 0)
+ PHP_ME(swfvideostream, setFrameMode, NULL, 0)
+ PHP_ME(swfvideostream, nextFrame, NULL, 0)
+ PHP_ME(swfvideostream, seek, NULL, 0)
{ NULL, NULL, NULL }
};
--
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/ming ming.c php_ming.h
Hi Antony, Thanks for the offer. I might hold you to that :-) I'll sync with head tomorrow. It's 1:30 am here and I have an 8am meeting with a customer. I'd better get some sleep before I mess too much with that. - Frank On 24.07.2008 12:22, Frank M. Kromann wrote: Hi Antony, That's next step. Let me know if you need any help with that. I'm going to upgrade the version checks so we can get rid of some of the many #ifdef's and clean the code even more. Btw, don't forget to sync HEAD, or an innocent bunny will be executed =) -- Wbr, Antony Dovgal -- 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/ming ming.c
fmk Thu Jul 24 18:39:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ming ming.c
Log:
Fix parameter types for a couple of methods
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.8.2.7r2=1.79.2.4.2.8.2.8diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.79.2.4.2.8.2.7
php-src/ext/ming/ming.c:1.79.2.4.2.8.2.8
--- php-src/ext/ming/ming.c:1.79.2.4.2.8.2.7Thu Jul 24 08:22:47 2008
+++ php-src/ext/ming/ming.c Thu Jul 24 18:39:41 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: ming.c,v 1.79.2.4.2.8.2.7 2008/07/24 08:22:47 fmk Exp $ */
+/* $Id: ming.c,v 1.79.2.4.2.8.2.8 2008/07/24 18:39:41 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -43,7 +43,7 @@
void destroySWFBlock(SWFBlock block);
#endif
-static const zend_function_entry ming_functions[] = {
+static zend_function_entry ming_functions[] = {
PHP_FALIAS(ming_setcubicthreshold, ming_setCubicThreshold, NULL)
PHP_FALIAS(ming_setscale, ming_setScale, NULL)
PHP_FALIAS(ming_useswfversion, ming_useSWFVersion, NULL)
@@ -2595,7 +2595,7 @@
SWFBlur blur;
int ret;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ddd, blurX,
blurY, passes) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ddl, blurX,
blurY, passes) == FAILURE) {
return;
}
@@ -3452,6 +3452,8 @@
case 0:
stream = newSWFVideoStream();
break;
+ default: // warn
+ return;
}
if(stream) {
@@ -3910,7 +3912,6 @@
PHP_METHOD(swfmovie, saveToFile)
{
zval *x;
- long zlimit = 0;
int limit = -1;
#if !defined(HAVE_NEW_MING)
int oldval = INT_MIN;
@@ -3949,7 +3950,7 @@
Saves the movie. 'where' can be stream and the movie will be saved there
otherwise it is treated as string and written in file with that name */
PHP_METHOD(swfmovie, save)
{
- zval *x, *zlimit = NULL;
+ zval *x;
int limit = -1;
#if !defined(HAVE_NEW_MING)
int oldval = INT_MIN;
@@ -5182,7 +5183,7 @@
SWFInput input = NULL;
SWFMovieClip mc = getSprite(getThis() TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zdd, zfile,
rate, skip) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zd|d, zfile,
rate, skip) == FAILURE) {
return;
}
--
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) /main config.w32.h
fmk Tue Jun 24 06:01:54 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main config.w32.h Log: Not sure why this file was comitted? I was running a CVS update and then I see commit messages with my user id! Reverting the changes. http://cvs.php.net/viewvc.cgi/php-src/main/config.w32.h?r1=1.85.4.1.2.3.2.1r2=1.85.4.1.2.3.2.2diff_format=u Index: php-src/main/config.w32.h diff -u php-src/main/config.w32.h:1.85.4.1.2.3.2.1 php-src/main/config.w32.h:1.85.4.1.2.3.2.2 --- php-src/main/config.w32.h:1.85.4.1.2.3.2.1 Tue Jun 24 04:31:05 2008 +++ php-src/main/config.w32.h Tue Jun 24 06:01:53 2008 @@ -1,20 +1,26 @@ /* - Build Configuration Template for Win32. - $Id: config.w32.h,v 1.85.4.1.2.3.2.1 2008/06/24 04:31:05 fmk Exp $ + Build Configuration for Win32. + This has only been tested with MS VisualC++ 6 (and later). + + $Id: config.w32.h,v 1.85.4.1.2.3.2.2 2008/06/24 06:01:53 fmk Exp $ */ /* Default PHP / PEAR directories */ -#define PHP_CONFIG_FILE_PATH (getenv(SystemRoot))?getenv(SystemRoot): #define CONFIGURATION_FILE_PATH php.ini -#define PEAR_INSTALLDIR C:\\php5\\pear -#define PHP_BINDIR C:\\php5 -#define PHP_DATADIR C:\\php5 -#define PHP_EXTENSION_DIR C:\\php5 -#define PHP_INCLUDE_PATH .;C:\\php5\\pear -#define PHP_LIBDIR C:\\php5 -#define PHP_LOCALSTATEDIR C:\\php5 -#define PHP_PREFIX C:\\php5 -#define PHP_SYSCONFDIR C:\\php5 +#define PEAR_INSTALLDIR c:\\php5\\pear +#define PHP_BINDIR c:\\php5 +#define PHP_CONFIG_FILE_PATH (getenv(SystemRoot))?getenv(SystemRoot): +#define PHP_CONFIG_FILE_SCAN_DIR +#define PHP_DATADIR c:\\php5 +#define PHP_EXTENSION_DIR c:\\php5 +#define PHP_INCLUDE_PATH .;c:\\php5\\pear +#define PHP_LIBDIR c:\\php5 +#define PHP_LOCALSTATEDIR c:\\php5 +#define PHP_PREFIX c:\\php5 +#define PHP_SYSCONFDIR c:\\php5 + +/* Enable / Disable BCMATH extension (default: enabled) */ +#define HAVE_BCMATH 1 /* Enable / Disable crypt() function (default: enabled) */ #define HAVE_CRYPT 1 @@ -23,12 +29,68 @@ #define PHP_MD5_CRYPT 1 #define PHP_BLOWFISH_CRYPT 0 +/* Enable / Disable CALENDAR extension (default: enabled) */ +#define HAVE_CALENDAR 1 + +/* Enable / Disable CTYPE extension (default: enabled) */ +#define HAVE_CTYPE 1 + +/* Enable / Disable FTP extension (default: enabled) */ +#define HAVE_FTP 1 + +/* Enable / Disable MBSTRING extension (default: disabled) */ +/* #define HAVE_MBSTRING 0 */ +/* #define HAVE_MBREGEX 0 */ +/* #define HAVE_MBSTR_CN 0 */ +/* #define HAVE_MBSTR_JA 0 */ +/* #define HAVE_MBSTR_KR 0 */ +/* #define HAVE_MBSTR_RU 0 */ +/* #define HAVE_MBSTR_TW 0 */ + +/* If you have the .Net SDK in your include path, define this + * to compile .Net support into your COM extension. */ +#define HAVE_MSCOREE_H 0 + +/* Enable / Disable ODBC extension (default: enabled) */ +#define HAVE_UODBC 1 + +/* Enable / Disable PCRE extension (default: enabled) */ +#define HAVE_BUNDLED_PCRE 1 +#define HAVE_PCRE 1 + +/* Enable / Disable SESSION extension (default: enabled) */ +#define HAVE_PHP_SESSION 1 + +/* Enable / Disable TOKENIZER extension (default: enabled) */ +#define HAVE_TOKENIZER 1 + +/* Enable / Disable WDDX extension (default: enabled) */ +#define HAVE_WDDX 1 + +/* Enable / Disable XML extensions (default: enabled) */ +#define HAVE_LIBXML 1 +#define HAVE_DOM 1 +#define HAVE_SIMPLEXML 1 +#define HAVE_XML 1 +#define HAVE_XMLREADER 1 +#define HAVE_XMLWRITER 1 +#define HAVE_LIBXML_PARSER_H 1 + +/* Enable / Disable ZLIB extension (default: enabled) */ +#define HAVE_ZLIB 1 +#define HAVE_ZLIB_H 1 + +/* Enable / Disable SQLite extension (default: enabled) */ +#define HAVE_SQLITE 1 + /* PHP Runtime Configuration */ +#define FORCE_CGI_REDIRECT 1 #define PHP_URL_FOPEN 1 #define PHP_SAFE_MODE 0 #define MAGIC_QUOTES 0 #define USE_CONFIG_FILE 1 #define DEFAULT_SHORT_OPEN_TAG 1 +#define ENABLE_PATHINFO_CHECK 1 /* Platform-Specific Configuration. Should not be changed. */ #define PHP_SIGCHILD 0 @@ -54,7 +116,6 @@ #define NEED_ISBLANK 1 #define DISCARD_PATH 0 #undef HAVE_SETITIMER -#undef HAVE_SIGSETJMP #undef HAVE_IODBC #define HAVE_LIBDL 1 #define HAVE_GETTIMEOFDAY 1 @@ -85,7 +146,7 @@ #define HAVE_LOCALECONV 1 #define HAVE_LOCALE_H 1 #ifndef HAVE_LIBBIND -# define HAVE_SETVBUF 1 +#define HAVE_SETVBUF 1 #endif #define HAVE_SHUTDOWN 1 #define HAVE_SNPRINTF 1 @@ -107,16 +168,11 @@ #undef HAVE_SYS_WAIT_H #define HAVE_SYSLOG_H 1 #undef HAVE_UNISTD_H -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDARG_H 1 -#undef HAVE_ALLOCA_H -#undef HAVE_KILL -#define HAVE_GETPID 1 +#define HAVE_LIBDL 1 #define HAVE_LIBM 1 #define HAVE_CUSERID 0 #undef HAVE_RINT #define HAVE_STRFTIME 1 -#define SIZEOF_SHORT 2 /* int and long are stll 32bit in 64bit compiles */ #define SIZEOF_INT 4 #define SIZEOF_LONG 4 @@ -135,6 +191,12 @@ #define HAVE_GLOB #define PHP_SHLIB_SUFFIX dll #define HAVE_SQLDATASOURCES +#define POSIX_MALLOC_THRESHOLD 10 + +/* + * defining HAVE_SOCKLEN_T prevents
[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c
fmk Sun Feb 4 21:24:28 2007 UTC
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
MFB: #39213
Fix for '' returned as ' '.
This only works with FreeTDS as microsofts library returns a length of 1 for
an empty string!
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.167r2=1.168diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.167 php-src/ext/mssql/php_mssql.c:1.168
--- php-src/ext/mssql/php_mssql.c:1.167 Mon Jan 1 09:29:25 2007
+++ php-src/ext/mssql/php_mssql.c Sun Feb 4 21:24:28 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.167 2007/01/01 09:29:25 sebastian Exp $ */
+/* $Id: php_mssql.c,v 1.168 2007/02/04 21:24:28 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -821,7 +821,7 @@
static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int
offset,zval *result, int column_type TSRMLS_DC)
{
- if (dbdatlen(mssql_ptr-link,offset) == 0) {
+ if (dbdata(mssql_ptr-link,offset) == NULL
dbdatlen(mssql_ptr-link,offset) == 0) {
ZVAL_NULL(result);
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.w32
fmk Sun Feb 4 00:21:52 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mbstring config.w32 Log: Fix win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.10.2.1.2.3r2=1.10.2.1.2.4diff_format=u Index: php-src/ext/mbstring/config.w32 diff -u php-src/ext/mbstring/config.w32:1.10.2.1.2.3 php-src/ext/mbstring/config.w32:1.10.2.1.2.4 --- php-src/ext/mbstring/config.w32:1.10.2.1.2.3Sat Nov 4 17:25:14 2006 +++ php-src/ext/mbstring/config.w32 Sun Feb 4 00:21:51 2007 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.10.2.1.2.3 2006/11/04 17:25:14 fmk Exp $ +// $Id: config.w32,v 1.10.2.1.2.4 2007/02/04 00:21:51 fmk Exp $ // vim:ft=javascript ARG_ENABLE(mbstring, multibyte string functions, no); @@ -29,6 +29,7 @@ mbfilter_iso8859_2.c mbfilter_iso8859_3.c mbfilter_iso8859_4.c \ mbfilter_iso8859_5.c mbfilter_iso8859_6.c mbfilter_iso8859_7.c \ mbfilter_iso8859_8.c mbfilter_iso8859_9.c mbfilter_jis.c \ + mbfilter_iso2022_jp_ms.c \ mbfilter_koi8r.c mbfilter_qprint.c mbfilter_sjis.c mbfilter_ucs2.c \ mbfilter_ucs4.c mbfilter_uhc.c mbfilter_utf16.c mbfilter_utf32.c \ mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_utf8.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring config.w32
fmk Sun Feb 4 00:23:32 2007 UTC Modified files: /php-src/ext/mbstring config.w32 Log: MFB: Fix win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.12r2=1.13diff_format=u Index: php-src/ext/mbstring/config.w32 diff -u php-src/ext/mbstring/config.w32:1.12 php-src/ext/mbstring/config.w32:1.13 --- php-src/ext/mbstring/config.w32:1.12Sat Nov 4 17:25:37 2006 +++ php-src/ext/mbstring/config.w32 Sun Feb 4 00:23:32 2007 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.12 2006/11/04 17:25:37 fmk Exp $ +// $Id: config.w32,v 1.13 2007/02/04 00:23:32 fmk Exp $ // vim:ft=javascript ARG_ENABLE(mbstring, multibyte string functions, no); @@ -28,6 +28,7 @@ mbfilter_iso8859_2.c mbfilter_iso8859_3.c mbfilter_iso8859_4.c \ mbfilter_iso8859_5.c mbfilter_iso8859_6.c mbfilter_iso8859_7.c \ mbfilter_iso8859_8.c mbfilter_iso8859_9.c mbfilter_jis.c \ + mbfilter_iso2022_jp_ms.c \ mbfilter_koi8r.c mbfilter_qprint.c mbfilter_sjis.c mbfilter_ucs2.c \ mbfilter_ucs4.c mbfilter_uhc.c mbfilter_utf16.c mbfilter_utf32.c \ mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_utf8.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_dblib dblib_stmt.c
fmk Mon Jan 15 01:56:09 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_dblib dblib_stmt.c
Log:
Fix mysql - dblib
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/dblib_stmt.c?r1=1.6.2.2.2.3r2=1.6.2.2.2.4diff_format=u
Index: php-src/ext/pdo_dblib/dblib_stmt.c
diff -u php-src/ext/pdo_dblib/dblib_stmt.c:1.6.2.2.2.3
php-src/ext/pdo_dblib/dblib_stmt.c:1.6.2.2.2.4
--- php-src/ext/pdo_dblib/dblib_stmt.c:1.6.2.2.2.3 Sun Jan 14 16:57:50 2007
+++ php-src/ext/pdo_dblib/dblib_stmt.c Mon Jan 15 01:56:09 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dblib_stmt.c,v 1.6.2.2.2.3 2007/01/14 16:57:50 iliaa Exp $ */
+/* $Id: dblib_stmt.c,v 1.6.2.2.2.4 2007/01/15 01:56:09 fmk Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -250,9 +250,9 @@
return 1;
}
-static int dblib_mysql_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC)
+static int dblib_dblib_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC)
{
- pdo_dblib_stmt *S = (pdo_mysql_stmt*)stmt-driver_data;
+ pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt-driver_data;
if (S-rows) {
free_rows(S TSRMLS_CC);
@@ -273,6 +273,6 @@
NULL, /* get attr */
NULL, /* meta */
NULL, /* nextrow */
- dblib_mysql_stmt_cursor_closer
+ dblib_dblib_stmt_cursor_closer
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build Makefile
fmk Sat Jan 13 03:32:14 2007 UTC Modified files: /php-src/win32/buildMakefile Log: Kill warnings when mt is not installed or is found as the tape command under cygwin http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.41r2=1.42diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.41 php-src/win32/build/Makefile:1.42 --- php-src/win32/build/Makefile:1.41 Mon Jan 8 00:26:35 2007 +++ php-src/win32/build/MakefileSat Jan 13 03:32:14 2007 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.41 2007/01/08 00:26:35 edink Exp $ +# $Id: Makefile,v 1.42 2007/01/13 03:32:14 fmk Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -55,8 +55,13 @@ # $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc +!if $(MT) == +_VC_MANIFEST_EMBED_EXE= +_VC_MANIFEST_EMBED_DLL= +!else _VC_MANIFEST_EMBED_EXE= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;1 _VC_MANIFEST_EMBED_DLL= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;2 +!endif $(PHPDLL_RES): win32\build\template.rc $(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION=\PHP Script Interpreter\ \ -- 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) /win32/build Makefile
fmk Sat Jan 13 03:32:28 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/win32/buildMakefile Log: MFH: Kill warnings when mt is not installed or is found as the tape command under cygwin http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.4r2=1.35.2.1.2.5diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.35.2.1.2.4 php-src/win32/build/Makefile:1.35.2.1.2.5 --- php-src/win32/build/Makefile:1.35.2.1.2.4 Mon Jan 8 00:27:06 2007 +++ php-src/win32/build/MakefileSat Jan 13 03:32:28 2007 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.35.2.1.2.4 2007/01/08 00:27:06 edink Exp $ +# $Id: Makefile,v 1.35.2.1.2.5 2007/01/13 03:32:28 fmk Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -55,8 +55,13 @@ # $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc +!if $(MT) == +_VC_MANIFEST_EMBED_EXE= +_VC_MANIFEST_EMBED_DLL= +!else _VC_MANIFEST_EMBED_EXE= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;1 _VC_MANIFEST_EMBED_DLL= $(MT) -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;2 +!endif $(PHPDLL_RES): win32\build\template.rc $(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION=\PHP Script Interpreter\ \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ming ming.c
fmk Tue Dec 5 21:46:32 2006 UTC
Modified files:
/php-src/ext/ming ming.c
Log:
Remove PHP4.x stuff
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.90r2=1.91diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.90 php-src/ext/ming/ming.c:1.91
--- php-src/ext/ming/ming.c:1.90Tue Dec 5 21:02:28 2006
+++ php-src/ext/ming/ming.c Tue Dec 5 21:46:32 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: ming.c,v 1.90 2006/12/05 21:02:28 fmk Exp $ */
+/* $Id: ming.c,v 1.91 2006/12/05 21:46:32 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4133,25 +4133,6 @@
/* {{{ todo PHP_MINIT_FUNCTION(ming)
*/
-#if PHP_API_VERSION == 20020918
-static php4_fix_funcnames(char *class_name, zend_function_entry *funcs)
-{
- zend_function_entry *pf = funcs;
- char *pname;
-
- while(funcs-fname) {
- if( strcmp(funcs-fname,__construct) == 0 ) {
- pname=strdup(class_name);
- } else {
- pname=strdup(funcs-fname);
- }
- funcs-fname=pname;
- while(*pname) { *pname=tolower(*pname);pname++;}
- funcs++;
- }
-}
-#endif
-
/* custom error handler propagates ming errors up to php */
static void php_ming_error(const char *msg, ...)
{
--
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) /main php_scandir.c /win32 readdir.h
fmk Fri Dec 1 20:17:50 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main php_scandir.c
/php-src/win32 readdir.h
Log:
Fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/main/php_scandir.c?r1=1.12.2.1.2.1r2=1.12.2.1.2.2diff_format=u
Index: php-src/main/php_scandir.c
diff -u php-src/main/php_scandir.c:1.12.2.1.2.1
php-src/main/php_scandir.c:1.12.2.1.2.2
--- php-src/main/php_scandir.c:1.12.2.1.2.1 Thu Nov 30 16:10:38 2006
+++ php-src/main/php_scandir.c Fri Dec 1 20:17:50 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_scandir.c,v 1.12.2.1.2.1 2006/11/30 16:10:38 iliaa Exp $ */
+/* $Id: php_scandir.c,v 1.12.2.1.2.2 2006/12/01 20:17:50 fmk Exp $ */
#include php_scandir.h
@@ -32,6 +32,7 @@
#ifndef HAVE_SCANDIR
#ifdef PHP_WIN32
+#include win32/param.h
#include win32/readdir.h
#endif
http://cvs.php.net/viewvc.cgi/php-src/win32/readdir.h?r1=1.8.6.1r2=1.8.6.2diff_format=u
Index: php-src/win32/readdir.h
diff -u php-src/win32/readdir.h:1.8.6.1 php-src/win32/readdir.h:1.8.6.2
--- php-src/win32/readdir.h:1.8.6.1 Fri Nov 10 11:20:47 2006
+++ php-src/win32/readdir.h Fri Dec 1 20:17:50 2006
@@ -17,6 +17,8 @@
#include sys/types.h
#include direct.h
+#define php_readdir_r readdir_r
+
/* struct dirent - same as Unix */
struct dirent {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_scandir.c /win32 readdir.h
fmk Fri Dec 1 20:22:11 2006 UTC
Modified files:
/php-src/main php_scandir.c
/php-src/win32 readdir.h
Log:
MFB: Fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/main/php_scandir.c?r1=1.14r2=1.15diff_format=u
Index: php-src/main/php_scandir.c
diff -u php-src/main/php_scandir.c:1.14 php-src/main/php_scandir.c:1.15
--- php-src/main/php_scandir.c:1.14 Thu Nov 30 16:10:48 2006
+++ php-src/main/php_scandir.c Fri Dec 1 20:22:11 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_scandir.c,v 1.14 2006/11/30 16:10:48 iliaa Exp $ */
+/* $Id: php_scandir.c,v 1.15 2006/12/01 20:22:11 fmk Exp $ */
#include php_scandir.h
@@ -32,6 +32,7 @@
#ifndef HAVE_SCANDIR
#ifdef PHP_WIN32
+#include win32/param.h
#include win32/readdir.h
#endif
http://cvs.php.net/viewvc.cgi/php-src/win32/readdir.h?r1=1.9r2=1.10diff_format=u
Index: php-src/win32/readdir.h
diff -u php-src/win32/readdir.h:1.9 php-src/win32/readdir.h:1.10
--- php-src/win32/readdir.h:1.9 Fri Nov 10 11:20:58 2006
+++ php-src/win32/readdir.h Fri Dec 1 20:22:11 2006
@@ -17,6 +17,8 @@
#include sys/types.h
#include direct.h
+#define php_readdir_r readdir_r
+
/* struct dirent - same as Unix */
struct dirent {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sqlite/libsqlite/src date.c /ext/zip/lib zip_dirent.c
fmk Fri Dec 1 20:24:58 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/sqlite/libsqlite/src date.c /php-src/ext/zip/libzip_dirent.c Log: Fix win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/libsqlite/src/date.c?r1=1.3.4.1.2.1r2=1.3.4.1.2.2diff_format=u Index: php-src/ext/sqlite/libsqlite/src/date.c diff -u php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.1 php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.2 --- php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.1 Thu Nov 30 16:38:37 2006 +++ php-src/ext/sqlite/libsqlite/src/date.c Fri Dec 1 20:24:58 2006 @@ -16,7 +16,7 @@ ** sqliteRegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: date.c,v 1.3.4.1.2.1 2006/11/30 16:38:37 iliaa Exp $ +** $Id: date.c,v 1.3.4.1.2.2 2006/12/01 20:24:58 fmk Exp $ ** ** NOTES: ** @@ -53,7 +53,9 @@ #include stdlib.h #include assert.h #include time.h +#ifndef PHP_WIN32 #include main/php_reentrancy.h +#endif #ifndef SQLITE_OMIT_DATETIME_FUNCS http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_dirent.c?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/zip/lib/zip_dirent.c diff -u php-src/ext/zip/lib/zip_dirent.c:1.1.2.1 php-src/ext/zip/lib/zip_dirent.c:1.1.2.2 --- php-src/ext/zip/lib/zip_dirent.c:1.1.2.1Thu Nov 30 16:38:37 2006 +++ php-src/ext/zip/lib/zip_dirent.cFri Dec 1 20:24:58 2006 @@ -33,6 +33,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include main/php_reentrancy.h #include stdio.h #include stdlib.h #include string.h @@ -45,7 +46,6 @@ #include zip.h #include zipint.h -#include main/php_reentrancy.h static time_t _zip_d2u_time(int, int); static char *_zip_readfpstr(FILE *, unsigned int, int, struct zip_error *); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ming config.m4 ming.c
fmk Thu Nov 9 09:19:20 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ming config.m4 ming.c
Log:
Revert patch for warnings about missing headers. These are fixed in the
latest version of libming.
Sync code for SWFMovie::streamMP3. This function will now return the number
of frames in the file.
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.22.2.6.2.1r2=1.22.2.6.2.2diff_format=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.22.2.6.2.1
php-src/ext/ming/config.m4:1.22.2.6.2.2
--- php-src/ext/ming/config.m4:1.22.2.6.2.1 Fri Nov 3 18:57:49 2006
+++ php-src/ext/ming/config.m4 Thu Nov 9 09:19:20 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.22.2.6.2.1 2006/11/03 18:57:49 helly Exp $
+dnl $Id: config.m4,v 1.22.2.6.2.2 2006/11/09 09:19:20 fmk Exp $
dnl
PHP_ARG_WITH(ming, for MING support,
@@ -84,9 +84,6 @@
], [])
CPPFLAGS=$old_CPPFLAGS
- AC_CHECK_HEADERS([ming/displaylist.h])
- AC_CHECK_HEADERS([ming/movie.h])
-
PHP_NEW_EXTENSION(ming, ming.c, $ext_shared)
PHP_SUBST(MING_SHARED_LIBADD)
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.3r2=1.79.2.4.2.4diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.79.2.4.2.3
php-src/ext/ming/ming.c:1.79.2.4.2.4
--- php-src/ext/ming/ming.c:1.79.2.4.2.3Fri Nov 3 18:57:49 2006
+++ php-src/ext/ming/ming.c Thu Nov 9 09:19:20 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ming.c,v 1.79.2.4.2.3 2006/11/03 18:57:49 helly Exp $ */
+/* $Id: ming.c,v 1.79.2.4.2.4 2006/11/09 09:19:20 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -36,12 +36,6 @@
#include stdio.h
#include math.h
#include ming.h
-#ifdef HAVE_MING_DISPLAYLIST_H
-# include ming/displaylist.h
-#endif
-#ifdef HAVE_MING_MOVIE_H
-# include ming/movie.h
-#endif
#define FLOAT_Z_DVAL_PP(x) ((float)Z_DVAL_PP(x))
#define BYTE_Z_LVAL_PP(x) ((byte)Z_LVAL_PP(x))
@@ -2482,17 +2476,31 @@
/* }}} */
#ifdef HAVE_NEW_MING
-/* {{{ proto void swfmovie::streamMP3(mixed file)
- Sets sound stream of the SWF movie. The parameter can be stream or string.
*/
+/* {{{ proto int swfmovie::streamMP3(mixed file [, float skip])
+ Sets sound stream of the SWF movie. The parameter can be stream or string.
Retuens the number of frames. */
PHP_METHOD(swfmovie, streamMP3)
{
- zval **zfile;
+ zval **zfile, **zskip;
+ float skip;
SWFSoundStream sound;
SWFInput input;
SWFMovie movie = getMovie(getThis() TSRMLS_CC);
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, zfile) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ switch (ZEND_NUM_ARGS()) {
+ case 1:
+ if(zend_get_parameters_ex(1, zfile) == FAILURE)
+ WRONG_PARAM_COUNT;
+ skip = 0;
+ break;
+ case 2:
+ if(zend_get_parameters_ex(2, zfile, zskip) == FAILURE)
+ WRONG_PARAM_COUNT;
+ convert_to_double_ex(zskip);
+ skip = Z_DVAL_PP(zskip);
+ break;
+ default:
+ WRONG_PARAM_COUNT;
+ break;
}
if (Z_TYPE_PP(zfile) != IS_RESOURCE) {
@@ -2504,7 +2512,8 @@
}
sound = newSWFSoundStream_fromInput(input);
- SWFMovie_setSoundStream(movie, sound);
+ SWFMovie_setSoundStreamAt(movie, sound, skip);
+ RETURN_LONG(SWFSoundStream_getFrames(sound));
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ming config.m4 ming.c
fmk Thu Nov 9 09:24:17 2006 UTC
Modified files:
/php-src/ext/ming config.m4 ming.c
Log:
MFB 5_2:
Revert patch for warnings about missing headers. These are fixed in the
latest version of libming.
Sync code for SWFMovie::streamMP3. This function will now return the number
of frames in the file.
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.27 php-src/ext/ming/config.m4:1.28
--- php-src/ext/ming/config.m4:1.27 Fri Nov 3 18:57:36 2006
+++ php-src/ext/ming/config.m4 Thu Nov 9 09:24:17 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.27 2006/11/03 18:57:36 helly Exp $
+dnl $Id: config.m4,v 1.28 2006/11/09 09:24:17 fmk Exp $
dnl
PHP_ARG_WITH(ming, for MING support,
@@ -84,9 +84,6 @@
], [])
CPPFLAGS=$old_CPPFLAGS
- AC_CHECK_HEADERS([ming/displaylist.h])
- AC_CHECK_HEADERS([ming/movie.h])
-
PHP_NEW_EXTENSION(ming, ming.c, $ext_shared)
PHP_SUBST(MING_SHARED_LIBADD)
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.88r2=1.89diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.88 php-src/ext/ming/ming.c:1.89
--- php-src/ext/ming/ming.c:1.88Fri Nov 3 18:57:36 2006
+++ php-src/ext/ming/ming.c Thu Nov 9 09:24:17 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ming.c,v 1.88 2006/11/03 18:57:36 helly Exp $ */
+/* $Id: ming.c,v 1.89 2006/11/09 09:24:17 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -36,12 +36,6 @@
#include stdio.h
#include math.h
#include ming.h
-#ifdef HAVE_MING_DISPLAYLIST_H
-# include ming/displaylist.h
-#endif
-#ifdef HAVE_MING_MOVIE_H
-# include ming/movie.h
-#endif
#define FLOAT_Z_DVAL_PP(x) ((float)Z_DVAL_PP(x))
#define BYTE_Z_LVAL_PP(x) ((byte)Z_LVAL_PP(x))
@@ -2480,17 +2474,31 @@
/* }}} */
#ifdef HAVE_NEW_MING
-/* {{{ proto void swfmovie::streamMP3(mixed file)
- Sets sound stream of the SWF movie. The parameter can be stream or string.
*/
+/* {{{ proto int swfmovie::streamMP3(mixed file [, float skip])
+ Sets sound stream of the SWF movie. The parameter can be stream or string.
Retuens the number of frames. */
PHP_METHOD(swfmovie, streamMP3)
{
- zval **zfile;
+ zval **zfile, **zskip;
+ float skip;
SWFSoundStream sound;
SWFInput input;
SWFMovie movie = getMovie(getThis() TSRMLS_CC);
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, zfile) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ switch (ZEND_NUM_ARGS()) {
+ case 1:
+ if(zend_get_parameters_ex(1, zfile) == FAILURE)
+ WRONG_PARAM_COUNT;
+ skip = 0;
+ break;
+ case 2:
+ if(zend_get_parameters_ex(2, zfile, zskip) == FAILURE)
+ WRONG_PARAM_COUNT;
+ convert_to_double_ex(zskip);
+ skip = Z_DVAL_PP(zskip);
+ break;
+ default:
+ WRONG_PARAM_COUNT;
+ break;
}
if (Z_TYPE_PP(zfile) != IS_RESOURCE) {
@@ -2502,7 +2510,8 @@
}
sound = newSWFSoundStream_fromInput(input);
- SWFMovie_setSoundStream(movie, sound);
+ SWFMovie_setSoundStreamAt(movie, sound, skip);
+ RETURN_LONG(SWFSoundStream_getFrames(sound));
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.w32
fmk Sat Nov 4 17:25:14 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mbstring config.w32 Log: Fix win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.10.2.1.2.2r2=1.10.2.1.2.3diff_format=u Index: php-src/ext/mbstring/config.w32 diff -u php-src/ext/mbstring/config.w32:1.10.2.1.2.2 php-src/ext/mbstring/config.w32:1.10.2.1.2.3 --- php-src/ext/mbstring/config.w32:1.10.2.1.2.2Thu Sep 21 16:37:20 2006 +++ php-src/ext/mbstring/config.w32 Sat Nov 4 17:25:14 2006 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.10.2.1.2.2 2006/09/21 16:37:20 masugata Exp $ +// $Id: config.w32,v 1.10.2.1.2.3 2006/11/04 17:25:14 fmk Exp $ // vim:ft=javascript ARG_ENABLE(mbstring, multibyte string functions, no); @@ -21,8 +21,8 @@ ADD_SOURCES(ext/mbstring/libmbfl/filters, html_entities.c \ mbfilter_7bit.c mbfilter_ascii.c mbfilter_base64.c mbfilter_big5.c \ mbfilter_byte2.c mbfilter_byte4.c mbfilter_cp1251.c mbfilter_cp1252.c \ - mbfilter_cp866.c mbfilter_cp932.c mbfilter_cp936.c mbfilter_euc_cn.c \ - mbfilter_euc_jp.c mbfilter_euc_jp_win.c mbfilter_euc_kr.c \ + mbfilter_cp866.c mbfilter_cp932.c mbfilter_cp936.c mbfilter_cp51932.c \ + mbfilter_euc_cn.c mbfilter_euc_jp.c mbfilter_euc_jp_win.c mbfilter_euc_kr.c \ mbfilter_euc_tw.c mbfilter_htmlent.c mbfilter_hz.c mbfilter_iso2022_kr.c \ mbfilter_iso8859_1.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c \ mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring config.w32
fmk Sat Nov 4 17:25:37 2006 UTC Modified files: /php-src/ext/mbstring config.w32 Log: Fix win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.11r2=1.12diff_format=u Index: php-src/ext/mbstring/config.w32 diff -u php-src/ext/mbstring/config.w32:1.11 php-src/ext/mbstring/config.w32:1.12 --- php-src/ext/mbstring/config.w32:1.11Fri Dec 23 13:53:30 2005 +++ php-src/ext/mbstring/config.w32 Sat Nov 4 17:25:37 2006 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.11 2005/12/23 13:53:30 hirokawa Exp $ +// $Id: config.w32,v 1.12 2006/11/04 17:25:37 fmk Exp $ // vim:ft=javascript ARG_ENABLE(mbstring, multibyte string functions, no); @@ -20,8 +20,8 @@ ADD_SOURCES(ext/mbstring/libmbfl/filters, html_entities.c \ mbfilter_7bit.c mbfilter_ascii.c mbfilter_base64.c mbfilter_big5.c \ mbfilter_byte2.c mbfilter_byte4.c mbfilter_cp1251.c mbfilter_cp1252.c \ - mbfilter_cp866.c mbfilter_cp932.c mbfilter_cp936.c mbfilter_euc_cn.c \ - mbfilter_euc_jp.c mbfilter_euc_jp_win.c mbfilter_euc_kr.c \ + mbfilter_cp866.c mbfilter_cp932.c mbfilter_cp936.c mbfilter_cp51932.c \ + mbfilter_euc_cn.c mbfilter_euc_jp.c mbfilter_euc_jp_win.c mbfilter_euc_kr.c \ mbfilter_euc_tw.c mbfilter_htmlent.c mbfilter_hz.c mbfilter_iso2022_kr.c \ mbfilter_iso8859_1.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c \ mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/ming config.m4 ming.c
Helle All, What problem are you trying to solve here. This fix will break the windows buld and can be solved by adding the missing headers to ming.h in the nxt release (where they should be in the first place). - Frank helly Fri Nov 3 18:57:36 2006 UTC Modified files: /php-src/ext/ming config.m4 ming.c Log: - Include new headers only if present http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.26r2=1.27diff_format=u Index: php-src/ext/ming/config.m4 diff -u php-src/ext/ming/config.m4:1.26 php-src/ext/ming/config.m4:1.27 --- php-src/ext/ming/config.m4:1.26 Wed Dec 21 21:43:25 2005 +++ php-src/ext/ming/config.m4Fri Nov 3 18:57:36 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.26 2005/12/21 21:43:25 sniper Exp $ +dnl $Id: config.m4,v 1.27 2006/11/03 18:57:36 helly Exp $ dnl PHP_ARG_WITH(ming, for MING support, @@ -84,6 +84,9 @@ ], []) CPPFLAGS=$old_CPPFLAGS + AC_CHECK_HEADERS([ming/displaylist.h]) + AC_CHECK_HEADERS([ming/movie.h]) + PHP_NEW_EXTENSION(ming, ming.c, $ext_shared) PHP_SUBST(MING_SHARED_LIBADD) fi http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.87r2=1.88diff_format=u Index: php-src/ext/ming/ming.c diff -u php-src/ext/ming/ming.c:1.87 php-src/ext/ming/ming.c:1.88 --- php-src/ext/ming/ming.c:1.87 Fri Nov 3 14:06:33 2006 +++ php-src/ext/ming/ming.c Fri Nov 3 18:57:36 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: ming.c,v 1.87 2006/11/03 14:06:33 bjori Exp $ */ +/* $Id: ming.c,v 1.88 2006/11/03 18:57:36 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -36,8 +36,12 @@ #include stdio.h #include math.h #include ming.h -#include ming/displaylist.h -#include ming/movie.h +#ifdef HAVE_MING_DISPLAYLIST_H +# include ming/displaylist.h +#endif +#ifdef HAVE_MING_MOVIE_H +# include ming/movie.h +#endif #define FLOAT_Z_DVAL_PP(x) ((float)Z_DVAL_PP(x)) #define BYTE_Z_LVAL_PP(x) ((byte)Z_LVAL_PP(x)) -- 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.ini-dist php.ini-recommended /ext/fbsql php_fbsql.c php_fbsql.h
fmk Mon Aug 14 18:39:30 2006 UTC
Modified files:
/php-srcphp.ini-dist php.ini-recommended
/php-src/ext/fbsql php_fbsql.c php_fbsql.h
Log:
Cleanup before reusing failed persistant connection. Better formating of
timestamp and decimal values
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.251r2=1.252diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.251 php-src/php.ini-dist:1.252
--- php-src/php.ini-dist:1.251 Thu Aug 10 13:56:54 2006
+++ php-src/php.ini-distMon Aug 14 18:39:30 2006
@@ -1072,6 +1072,7 @@
[FrontBase]
;fbsql.allow_persistent = On
;fbsql.autocommit = On
+;fbsql.show_timestamp_decimals = Off
;fbsql.default_database =
;fbsql.default_database_password =
;fbsql.default_host =
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.200r2=1.201diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.200 php-src/php.ini-recommended:1.201
--- php-src/php.ini-recommended:1.200 Thu Aug 10 13:56:54 2006
+++ php-src/php.ini-recommended Mon Aug 14 18:39:30 2006
@@ -1103,6 +1103,7 @@
[FrontBase]
;fbsql.allow_persistent = On
;fbsql.autocommit = On
+;fbsql.show_timestamp_decimals = Off
;fbsql.default_database =
;fbsql.default_database_password =
;fbsql.default_host =
http://cvs.php.net/viewvc.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.119r2=1.120diff_format=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.119 php-src/ext/fbsql/php_fbsql.c:1.120
--- php-src/ext/fbsql/php_fbsql.c:1.119 Wed Jun 14 21:29:22 2006
+++ php-src/ext/fbsql/php_fbsql.c Mon Aug 14 18:39:30 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_fbsql.c,v 1.119 2006/06/14 21:29:22 bjori Exp $ */
+/* $Id: php_fbsql.c,v 1.120 2006/08/14 18:39:30 fmk Exp $ */
/* TODO:
*
@@ -58,6 +58,10 @@
#define HAVE_FBSQL 1
+#ifndef min
+# define min(a,b) ((a)(b)?(a):(b))
+#endif
+
#if HAVE_FBSQL
#include php_fbsql.h
#include signal.h
@@ -737,6 +741,7 @@
STD_PHP_INI_BOOLEAN (fbsql.allow_persistent,
1,PHP_INI_SYSTEM, OnUpdateBool, allowPersistent,
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_BOOLEAN (fbsql.generate_warnings,
0,PHP_INI_SYSTEM, OnUpdateBool, generateWarnings,
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_BOOLEAN (fbsql.autocommit,
1,PHP_INI_SYSTEM, OnUpdateBool, autoCommit,
zend_fbsql_globals, fbsql_globals)
+ STD_PHP_INI_BOOLEAN (fbsql.show_timestamp_decimals, 0,
PHP_INI_SYSTEM, OnUpdateBool, showTimestampDecimals,
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_ENTRY_EX (fbsql.max_persistent,
-1, PHP_INI_SYSTEM, OnUpdateLong, maxPersistent,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY_EX (fbsql.max_links,
128, PHP_INI_SYSTEM, OnUpdateLong, maxLinks,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY_EX (fbsql.max_connections,
128, PHP_INI_SYSTEM, OnUpdateLong, maxConnections,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
@@ -896,7 +901,26 @@
if (persistent) {
if (zend_hash_find(EG(persistent_list), name, strlen(name) +
1, (void **)lep) == SUCCESS)
{
+ FBCMetaData *md;
phpLink = (PHPFBLink*)lep-ptr;
+ // Check if connection still there.
+ md = fbcdcRollback(phpLink-connection);
+ if ( !mdOk(phpLink, md, Rollback;) ) {
+ if (FB_SQL_G(generateWarnings)) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, FrontBase link is not connected, ty to reconnect.);
+ }
+ // Make sure select_db will reconnect.
+ fbcmdRelease(md);
+ fbcdcClose(phpLink-connection);
+ fbcdcRelease(phpLink-connection);
+ free(phpLink-connection);
+ phpLink-connection = NULL;
+ if (phpLink-databaseName)
free(phpLink-databaseName);
+ phpLink-databaseName = NULL;
+ }
+ else {
+ fbcmdRelease(md);
+ }
}
else {
zend_rsrc_list_entry le;
@@ -2866,8 +2890,6 @@
case FB_Float:
case FB_Real:
case FB_Double:
- case
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended /ext/fbsql php_fbsql.c php_fbsql.h
fmk Mon Aug 14 18:40:08 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcphp.ini-dist php.ini-recommended
/php-src/ext/fbsql php_fbsql.c php_fbsql.h
Log:
MFH: Cleanup before reusing failed persistant connection. Better formating of
timestamp and decimal values
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.4r2=1.231.2.10.2.5diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231.2.10.2.4 php-src/php.ini-dist:1.231.2.10.2.5
--- php-src/php.ini-dist:1.231.2.10.2.4 Thu Aug 10 13:50:55 2006
+++ php-src/php.ini-distMon Aug 14 18:40:08 2006
@@ -1154,6 +1154,7 @@
[FrontBase]
;fbsql.allow_persistent = On
;fbsql.autocommit = On
+;fbsql.show_timestamp_decimals = Off
;fbsql.default_database =
;fbsql.default_database_password =
;fbsql.default_host =
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.3r2=1.179.2.11.2.4diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179.2.11.2.3
php-src/php.ini-recommended:1.179.2.11.2.4
--- php-src/php.ini-recommended:1.179.2.11.2.3 Thu Aug 10 13:50:55 2006
+++ php-src/php.ini-recommended Mon Aug 14 18:40:08 2006
@@ -1209,6 +1209,7 @@
[FrontBase]
;fbsql.allow_persistent = On
;fbsql.autocommit = On
+;fbsql.show_timestamp_decimals = Off
;fbsql.default_database =
;fbsql.default_database_password =
;fbsql.default_host =
http://cvs.php.net/viewvc.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.114.2.3.2.2r2=1.114.2.3.2.3diff_format=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.2
php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.3
--- php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.2 Thu Jun 15 18:33:07 2006
+++ php-src/ext/fbsql/php_fbsql.c Mon Aug 14 18:40:08 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_fbsql.c,v 1.114.2.3.2.2 2006/06/15 18:33:07 dmitry Exp $ */
+/* $Id: php_fbsql.c,v 1.114.2.3.2.3 2006/08/14 18:40:08 fmk Exp $ */
/* TODO:
*
@@ -58,6 +58,10 @@
#define HAVE_FBSQL 1
+#ifndef min
+# define min(a,b) ((a)(b)?(a):(b))
+#endif
+
#if HAVE_FBSQL
#include php_fbsql.h
#include signal.h
@@ -737,6 +741,7 @@
STD_PHP_INI_BOOLEAN (fbsql.allow_persistent,
1,PHP_INI_SYSTEM, OnUpdateBool, allowPersistent,
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_BOOLEAN (fbsql.generate_warnings,
0,PHP_INI_SYSTEM, OnUpdateBool, generateWarnings,
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_BOOLEAN (fbsql.autocommit,
1,PHP_INI_SYSTEM, OnUpdateBool, autoCommit,
zend_fbsql_globals, fbsql_globals)
+ STD_PHP_INI_BOOLEAN (fbsql.show_timestamp_decimals, 0,
PHP_INI_SYSTEM, OnUpdateBool, showTimestampDecimals,
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_ENTRY_EX (fbsql.max_persistent,
-1, PHP_INI_SYSTEM, OnUpdateLong, maxPersistent,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY_EX (fbsql.max_links,
128, PHP_INI_SYSTEM, OnUpdateLong, maxLinks,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY_EX (fbsql.max_connections,
128, PHP_INI_SYSTEM, OnUpdateLong, maxConnections,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
@@ -896,7 +901,26 @@
if (persistent) {
if (zend_hash_find(EG(persistent_list), name, strlen(name) +
1, (void **)lep) == SUCCESS)
{
+ FBCMetaData *md;
phpLink = (PHPFBLink*)lep-ptr;
+ // Check if connection still there.
+ md = fbcdcRollback(phpLink-connection);
+ if ( !mdOk(phpLink, md, Rollback;) ) {
+ if (FB_SQL_G(generateWarnings)) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, FrontBase link is not connected, ty to reconnect.);
+ }
+ // Make sure select_db will reconnect.
+ fbcmdRelease(md);
+ fbcdcClose(phpLink-connection);
+ fbcdcRelease(phpLink-connection);
+ free(phpLink-connection);
+ phpLink-connection = NULL;
+ if (phpLink-databaseName)
free(phpLink-databaseName);
+ phpLink-databaseName = NULL;
+ }
+ else {
+ fbcmdRelease(md);
+ }
}
else {
[PHP-CVS] cvs: php-src(PHP_5_1) / php.ini-dist php.ini-recommended /ext/fbsql php_fbsql.c php_fbsql.h
fmk Mon Aug 14 18:40:20 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcphp.ini-dist php.ini-recommended
/php-src/ext/fbsql php_fbsql.c php_fbsql.h
Log:
MFH: Cleanup before reusing failed persistant connection. Better formating of
timestamp and decimal values
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10r2=1.231.2.11diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231.2.10 php-src/php.ini-dist:1.231.2.11
--- php-src/php.ini-dist:1.231.2.10 Wed Feb 8 23:43:48 2006
+++ php-src/php.ini-distMon Aug 14 18:40:19 2006
@@ -1148,6 +1148,7 @@
[FrontBase]
;fbsql.allow_persistent = On
;fbsql.autocommit = On
+;fbsql.show_timestamp_decimals = Off
;fbsql.default_database =
;fbsql.default_database_password =
;fbsql.default_host =
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11r2=1.179.2.12diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179.2.11
php-src/php.ini-recommended:1.179.2.12
--- php-src/php.ini-recommended:1.179.2.11 Wed Feb 8 23:43:48 2006
+++ php-src/php.ini-recommended Mon Aug 14 18:40:19 2006
@@ -1206,6 +1206,7 @@
[FrontBase]
;fbsql.allow_persistent = On
;fbsql.autocommit = On
+;fbsql.show_timestamp_decimals = Off
;fbsql.default_database =
;fbsql.default_database_password =
;fbsql.default_host =
http://cvs.php.net/viewvc.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.114.2.3r2=1.114.2.4diff_format=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.114.2.3
php-src/ext/fbsql/php_fbsql.c:1.114.2.4
--- php-src/ext/fbsql/php_fbsql.c:1.114.2.3 Sun Jan 1 12:50:06 2006
+++ php-src/ext/fbsql/php_fbsql.c Mon Aug 14 18:40:20 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_fbsql.c,v 1.114.2.3 2006/01/01 12:50:06 sniper Exp $ */
+/* $Id: php_fbsql.c,v 1.114.2.4 2006/08/14 18:40:20 fmk Exp $ */
/* TODO:
*
@@ -58,6 +58,10 @@
#define HAVE_FBSQL 1
+#ifndef min
+# define min(a,b) ((a)(b)?(a):(b))
+#endif
+
#if HAVE_FBSQL
#include php_fbsql.h
#include signal.h
@@ -379,6 +383,7 @@
STD_PHP_INI_BOOLEAN (fbsql.allow_persistent,
1,PHP_INI_SYSTEM, OnUpdateBool, allowPersistent,
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_BOOLEAN (fbsql.generate_warnings,
0,PHP_INI_SYSTEM, OnUpdateBool, generateWarnings,
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_BOOLEAN (fbsql.autocommit,
1,PHP_INI_SYSTEM, OnUpdateBool, autoCommit,
zend_fbsql_globals, fbsql_globals)
+ STD_PHP_INI_BOOLEAN (fbsql.show_timestamp_decimals, 0,
PHP_INI_SYSTEM, OnUpdateBool, showTimestampDecimals,
zend_fbsql_globals, fbsql_globals)
STD_PHP_INI_ENTRY_EX (fbsql.max_persistent,
-1, PHP_INI_SYSTEM, OnUpdateLong, maxPersistent,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY_EX (fbsql.max_links,
128, PHP_INI_SYSTEM, OnUpdateLong, maxLinks,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY_EX (fbsql.max_connections,
128, PHP_INI_SYSTEM, OnUpdateLong, maxConnections,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
@@ -540,7 +545,26 @@
if (persistent) {
if (zend_hash_find(EG(persistent_list), name, strlen(name) +
1, (void **)lep) == SUCCESS)
{
+ FBCMetaData *md;
phpLink = (PHPFBLink*)lep-ptr;
+ // Check if connection still there.
+ md = fbcdcRollback(phpLink-connection);
+ if ( !mdOk(phpLink, md, Rollback;) ) {
+ if (FB_SQL_G(generateWarnings)) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, FrontBase link is not connected, ty to reconnect.);
+ }
+ // Make sure select_db will reconnect.
+ fbcmdRelease(md);
+ fbcdcClose(phpLink-connection);
+ fbcdcRelease(phpLink-connection);
+ free(phpLink-connection);
+ phpLink-connection = NULL;
+ if (phpLink-databaseName)
free(phpLink-databaseName);
+ phpLink-databaseName = NULL;
+ }
+ else {
+ fbcmdRelease(md);
+ }
}
else {
zend_rsrc_list_entry le;
@@ -2509,8 +2533,6 @@
[PHP-CVS] cvs: php-src /ext/standard string.c
fmk Wed Aug 9 18:15:06 2006 UTC
Modified files:
/php-src/ext/standard string.c
Log:
Fix ZTS builds
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.569r2=1.570diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.569 php-src/ext/standard/string.c:1.570
--- php-src/ext/standard/string.c:1.569 Wed Aug 9 17:40:21 2006
+++ php-src/ext/standard/string.c Wed Aug 9 18:15:06 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.569 2006/08/09 17:40:21 andrei Exp $ */
+/* $Id: string.c,v 1.570 2006/08/09 18:15:06 fmk Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4367,7 +4367,7 @@
char *str, *what;
int str_len, what_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_DC, SS, str,
str_len,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, SS, str,
str_len,
what, what_len) ==
FAILURE) {
return;
}
@@ -4423,7 +4423,7 @@
char *str;
int str_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_DC, S, str,
str_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, S, str,
str_len) == FAILURE) {
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom dom_iterators.c
fmk Wed May 10 18:32:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/domdom_iterators.c
Log:
Fix win32 build
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/dom_iterators.c?r1=1.9.2.3.2.1r2=1.9.2.3.2.2diff_format=u
Index: php-src/ext/dom/dom_iterators.c
diff -u php-src/ext/dom/dom_iterators.c:1.9.2.3.2.1
php-src/ext/dom/dom_iterators.c:1.9.2.3.2.2
--- php-src/ext/dom/dom_iterators.c:1.9.2.3.2.1 Tue May 9 23:55:24 2006
+++ php-src/ext/dom/dom_iterators.c Wed May 10 18:32:50 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dom_iterators.c,v 1.9.2.3.2.1 2006/05/09 23:55:24 helly Exp $ */
+/* $Id: dom_iterators.c,v 1.9.2.3.2.2 2006/05/10 18:32:50 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -262,12 +262,13 @@
int ret, curindex = 0;
HashTable *nodeht;
zval **entry;
+ php_dom_iterator *iterator;
if (by_ref) {
zend_error(E_ERROR, An iterator cannot be used with foreach by
reference);
}
- php_dom_iterator *iterator = emalloc(sizeof(php_dom_iterator));
-
+ iterator = emalloc(sizeof(php_dom_iterator));
+
object-refcount++;
iterator-intern.data = (void*)object;
iterator-intern.funcs = php_dom_iterator_funcs;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/unicode config.w32
fmk Fri May 5 21:37:08 2006 UTC
Modified files:
/php-src/ext/unicodeconfig.w32
Log:
Adding property.c to windows build
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/config.w32?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/unicode/config.w32
diff -u php-src/ext/unicode/config.w32:1.8 php-src/ext/unicode/config.w32:1.9
--- php-src/ext/unicode/config.w32:1.8 Thu Apr 20 03:41:33 2006
+++ php-src/ext/unicode/config.w32 Fri May 5 21:37:08 2006
@@ -1,5 +1,5 @@
-// $Id: config.w32,v 1.8 2006/04/20 03:41:33 fmk Exp $
+// $Id: config.w32,v 1.9 2006/05/05 21:37:08 fmk Exp $
// vim:ft=javascript
-EXTENSION(unicode, unicode.c unicode_iterators.c collator.c locale.c,
false);
+EXTENSION(unicode, unicode.c unicode_iterators.c collator.c locale.c
property.c, false);
AC_DEFINE('HAVE_UNICODE', 1, 'ICU API extension');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
fmk Sat Apr 29 06:24:21 2006 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
Add new configure option --enable-pdb-files
This will generate .pdb files for debugging
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32?r1=1.53r2=1.54diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.53 php-src/win32/build/config.w32:1.54
--- php-src/win32/build/config.w32:1.53 Wed Mar 29 01:20:43 2006
+++ php-src/win32/build/config.w32 Sat Apr 29 06:24:21 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.53 2006/03/29 01:20:43 pollita Exp $
+// $Id: config.w32,v 1.54 2006/04/29 06:24:21 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -313,6 +313,11 @@
ARG_ENABLE(memory-manager, Enable Zend memory manager, yes);
AC_DEFINE('USE_ZEND_ALLOC', PHP_MEMORY_MANAGER == yes ? 1 : 0);
+ARG_ENABLE(pdb-files, Enable generation of .pdp files, no);
+if (PHP_PDB_FILES == yes) {
+ ADD_FLAG(LDFLAGS, /debug /opt:ref);
+}
+
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
--
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) /win32/build config.w32
fmk Sat Apr 29 06:24:38 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/win32/buildconfig.w32
Log:
Add new configure option --enable-pdb-files
This will generate .pdb files for debugging
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32?r1=1.40.2.6r2=1.40.2.7diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.6
php-src/win32/build/config.w32:1.40.2.7
--- php-src/win32/build/config.w32:1.40.2.6 Wed Dec 14 02:01:13 2005
+++ php-src/win32/build/config.w32 Sat Apr 29 06:24:38 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.6 2005/12/14 02:01:13 wez Exp $
+// $Id: config.w32,v 1.40.2.7 2006/04/29 06:24:38 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -302,6 +302,11 @@
AC_DEFINE('ZEND_MULTIBYTE', 1);
}
+ARG_ENABLE(pdb-files, Enable generation of .pdp files, no);
+if (PHP_PDB_FILES == yes) {
+ ADD_FLAG(LDFLAGS, /debug /opt:ref);
+}
+
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
fmk Sat Apr 29 14:33:35 2006 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
Revert patch for pdb files. No need to have it twice!
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32?r1=1.54r2=1.55diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.54 php-src/win32/build/config.w32:1.55
--- php-src/win32/build/config.w32:1.54 Sat Apr 29 06:24:21 2006
+++ php-src/win32/build/config.w32 Sat Apr 29 14:33:35 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.54 2006/04/29 06:24:21 fmk Exp $
+// $Id: config.w32,v 1.55 2006/04/29 14:33:35 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -313,11 +313,6 @@
ARG_ENABLE(memory-manager, Enable Zend memory manager, yes);
AC_DEFINE('USE_ZEND_ALLOC', PHP_MEMORY_MANAGER == yes ? 1 : 0);
-ARG_ENABLE(pdb-files, Enable generation of .pdp files, no);
-if (PHP_PDB_FILES == yes) {
- ADD_FLAG(LDFLAGS, /debug /opt:ref);
-}
-
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_1) /win32/build config.w32
Hi Michael,
Next time I need a feature I better spend more time looking or open my
eyes when searching.
Thanks for the pointer.
- Frank
Frank M. Kromann wrote:
fmk Sat Apr 29 06:24:38 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/win32/buildconfig.w32
Log:
Add new configure option --enable-pdb-files
This will generate .pdb files for debugging
+ARG_ENABLE(pdb-files, Enable generation of .pdp files, no);
+if (PHP_PDB_FILES == yes) {
+ ADD_FLAG(LDFLAGS, /debug /opt:ref);
+}
+
That doesn't look really different to --enable-debug-pack, does it?
Regards,
--
Michael - mike(@)php.net
http://dev.iworks.at/ext-http/http-functions.html.gz
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib zlib.c
fmk Sat Apr 29 14:38:35 2006 UTC
Modified files:
/php-src/ext/zlib zlib.c
Log:
fix build. ZSTR() must be applied to the buf argument of php_stream macros
http://cvs.php.net/viewcvs.cgi/php-src/ext/zlib/zlib.c?r1=1.192r2=1.193diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.192 php-src/ext/zlib/zlib.c:1.193
--- php-src/ext/zlib/zlib.c:1.192 Wed Mar 8 14:41:45 2006
+++ php-src/ext/zlib/zlib.c Sat Apr 29 14:38:35 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: zlib.c,v 1.192 2006/03/08 14:41:45 iliaa Exp $ */
+/* $Id: zlib.c,v 1.193 2006/04/29 14:38:35 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -305,7 +305,7 @@
/* Now loop through the file and do the magic quotes thing if needed */
memset(buf,0,sizeof(buf));
- while (php_stream_gets(stream, buf, sizeof(buf) - 1) != NULL) {
+ while (php_stream_gets(stream, ZSTR(buf), sizeof(buf) - 1) != NULL) {
add_index_string(return_value, i++, buf, 1);
}
php_stream_close(stream);
--
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 /ext/standard exec.c ftp_fopen_wrapper.c /sapi/cli php_cli.c
fmk Sat Apr 29 14:53:26 2006 UTC
Modified files:
/php-src/ext/pdopdo_dbh.c
/php-src/ext/standard exec.c ftp_fopen_wrapper.c
/php-src/sapi/cli php_cli.c
Log:
More ZSTR() fixes
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.127r2=1.128diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.127 php-src/ext/pdo/pdo_dbh.c:1.128
--- php-src/ext/pdo/pdo_dbh.c:1.127 Thu Mar 23 19:03:30 2006
+++ php-src/ext/pdo/pdo_dbh.c Sat Apr 29 14:53:26 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.127 2006/03/23 19:03:30 tony2001 Exp $ */
+/* $Id: pdo_dbh.c,v 1.128 2006/04/29 14:53:26 fmk Exp $ */
/* The PDO Database Handle Class */
@@ -189,7 +189,7 @@
stream = php_stream_open_wrapper(uri, rb, REPORT_ERRORS, NULL);
if (stream) {
- dsn = php_stream_get_line(stream, buf, buflen, NULL);
+ dsn = php_stream_get_line(stream, ZSTR(buf), buflen, NULL);
php_stream_close(stream);
}
return dsn;
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/exec.c?r1=1.118r2=1.119diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.118 php-src/ext/standard/exec.c:1.119
--- php-src/ext/standard/exec.c:1.118 Wed Mar 8 00:43:28 2006
+++ php-src/ext/standard/exec.c Sat Apr 29 14:53:26 2006
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
*/
-/* $Id: exec.c,v 1.118 2006/03/08 00:43:28 pajoye Exp $ */
+/* $Id: exec.c,v 1.119 2006/04/29 14:53:26 fmk Exp $ */
#include stdio.h
#include php.h
@@ -92,7 +92,7 @@
if (type != 3) {
b = buf;
- while (php_stream_get_line(stream, b, EXEC_INPUT_BUF, bufl)) {
+ while (php_stream_get_line(stream, ZSTR(b), EXEC_INPUT_BUF,
bufl)) {
/* no new line found, let's read some more */
if (b[bufl - 1] != '\n' !php_stream_eof(stream)) {
if (buflen (bufl + (b - buf) +
EXEC_INPUT_BUF)) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.90r2=1.91diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.90
php-src/ext/standard/ftp_fopen_wrapper.c:1.91
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.90 Mon Mar 20 14:10:23 2006
+++ php-src/ext/standard/ftp_fopen_wrapper.cSat Apr 29 14:53:26 2006
@@ -18,7 +18,7 @@
| Sara Golemon [EMAIL PROTECTED] |
+--+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.90 2006/03/20 14:10:23 tony2001 Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.91 2006/04/29 14:53:26 fmk Exp $ */
#include php.h
#include php_globals.h
@@ -71,7 +71,7 @@
static inline int get_ftp_result(php_stream *stream, char *buffer, size_t
buffer_size TSRMLS_DC)
{
- while (php_stream_gets(stream, buffer, buffer_size-1)
+ while (php_stream_gets(stream, ZSTR(buffer), buffer_size-1)
!(isdigit((int) buffer[0]) isdigit((int) buffer[1])
isdigit((int) buffer[2]) buffer[3] == ' '));
return strtol(buffer, NULL, 10);
@@ -595,7 +595,7 @@
return 0;
}
- if (!php_stream_get_line(innerstream, ent-d_name, sizeof(ent-d_name),
tmp_len)) {
+ if (!php_stream_get_line(innerstream, ZSTR(ent-d_name),
sizeof(ent-d_name), tmp_len)) {
return 0;
}
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli.c?r1=1.151r2=1.152diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.151 php-src/sapi/cli/php_cli.c:1.152
--- php-src/sapi/cli/php_cli.c:1.151Sat Apr 22 10:39:31 2006
+++ php-src/sapi/cli/php_cli.c Sat Apr 29 14:53:26 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.151 2006/04/22 10:39:31 fmk Exp $ */
+/* $Id: php_cli.c,v 1.152 2006/04/29 14:53:26 fmk Exp $ */
#include php.h
#include php_globals.h
@@ -1146,7 +1146,7 @@
Z_LVAL_P(argi) = index;
INIT_PZVAL(argi);
zend_hash_update(EG(symbol_table), argi,
sizeof(argi), argi, sizeof(zval *), NULL);
- while (exit_status == SUCCESS
(input=php_stream_gets(s_in_process, NULL, 0)) != NULL) {
+ while (exit_status == SUCCESS
(input=php_stream_gets(s_in_process, NULL_ZSTR, 0)) != NULL) {
len = strlen(input);
while (len-- (input[len]=='\n' ||
[PHP-CVS] cvs: php-src /ext/soap php_http.c
fmk Sat Apr 29 18:29:14 2006 UTC
Modified files:
/php-src/ext/soap php_http.c
Log:
Add missing ZSTR()
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_http.c?r1=1.89r2=1.90diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.89 php-src/ext/soap/php_http.c:1.90
--- php-src/ext/soap/php_http.c:1.89Thu Apr 13 08:18:54 2006
+++ php-src/ext/soap/php_http.c Sat Apr 29 18:29:14 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.89 2006/04/13 08:18:54 dmitry Exp $ */
+/* $Id: php_http.c,v 1.90 2006/04/29 18:29:14 fmk Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -1186,7 +1186,7 @@
while (!done) {
int buf_size = 0;
- php_stream_gets(stream, chunk_size, sizeof(chunk_size));
+ php_stream_gets(stream, ZSTR(chunk_size),
sizeof(chunk_size));
if (sscanf(chunk_size, %x, buf_size) 0 ) {
if (buf_size 0) {
int len_size = 0;
@@ -1266,7 +1266,7 @@
char headerbuf[8192];
while (!done) {
- if (!php_stream_gets(stream, headerbuf, sizeof(headerbuf))) {
+ if (!php_stream_gets(stream, ZSTR(headerbuf),
sizeof(headerbuf))) {
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/com_dotnet com_handlers.c com_saproxy.c com_typeinfo.c php_com_dotnet_internal.h
fmk Sat Apr 29 18:45:30 2006 UTC
Modified files:
/php-src/ext/com_dotnet com_handlers.c com_saproxy.c com_typeinfo.c
php_com_dotnet_internal.h
Log:
fix build
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_handlers.c?r1=1.36r2=1.37diff_format=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.36
php-src/ext/com_dotnet/com_handlers.c:1.37
--- php-src/ext/com_dotnet/com_handlers.c:1.36 Tue Feb 7 11:52:45 2006
+++ php-src/ext/com_dotnet/com_handlers.c Sat Apr 29 18:45:29 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.36 2006/02/07 11:52:45 rrichards Exp $ */
+/* $Id: com_handlers.c,v 1.37 2006/04/29 18:45:29 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -246,7 +246,7 @@
{
zend_internal_function *f = (zend_internal_function*)pDest;
- efree(f-function_name);
+ efree(f-function_name.s);
if (f-arg_info) {
efree(f-arg_info);
}
@@ -284,7 +284,7 @@
f.arg_info = NULL;
f.scope = obj-ce;
f.fn_flags = 0;
- f.function_name = estrndup(name, len);
+ f.function_name.s = estrndup(name, len);
f.handler = PHP_FN(com_method_handler);
fptr = f;
@@ -417,7 +417,7 @@
f.handler = ZEND_FN(fn); \
return (union _zend_function*)f;
- switch (obj-ce-name[0]) {
+ switch (obj-ce-name.s[0]) {
#if HAVE_MSCOREE_H
case 'd':
POPULATE_CTOR(d, com_dotnet_create_instance);
@@ -447,7 +447,7 @@
php_com_dotnet_object *obj;
obj = CDNO_FETCH(object);
- *class_name = estrndup(obj-ce-name, obj-ce-name_length);
+ *class_name = estrndup(obj-ce-name.s, obj-ce-name_length);
*class_name_len = obj-ce-name_length;
return 0;
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_saproxy.c?r1=1.18r2=1.19diff_format=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.18
php-src/ext/com_dotnet/com_saproxy.c:1.19
--- php-src/ext/com_dotnet/com_saproxy.c:1.18 Tue Feb 7 11:52:45 2006
+++ php-src/ext/com_dotnet/com_saproxy.cSat Apr 29 18:45:29 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_saproxy.c,v 1.18 2006/02/07 11:52:45 rrichards Exp $ */
+/* $Id: com_saproxy.c,v 1.19 2006/04/29 18:45:29 fmk Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -347,7 +347,7 @@
static int saproxy_class_name_get(zval *object, char **class_name, zend_uint
*class_name_len, int parent TSRMLS_DC)
{
- *class_name = estrndup(php_com_saproxy_class_entry-name,
php_com_saproxy_class_entry-name_length);
+ *class_name = estrndup(php_com_saproxy_class_entry-name.s,
php_com_saproxy_class_entry-name_length);
*class_name_len = php_com_saproxy_class_entry-name_length;
return 0;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_typeinfo.c?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/com_dotnet/com_typeinfo.c
diff -u php-src/ext/com_dotnet/com_typeinfo.c:1.8
php-src/ext/com_dotnet/com_typeinfo.c:1.9
--- php-src/ext/com_dotnet/com_typeinfo.c:1.8 Sun Jan 1 13:09:48 2006
+++ php-src/ext/com_dotnet/com_typeinfo.c Sat Apr 29 18:45:29 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: com_typeinfo.c,v 1.8 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: com_typeinfo.c,v 1.9 2006/04/29 18:45:29 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -185,17 +185,17 @@
}
const_name =
php_com_olestring_to_string(bstr_ids, c.name_len, codepage TSRMLS_CC);
- c.name = zend_strndup(const_name, c.name_len);
+ c.name.s = zend_strndup(const_name, c.name_len);
efree(const_name);
c.name_len++; /* include NUL */
SysFreeString(bstr_ids);
/* sanity check for the case where the constant
is already defined */
- if (zend_get_constant(c.name, c.name_len - 1,
exists TSRMLS_CC)) {
+ if (zend_get_constant(c.name.s, c.name_len - 1,
exists TSRMLS_CC)) {
if (COMG(autoreg_verbose)
!compare_function(results, c.value, exists TSRMLS_CC)) {
php_error_docref(NULL
TSRMLS_CC, E_WARNING, Type library constant %s is already defined, c.name);
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c /ext/standard file.c http_fopen_wrapper.c image.c /main php_streams.h
fmk Fri Apr 28 19:03:58 2006 UTC
Modified files:
/php-src/ext/standard image.c file.c http_fopen_wrapper.c
/php-src/main php_streams.h
/php-src/ext/splspl_directory.c
Log:
Remove ZSTR() from stream macros. Calling function must apply this macro
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/image.c?r1=1.122r2=1.123diff_format=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.122 php-src/ext/standard/image.c:1.123
--- php-src/ext/standard/image.c:1.122 Sat Apr 22 10:39:30 2006
+++ php-src/ext/standard/image.cFri Apr 28 19:03:57 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: image.c,v 1.122 2006/04/22 10:39:30 fmk Exp $ */
+/* $Id: image.c,v 1.123 2006/04/28 19:03:57 fmk Exp $ */
#include php.h
#include stdio.h
@@ -1023,7 +1023,7 @@
if (php_stream_rewind(stream)) {
return 0;
}
- while ((fline=php_stream_gets(stream, NULL, 0)) != NULL) {
+ while ((fline=php_stream_gets(stream, NULL_ZSTR, 0)) != NULL) {
iname = estrdup(fline); /* simple way to get necessary buffer
of required size */
if (sscanf(fline, #define %s %d, iname, value) == 2) {
if (!(type = strrchr(iname, '_'))) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.438r2=1.439diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.438 php-src/ext/standard/file.c:1.439
--- php-src/ext/standard/file.c:1.438 Sat Apr 22 10:39:30 2006
+++ php-src/ext/standard/file.c Fri Apr 28 19:03:57 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.438 2006/04/22 10:39:30 fmk Exp $ */
+/* $Id: file.c,v 1.439 2006/04/28 19:03:57 fmk Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1049,7 +1049,7 @@
php_stream_from_zval(stream, zstream);
- buf.v = php_stream_get_line_ex(stream, stream-readbuf_type, NULL, 0,
length, retlen);
+ buf.v = php_stream_get_line_ex(stream, stream-readbuf_type, NULL_ZSTR,
0, length, retlen);
if (!buf.v) {
RETURN_FALSE;
}
@@ -1110,7 +1110,7 @@
php_stream_from_zval(stream, zstream);
if (stream-readbuf_type == IS_UNICODE) {
- UChar *buf = php_stream_get_line_ex(stream, IS_UNICODE, NULL,
0, length, retlen);
+ UChar *buf = php_stream_get_line_ex(stream, IS_UNICODE,
NULL_ZSTR, 0, length, retlen);
UChar *allowed = NULL;
int allowed_len = 0;
@@ -1127,7 +1127,7 @@
RETURN_UNICODEL(buf, retlen, 0);
} else { /* IS_STRING */
- char *buf = php_stream_get_line_ex(stream, IS_STRING, NULL, 0,
length, retlen);
+ char *buf = php_stream_get_line_ex(stream, IS_STRING,
NULL_ZSTR, 0, length, retlen);
char *allowed = NULL;
int allowed_len = 0;
@@ -1189,7 +1189,7 @@
}
- buf = php_stream_get_line((php_stream *) what, NULL, 0, len);
+ buf = php_stream_get_line((php_stream *) what, NULL_ZSTR, 0, len);
if (buf == NULL) {
efree(args);
RETURN_FALSE;
@@ -2056,12 +2056,12 @@
}
if (len 0) {
- if ((buf = php_stream_get_line(stream, NULL, 0, buf_len)) ==
NULL) {
+ if ((buf = php_stream_get_line(stream, NULL_ZSTR, 0, buf_len))
== NULL) {
RETURN_FALSE;
}
} else {
buf = emalloc(len + 1);
- if (php_stream_get_line(stream, buf, len + 1, buf_len) ==
NULL) {
+ if (php_stream_get_line(stream, ZSTR(buf), len + 1, buf_len)
== NULL) {
efree(buf);
RETURN_FALSE;
}
@@ -2153,7 +2153,7 @@
memcpy(tptr,
line_end, line_end_len);
tptr +=
line_end_len;
- if ((new_buf =
php_stream_get_line(stream, NULL, 0, new_len)) == NULL) {
+ if ((new_buf =
php_stream_get_line(stream, NULL_ZSTR, 0, new_len)) == NULL) {
/*
we've got an unterminated enclosure,
*
assign all the data from the start of
* the
enclosure to end of data to the
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.115r2=1.116diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c /ext/standard file.c image.c /sapi/cli php_cli.c
fmk Sat Apr 22 10:39:31 2006 UTC
Modified files:
/php-src/ext/standard file.c image.c
/php-src/ext/splspl_directory.c
/php-src/sapi/cli php_cli.c
Log:
Fix Win32 build. NULL_ZSTR was converted to ZSTR(NULL_ZSTR)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.437r2=1.438diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.437 php-src/ext/standard/file.c:1.438
--- php-src/ext/standard/file.c:1.437 Tue Apr 18 19:10:12 2006
+++ php-src/ext/standard/file.c Sat Apr 22 10:39:30 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.437 2006/04/18 19:10:12 pollita Exp $ */
+/* $Id: file.c,v 1.438 2006/04/22 10:39:30 fmk Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1049,7 +1049,7 @@
php_stream_from_zval(stream, zstream);
- buf.v = php_stream_get_line_ex(stream, stream-readbuf_type, NULL_ZSTR,
0, length, retlen);
+ buf.v = php_stream_get_line_ex(stream, stream-readbuf_type, NULL, 0,
length, retlen);
if (!buf.v) {
RETURN_FALSE;
}
@@ -1110,7 +1110,7 @@
php_stream_from_zval(stream, zstream);
if (stream-readbuf_type == IS_UNICODE) {
- UChar *buf = php_stream_get_line_ex(stream, IS_UNICODE,
NULL_ZSTR, 0, length, retlen);
+ UChar *buf = php_stream_get_line_ex(stream, IS_UNICODE, NULL,
0, length, retlen);
UChar *allowed = NULL;
int allowed_len = 0;
@@ -1127,7 +1127,7 @@
RETURN_UNICODEL(buf, retlen, 0);
} else { /* IS_STRING */
- char *buf = php_stream_get_line_ex(stream, IS_STRING,
NULL_ZSTR, 0, length, retlen);
+ char *buf = php_stream_get_line_ex(stream, IS_STRING, NULL, 0,
length, retlen);
char *allowed = NULL;
int allowed_len = 0;
@@ -1189,7 +1189,7 @@
}
- buf = php_stream_get_line((php_stream *) what, NULL_ZSTR, 0, len);
+ buf = php_stream_get_line((php_stream *) what, NULL, 0, len);
if (buf == NULL) {
efree(args);
RETURN_FALSE;
@@ -2056,7 +2056,7 @@
}
if (len 0) {
- if ((buf = php_stream_get_line(stream, NULL_ZSTR, 0, buf_len))
== NULL) {
+ if ((buf = php_stream_get_line(stream, NULL, 0, buf_len)) ==
NULL) {
RETURN_FALSE;
}
} else {
@@ -2153,7 +2153,7 @@
memcpy(tptr,
line_end, line_end_len);
tptr +=
line_end_len;
- if ((new_buf =
php_stream_get_line(stream, NULL_ZSTR, 0, new_len)) == NULL) {
+ if ((new_buf =
php_stream_get_line(stream, NULL, 0, new_len)) == NULL) {
/*
we've got an unterminated enclosure,
*
assign all the data from the start of
* the
enclosure to end of data to the
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/image.c?r1=1.121r2=1.122diff_format=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.121 php-src/ext/standard/image.c:1.122
--- php-src/ext/standard/image.c:1.121 Fri Mar 17 22:52:55 2006
+++ php-src/ext/standard/image.cSat Apr 22 10:39:30 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: image.c,v 1.121 2006/03/17 22:52:55 andrei Exp $ */
+/* $Id: image.c,v 1.122 2006/04/22 10:39:30 fmk Exp $ */
#include php.h
#include stdio.h
@@ -1023,7 +1023,7 @@
if (php_stream_rewind(stream)) {
return 0;
}
- while ((fline=php_stream_gets(stream, NULL_ZSTR, 0)) != NULL) {
+ while ((fline=php_stream_gets(stream, NULL, 0)) != NULL) {
iname = estrdup(fline); /* simple way to get necessary buffer
of required size */
if (sscanf(fline, #define %s %d, iname, value) == 2) {
if (!(type = strrchr(iname, '_'))) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.89r2=1.90diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.89
php-src/ext/spl/spl_directory.c:1.90
--- php-src/ext/spl/spl_directory.c:1.89Thu Apr 6 19:11:06 2006
+++ php-src/ext/spl/spl_directory.c Sat Apr 22 10:39:30 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.89 2006/04/06 19:11:06 tony2001 Exp $ */
+/* $Id:
[PHP-CVS] cvs: php-src /ext/unicode config.w32
fmk Thu Apr 20 03:41:33 2006 UTC
Modified files:
/php-src/ext/unicodeconfig.w32
Log:
fix build on Win32
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/config.w32?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/unicode/config.w32
diff -u php-src/ext/unicode/config.w32:1.7 php-src/ext/unicode/config.w32:1.8
--- php-src/ext/unicode/config.w32:1.7 Wed Mar 29 01:20:43 2006
+++ php-src/ext/unicode/config.w32 Thu Apr 20 03:41:33 2006
@@ -1,5 +1,5 @@
-// $Id: config.w32,v 1.7 2006/03/29 01:20:43 pollita Exp $
-// vim:ft=javascript
-
-EXTENSION(unicode, unicode.c unicode_iterators.c collator.c locale.c);
-AC_DEFINE('HAVE_UNICODE', 1, 'ICU API extension');
+// $Id: config.w32,v 1.8 2006/04/20 03:41:33 fmk Exp $
+// vim:ft=javascript
+
+EXTENSION(unicode, unicode.c unicode_iterators.c collator.c locale.c,
false);
+AC_DEFINE('HAVE_UNICODE', 1, 'ICU API extension');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mssql php_mssql.c
fmk Tue Apr 4 18:49:12 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/mssql php_mssql.c
Log:
Fix #33694 invalid sql or timeouts makes it impossible to reuse persistent
connections
http://cvs.php.net/viewcvs.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.12r2=1.152.2.13diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.12
php-src/ext/mssql/php_mssql.c:1.152.2.13
--- php-src/ext/mssql/php_mssql.c:1.152.2.12Sun Jan 1 12:50:09 2006
+++ php-src/ext/mssql/php_mssql.c Tue Apr 4 18:49:12 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.12 2006/01/01 12:50:09 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13 2006/04/04 18:49:12 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -229,6 +229,7 @@
mssql_result *result = (mssql_result *)rsrc-ptr;
_free_result(result, 1);
+ dbcancel(result-mssql_ptr-link);
efree(result);
}
@@ -1233,6 +1234,7 @@
}
if (dbsqlexec(mssql_ptr-link)==FAIL || (retvalue =
dbresults(mssql_ptr-link))==FAIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Query failed);
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
@@ -1247,6 +1249,7 @@
retvalue=dbnextrow(mssql_ptr-link);
if (retvalue==FAIL) {
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
@@ -2172,6 +2175,7 @@
if (dbrpcexec(mssql_ptr-link)==FAIL || dbsqlok(mssql_ptr-link)==FAIL)
{
php_error_docref(NULL TSRMLS_CC, E_WARNING, stored procedure
execution failed);
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
@@ -2179,6 +2183,7 @@
if (retval_results==FAIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, could not retrieve
results);
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c
fmk Tue Apr 4 18:49:44 2006 UTC
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
MFP51: Fix #33694 invalid sql or timeouts makes it impossible to reuse
persistent connections
http://cvs.php.net/viewcvs.cgi/php-src/ext/mssql/php_mssql.c?r1=1.164r2=1.165diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.164 php-src/ext/mssql/php_mssql.c:1.165
--- php-src/ext/mssql/php_mssql.c:1.164 Wed Mar 8 00:43:28 2006
+++ php-src/ext/mssql/php_mssql.c Tue Apr 4 18:49:44 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.164 2006/03/08 00:43:28 pajoye Exp $ */
+/* $Id: php_mssql.c,v 1.165 2006/04/04 18:49:44 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -229,6 +229,7 @@
mssql_result *result = (mssql_result *)rsrc-ptr;
_free_result(result, 1);
+ dbcancel(result-mssql_ptr-link);
efree(result);
}
@@ -1233,6 +1234,7 @@
}
if (dbsqlexec(mssql_ptr-link)==FAIL || (retvalue =
dbresults(mssql_ptr-link))==FAIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Query failed);
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
@@ -1247,6 +1249,7 @@
retvalue=dbnextrow(mssql_ptr-link);
if (retvalue==FAIL) {
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
@@ -2165,6 +2168,7 @@
if (dbrpcexec(mssql_ptr-link)==FAIL || dbsqlok(mssql_ptr-link)==FAIL)
{
php_error_docref(NULL TSRMLS_CC, E_WARNING, stored procedure
execution failed);
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
@@ -2172,6 +2176,7 @@
if (retval_results==FAIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, could not retrieve
results);
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mssql php_mssql.c
fmk Tue Apr 4 18:50:16 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/mssql php_mssql.c
Log:
MFP51: Fix #33694 invalid sql or timeouts makes it impossible to reuse
persistent connections
http://cvs.php.net/viewcvs.cgi/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.10r2=1.86.2.44.2.11diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.10
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.11
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.10Sun Jan 1 13:46:55 2006
+++ php-src/ext/mssql/php_mssql.c Tue Apr 4 18:50:16 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.10 2006/01/01 13:46:55 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.11 2006/04/04 18:50:16 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -222,6 +222,7 @@
mssql_result *result = (mssql_result *)rsrc-ptr;
_free_result(result, 1);
+ dbcancel(result-mssql_ptr-link);
efree(result);
}
@@ -1230,6 +1231,7 @@
}
if (dbsqlexec(mssql_ptr-link)==FAIL || (retvalue =
dbresults(mssql_ptr-link))==FAIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Query failed);
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
@@ -1244,6 +1246,7 @@
retvalue=dbnextrow(mssql_ptr-link);
if (retvalue==FAIL) {
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
@@ -2182,6 +2185,7 @@
if (dbrpcexec(mssql_ptr-link)==FAIL || dbsqlok(mssql_ptr-link)==FAIL)
{
php_error_docref(NULL TSRMLS_CC, E_WARNING, stored procedure
execution failed);
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
@@ -2189,6 +2193,7 @@
if (retval_results==FAIL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, could not retrieve
results);
+ dbcancel(mssql_ptr-link);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl spl_engine.c spl_engine.h
fmk Tue Mar 14 18:07:51 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/splspl_engine.c spl_engine.h
Log:
Fix Win32 compilation.
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_engine.c?r1=1.20.2.2r2=1.20.2.3diff_format=u
Index: php-src/ext/spl/spl_engine.c
diff -u php-src/ext/spl/spl_engine.c:1.20.2.2
php-src/ext/spl/spl_engine.c:1.20.2.3
--- php-src/ext/spl/spl_engine.c:1.20.2.2 Sun Mar 5 17:39:49 2006
+++ php-src/ext/spl/spl_engine.cTue Mar 14 18:07:51 2006
@@ -32,7 +32,7 @@
#include spl_array.h
/* {{{ spl_instantiate */
-void spl_instantiate(zend_class_entry *pce, zval **object, int alloc TSRMLS_DC)
+PHPAPI void spl_instantiate(zend_class_entry *pce, zval **object, int alloc
TSRMLS_DC)
{
if (alloc) {
ALLOC_ZVAL(*object);
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_engine.h?r1=1.19.2.2r2=1.19.2.3diff_format=u
Index: php-src/ext/spl/spl_engine.h
diff -u php-src/ext/spl/spl_engine.h:1.19.2.2
php-src/ext/spl/spl_engine.h:1.19.2.3
--- php-src/ext/spl/spl_engine.h:1.19.2.2 Sun Mar 5 17:39:49 2006
+++ php-src/ext/spl/spl_engine.hTue Mar 14 18:07:51 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_engine.h,v 1.19.2.2 2006/03/05 17:39:49 helly Exp $ */
+/* $Id: spl_engine.h,v 1.19.2.3 2006/03/14 18:07:51 fmk Exp $ */
#ifndef SPL_ENGINE_H
#define SPL_ENGINE_H
@@ -36,7 +36,7 @@
}
/* }}} */
-void spl_instantiate(zend_class_entry *pce, zval **object, int alloc
TSRMLS_DC);
+PHPAPI void spl_instantiate(zend_class_entry *pce, zval **object, int alloc
TSRMLS_DC);
/* {{{ spl_instantiate_arg_ex1 */
static inline int spl_instantiate_arg_ex1(zend_class_entry *pce, zval
**retval, int alloc, zval *arg1 TSRMLS_DC)
--
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) /sapi/cgi fastcgi.c
fmk Sat Feb 4 23:54:22 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/sapi/cgi fastcgi.c
Log:
Fix build on win32
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.3r2=1.4.2.4diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.3 php-src/sapi/cgi/fastcgi.c:1.4.2.4
--- php-src/sapi/cgi/fastcgi.c:1.4.2.3 Fri Feb 3 16:30:09 2006
+++ php-src/sapi/cgi/fastcgi.c Sat Feb 4 23:54:21 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.3 2006/02/03 16:30:09 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.4 2006/02/04 23:54:21 fmk Exp $ */
#include fastcgi.h
#include php.h
@@ -623,6 +623,10 @@
int fcgi_accept_request(fcgi_request *req)
{
+#ifdef _WIN32
+ HANDLE pipe;
+ OVERLAPPED ov;
+#endif
fcgi_finish_request(req);
while (1) {
@@ -632,8 +636,7 @@
return -1;
}
#ifdef _WIN32
- HANDLE pipe =
(HANDLE)_get_osfhandle(req-listen_socket);
- OVERLAPPED ov;
+ pipe =
(HANDLE)_get_osfhandle(req-listen_socket);
FCGI_LOCK(req-listen_socket);
ov.hEvent = CreateEvent(NULL, TRUE, FALSE,
NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi fastcgi.c
fmk Sat Feb 4 23:58:22 2006 UTC
Modified files:
/php-src/sapi/cgi fastcgi.c
Log:
MFB51 Fix build on win32
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.5r2=1.6diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.5 php-src/sapi/cgi/fastcgi.c:1.6
--- php-src/sapi/cgi/fastcgi.c:1.5 Fri Feb 3 16:30:27 2006
+++ php-src/sapi/cgi/fastcgi.c Sat Feb 4 23:58:22 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.5 2006/02/03 16:30:27 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.6 2006/02/04 23:58:22 fmk Exp $ */
#include fastcgi.h
#include php.h
@@ -623,6 +623,10 @@
int fcgi_accept_request(fcgi_request *req)
{
+#ifdef _WIN32
+ HANDLE pipe;
+ OVERLAPPED ov;
+#endif
fcgi_finish_request(req);
while (1) {
@@ -632,8 +636,7 @@
return -1;
}
#ifdef _WIN32
- HANDLE pipe =
(HANDLE)_get_osfhandle(req-listen_socket);
- OVERLAPPED ov;
+ pipe =
(HANDLE)_get_osfhandle(req-listen_socket);
FCGI_LOCK(req-listen_socket);
ov.hEvent = CreateEvent(NULL, TRUE, FALSE,
NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard basic_functions.c basic_functions.h incomplete_class.c php_incomplete_class.h
fmk Sat Jan 28 06:14:34 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard basic_functions.c basic_functions.h
incomplete_class.c php_incomplete_class.h
Log:
Export symbols that will allow building WDDX as shared object
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.18r2=1.725.2.19diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.18
php-src/ext/standard/basic_functions.c:1.725.2.19
--- php-src/ext/standard/basic_functions.c:1.725.2.18 Fri Jan 13 13:04:27 2006
+++ php-src/ext/standard/basic_functions.c Sat Jan 28 06:14:34 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.18 2006/01/13 13:04:27 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.19 2006/01/28 06:14:34 fmk Exp $ */
#include php.h
#include php_streams.h
@@ -99,9 +99,9 @@
#ifdef ZTS
-int basic_globals_id;
+PHPAPI int basic_globals_id;
#else
-php_basic_globals basic_globals;
+PHPAPI php_basic_globals basic_globals;
#endif
#include php_fopen_wrappers.h
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.h?r1=1.139.2.1r2=1.139.2.2diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.139.2.1
php-src/ext/standard/basic_functions.h:1.139.2.2
--- php-src/ext/standard/basic_functions.h:1.139.2.1Sun Jan 1 12:50:14 2006
+++ php-src/ext/standard/basic_functions.h Sat Jan 28 06:14:34 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.139.2.1 2006/01/01 12:50:14 sniper Exp $ */
+/* $Id: basic_functions.h,v 1.139.2.2 2006/01/28 06:14:34 fmk Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -216,10 +216,10 @@
#ifdef ZTS
#define BG(v) TSRMG(basic_globals_id, php_basic_globals *, v)
-extern int basic_globals_id;
+PHPAPI extern int basic_globals_id;
#else
#define BG(v) (basic_globals.v)
-extern php_basic_globals basic_globals;
+PHPAPI extern php_basic_globals basic_globals;
#endif
#if HAVE_PUTENV
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/incomplete_class.c?r1=1.28.2.1r2=1.28.2.2diff_format=u
Index: php-src/ext/standard/incomplete_class.c
diff -u php-src/ext/standard/incomplete_class.c:1.28.2.1
php-src/ext/standard/incomplete_class.c:1.28.2.2
--- php-src/ext/standard/incomplete_class.c:1.28.2.1Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/incomplete_class.c Sat Jan 28 06:14:34 2006
@@ -17,7 +17,7 @@
*/
-/* $Id: incomplete_class.c,v 1.28.2.1 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: incomplete_class.c,v 1.28.2.2 2006/01/28 06:14:34 fmk Exp $ */
#include php.h
#include basic_functions.h
@@ -122,7 +122,7 @@
/* {{{ php_lookup_class_name
*/
-char *php_lookup_class_name(zval *object, zend_uint *nlen)
+PHPAPI char *php_lookup_class_name(zval *object, zend_uint *nlen)
{
zval **val;
char *retval = NULL;
@@ -144,7 +144,7 @@
/* {{{ php_store_class_name
*/
-void php_store_class_name(zval *object, const char *name, zend_uint len)
+PHPAPI void php_store_class_name(zval *object, const char *name, zend_uint len)
{
zval *val;
TSRMLS_FETCH();
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/php_incomplete_class.h?r1=1.17.2.1r2=1.17.2.2diff_format=u
Index: php-src/ext/standard/php_incomplete_class.h
diff -u php-src/ext/standard/php_incomplete_class.h:1.17.2.1
php-src/ext/standard/php_incomplete_class.h:1.17.2.2
--- php-src/ext/standard/php_incomplete_class.h:1.17.2.1Sun Jan 1
12:50:15 2006
+++ php-src/ext/standard/php_incomplete_class.h Sat Jan 28 06:14:34 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_incomplete_class.h,v 1.17.2.1 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: php_incomplete_class.h,v 1.17.2.2 2006/01/28 06:14:34 fmk Exp $ */
#ifndef PHP_INCOMPLETE_CLASS_H
#define PHP_INCOMPLETE_CLASS_H
@@ -55,8 +55,8 @@
zend_class_entry *php_create_incomplete_class(TSRMLS_D);
-char *php_lookup_class_name(zval *object, zend_uint *nlen);
-void php_store_class_name(zval *object, const char *name, zend_uint len);
+PHPAPI char *php_lookup_class_name(zval *object, zend_uint *nlen);
+PHPAPI void php_store_class_name(zval *object, const char *name, zend_uint
len);
#ifdef __cplusplus
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/session php_session.h session.c
fmk Sat Jan 28 06:14:49 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/sessionphp_session.h session.c
Log:
Export symbols that will allow building WDDX as shared object
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/php_session.h?r1=1.101.2.1r2=1.101.2.2diff_format=u
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.101.2.1
php-src/ext/session/php_session.h:1.101.2.2
--- php-src/ext/session/php_session.h:1.101.2.1 Sun Jan 1 12:50:12 2006
+++ php-src/ext/session/php_session.h Sat Jan 28 06:14:49 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_session.h,v 1.101.2.1 2006/01/01 12:50:12 sniper Exp $ */
+/* $Id: php_session.h,v 1.101.2.2 2006/01/28 06:14:49 fmk Exp $ */
#ifndef PHP_SESSION_H
#define PHP_SESSION_H
@@ -184,9 +184,9 @@
PHPAPI void session_adapt_url(const char *, size_t, char **, size_t *
TSRMLS_DC);
-void php_add_session_var(char *name, size_t namelen TSRMLS_DC);
-void php_set_session_var(char *name, size_t namelen, zval *state_val,
php_unserialize_data_t *var_hash TSRMLS_DC);
-int php_get_session_var(char *name, size_t namelen, zval ***state_var
TSRMLS_DC);
+PHPAPI void php_add_session_var(char *name, size_t namelen TSRMLS_DC);
+PHPAPI void php_set_session_var(char *name, size_t namelen, zval *state_val,
php_unserialize_data_t *var_hash TSRMLS_DC);
+PHPAPI int php_get_session_var(char *name, size_t namelen, zval ***state_var
TSRMLS_DC);
PHPAPI int php_session_register_module(ps_module *);
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.417.2.6r2=1.417.2.7diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.6
php-src/ext/session/session.c:1.417.2.7
--- php-src/ext/session/session.c:1.417.2.6 Sun Jan 15 16:51:18 2006
+++ php-src/ext/session/session.c Sat Jan 28 06:14:49 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.417.2.6 2006/01/15 16:51:18 iliaa Exp $ */
+/* $Id: session.c,v 1.417.2.7 2006/01/28 06:14:49 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -277,7 +277,7 @@
#define MAX_STR 512
-void php_add_session_var(char *name, size_t namelen TSRMLS_DC)
+PHPAPI void php_add_session_var(char *name, size_t namelen TSRMLS_DC)
{
zval **sym_track = NULL;
@@ -318,7 +318,7 @@
}
}
-void php_set_session_var(char *name, size_t namelen, zval *state_val,
php_unserialize_data_t *var_hash TSRMLS_DC)
+PHPAPI void php_set_session_var(char *name, size_t namelen, zval *state_val,
php_unserialize_data_t *var_hash TSRMLS_DC)
{
if (PG(register_globals)) {
zval **old_symbol;
@@ -358,7 +358,7 @@
}
}
-int php_get_session_var(char *name, size_t namelen, zval ***state_var
TSRMLS_DC)
+PHPAPI int php_get_session_var(char *name, size_t namelen, zval ***state_var
TSRMLS_DC)
{
int ret = FAILURE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/wddx wddx.c
fmk Sat Jan 28 06:15:25 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/wddx wddx.c Log: Add header so WDDX builds as shared http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.8r2=1.119.2.9diff_format=u Index: php-src/ext/wddx/wddx.c diff -u php-src/ext/wddx/wddx.c:1.119.2.8 php-src/ext/wddx/wddx.c:1.119.2.9 --- php-src/ext/wddx/wddx.c:1.119.2.8 Sun Jan 1 12:50:16 2006 +++ php-src/ext/wddx/wddx.c Sat Jan 28 06:15:25 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: wddx.c,v 1.119.2.8 2006/01/01 12:50:16 sniper Exp $ */ +/* $Id: wddx.c,v 1.119.2.9 2006/01/28 06:15:25 fmk Exp $ */ #include php.h @@ -35,6 +35,7 @@ #include ext/standard/html.h #include ext/standard/php_string.h #include ext/date/php_date.h +#include zend_globals.h #define WDDX_BUF_LEN 256 #define PHP_CLASS_NAME_VAR php_class_name -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c basic_functions.h incomplete_class.c php_incomplete_class.h
fmk Sat Jan 28 06:16:32 2006 UTC
Modified files:
/php-src/ext/standard basic_functions.c basic_functions.h
incomplete_class.c php_incomplete_class.h
Log:
MFB51 Export symbols that will allow building WDDX as shared object
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.748r2=1.749diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.748
php-src/ext/standard/basic_functions.c:1.749
--- php-src/ext/standard/basic_functions.c:1.748Tue Jan 17 12:18:52 2006
+++ php-src/ext/standard/basic_functions.c Sat Jan 28 06:16:32 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.748 2006/01/17 12:18:52 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.749 2006/01/28 06:16:32 fmk Exp $ */
#include php.h
#include php_streams.h
@@ -99,7 +99,7 @@
#ifdef ZTS
-int basic_globals_id;
+PHPAPI int basic_globals_id;
#else
php_basic_globals basic_globals;
#endif
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.h?r1=1.142r2=1.143diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.142
php-src/ext/standard/basic_functions.h:1.143
--- php-src/ext/standard/basic_functions.h:1.142Sun Jan 1 13:09:54 2006
+++ php-src/ext/standard/basic_functions.h Sat Jan 28 06:16:32 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.142 2006/01/01 13:09:54 sniper Exp $ */
+/* $Id: basic_functions.h,v 1.143 2006/01/28 06:16:32 fmk Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -216,7 +216,7 @@
#ifdef ZTS
#define BG(v) TSRMG(basic_globals_id, php_basic_globals *, v)
-extern int basic_globals_id;
+PHPAPI extern int basic_globals_id;
#else
#define BG(v) (basic_globals.v)
extern php_basic_globals basic_globals;
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/incomplete_class.c?r1=1.29r2=1.30diff_format=u
Index: php-src/ext/standard/incomplete_class.c
diff -u php-src/ext/standard/incomplete_class.c:1.29
php-src/ext/standard/incomplete_class.c:1.30
--- php-src/ext/standard/incomplete_class.c:1.29Sun Jan 1 13:09:55 2006
+++ php-src/ext/standard/incomplete_class.c Sat Jan 28 06:16:32 2006
@@ -17,7 +17,7 @@
*/
-/* $Id: incomplete_class.c,v 1.29 2006/01/01 13:09:55 sniper Exp $ */
+/* $Id: incomplete_class.c,v 1.30 2006/01/28 06:16:32 fmk Exp $ */
#include php.h
#include basic_functions.h
@@ -122,7 +122,7 @@
/* {{{ php_lookup_class_name
*/
-char *php_lookup_class_name(zval *object, zend_uint *nlen)
+PHPAPI char *php_lookup_class_name(zval *object, zend_uint *nlen)
{
zval **val;
char *retval = NULL;
@@ -144,7 +144,7 @@
/* {{{ php_store_class_name
*/
-void php_store_class_name(zval *object, const char *name, zend_uint len)
+PHPAPI void php_store_class_name(zval *object, const char *name, zend_uint len)
{
zval *val;
TSRMLS_FETCH();
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/php_incomplete_class.h?r1=1.18r2=1.19diff_format=u
Index: php-src/ext/standard/php_incomplete_class.h
diff -u php-src/ext/standard/php_incomplete_class.h:1.18
php-src/ext/standard/php_incomplete_class.h:1.19
--- php-src/ext/standard/php_incomplete_class.h:1.18Sun Jan 1 13:09:55 2006
+++ php-src/ext/standard/php_incomplete_class.h Sat Jan 28 06:16:32 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_incomplete_class.h,v 1.18 2006/01/01 13:09:55 sniper Exp $ */
+/* $Id: php_incomplete_class.h,v 1.19 2006/01/28 06:16:32 fmk Exp $ */
#ifndef PHP_INCOMPLETE_CLASS_H
#define PHP_INCOMPLETE_CLASS_H
@@ -55,8 +55,8 @@
zend_class_entry *php_create_incomplete_class(TSRMLS_D);
-char *php_lookup_class_name(zval *object, zend_uint *nlen);
-void php_store_class_name(zval *object, const char *name, zend_uint len);
+PHPAPI char *php_lookup_class_name(zval *object, zend_uint *nlen);
+PHPAPI void php_store_class_name(zval *object, const char *name, zend_uint
len);
#ifdef __cplusplus
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session php_session.h session.c
fmk Sat Jan 28 06:16:45 2006 UTC
Modified files:
/php-src/ext/sessionphp_session.h session.c
Log:
MFB51 Export symbols that will allow building WDDX as shared object
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/php_session.h?r1=1.102r2=1.103diff_format=u
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.102
php-src/ext/session/php_session.h:1.103
--- php-src/ext/session/php_session.h:1.102 Sun Jan 1 13:09:53 2006
+++ php-src/ext/session/php_session.h Sat Jan 28 06:16:45 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_session.h,v 1.102 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: php_session.h,v 1.103 2006/01/28 06:16:45 fmk Exp $ */
#ifndef PHP_SESSION_H
#define PHP_SESSION_H
@@ -184,9 +184,9 @@
PHPAPI void session_adapt_url(const char *, size_t, char **, size_t *
TSRMLS_DC);
-void php_add_session_var(char *name, size_t namelen TSRMLS_DC);
-void php_set_session_var(char *name, size_t namelen, zval *state_val,
php_unserialize_data_t *var_hash TSRMLS_DC);
-int php_get_session_var(char *name, size_t namelen, zval ***state_var
TSRMLS_DC);
+PHPAPI void php_add_session_var(char *name, size_t namelen TSRMLS_DC);
+PHPAPI void php_set_session_var(char *name, size_t namelen, zval *state_val,
php_unserialize_data_t *var_hash TSRMLS_DC);
+PHPAPI int php_get_session_var(char *name, size_t namelen, zval ***state_var
TSRMLS_DC);
PHPAPI int php_session_register_module(ps_module *);
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.426r2=1.427diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.426 php-src/ext/session/session.c:1.427
--- php-src/ext/session/session.c:1.426 Sun Jan 15 16:51:34 2006
+++ php-src/ext/session/session.c Sat Jan 28 06:16:45 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.426 2006/01/15 16:51:34 iliaa Exp $ */
+/* $Id: session.c,v 1.427 2006/01/28 06:16:45 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -279,7 +279,7 @@
#define MAX_STR 512
-void php_add_session_var(char *name, size_t namelen TSRMLS_DC)
+PHPAPI void php_add_session_var(char *name, size_t namelen TSRMLS_DC)
{
zval **sym_track = NULL;
@@ -320,7 +320,7 @@
}
}
-void php_set_session_var(char *name, size_t namelen, zval *state_val,
php_unserialize_data_t *var_hash TSRMLS_DC)
+PHPAPI void php_set_session_var(char *name, size_t namelen, zval *state_val,
php_unserialize_data_t *var_hash TSRMLS_DC)
{
if (PG(register_globals)) {
zval **old_symbol;
@@ -360,7 +360,7 @@
}
}
-int php_get_session_var(char *name, size_t namelen, zval ***state_var
TSRMLS_DC)
+PHPAPI int php_get_session_var(char *name, size_t namelen, zval ***state_var
TSRMLS_DC)
{
int ret = FAILURE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/wddx wddx.c
fmk Sat Jan 28 06:17:09 2006 UTC Modified files: /php-src/ext/wddx wddx.c Log: MFB51 Add header so WDDX builds as shared http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.128r2=1.129diff_format=u Index: php-src/ext/wddx/wddx.c diff -u php-src/ext/wddx/wddx.c:1.128 php-src/ext/wddx/wddx.c:1.129 --- php-src/ext/wddx/wddx.c:1.128 Sun Jan 1 13:09:56 2006 +++ php-src/ext/wddx/wddx.c Sat Jan 28 06:17:09 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: wddx.c,v 1.128 2006/01/01 13:09:56 sniper Exp $ */ +/* $Id: wddx.c,v 1.129 2006/01/28 06:17:09 fmk Exp $ */ #include php.h @@ -35,6 +35,7 @@ #include ext/standard/html.h #include ext/standard/php_string.h #include ext/date/php_date.h +#include zend_globals.h #define WDDX_BUF_LEN 256 #define PHP_CLASS_NAME_VAR php_class_name -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date php_date.c php_date.h
fmk Sat Jan 28 06:18:01 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/date php_date.c php_date.h
Log:
Export symbols that will allow building WDDX as shared object
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.43.2.38r2=1.43.2.39diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.38
php-src/ext/date/php_date.c:1.43.2.39
--- php-src/ext/date/php_date.c:1.43.2.38 Wed Jan 18 21:40:38 2006
+++ php-src/ext/date/php_date.c Sat Jan 28 06:18:01 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.38 2006/01/18 21:40:38 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.39 2006/01/28 06:18:01 fmk Exp $ */
#include php.h
#include php_streams.h
@@ -786,7 +786,7 @@
/* }}} */
/* {{{ php_parse_date: Backwards compability function */
-signed long php_parse_date(char *string, signed long *now)
+PHPAPI signed long php_parse_date(char *string, signed long *now)
{
timelib_time *parsed_time;
int error1, error2;
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.h?r1=1.17.2.9r2=1.17.2.10diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.17.2.9
php-src/ext/date/php_date.h:1.17.2.10
--- php-src/ext/date/php_date.h:1.17.2.9Wed Jan 4 21:31:29 2006
+++ php-src/ext/date/php_date.h Sat Jan 28 06:18:01 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.h,v 1.17.2.9 2006/01/04 21:31:29 derick Exp $ */
+/* $Id: php_date.h,v 1.17.2.10 2006/01/28 06:18:01 fmk Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -95,7 +95,7 @@
#endif
/* Backwards compability wrapper */
-signed long php_parse_date(char *string, signed long *now);
+PHPAPI signed long php_parse_date(char *string, signed long *now);
PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
PHPAPI int php_idate(char format, time_t ts, int localtime);
#if HAVE_STRFTIME
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c php_date.h
fmk Sat Jan 28 06:18:18 2006 UTC
Modified files:
/php-src/ext/date php_date.c php_date.h
Log:
MFB51 Export symbols that will allow building WDDX as shared object
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.83r2=1.84diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.83 php-src/ext/date/php_date.c:1.84
--- php-src/ext/date/php_date.c:1.83Tue Jan 17 12:18:52 2006
+++ php-src/ext/date/php_date.c Sat Jan 28 06:18:18 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.83 2006/01/17 12:18:52 dmitry Exp $ */
+/* $Id: php_date.c,v 1.84 2006/01/28 06:18:18 fmk Exp $ */
#include php.h
#include php_streams.h
@@ -908,7 +908,7 @@
/* }}} */
/* {{{ php_parse_date: Backwards compability function */
-signed long php_parse_date(char *string, signed long *now)
+PHPAPI signed long php_parse_date(char *string, signed long *now)
{
timelib_time *parsed_time;
int error1, error2;
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.h?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.27 php-src/ext/date/php_date.h:1.28
--- php-src/ext/date/php_date.h:1.27Wed Jan 4 12:57:03 2006
+++ php-src/ext/date/php_date.h Sat Jan 28 06:18:18 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.h,v 1.27 2006/01/04 12:57:03 derick Exp $ */
+/* $Id: php_date.h,v 1.28 2006/01/28 06:18:18 fmk Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -96,7 +96,7 @@
#endif
/* Backwards compability wrapper */
-signed long php_parse_date(char *string, signed long *now);
+PHPAPI signed long php_parse_date(char *string, signed long *now);
PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
PHPAPI int php_idate(char format, time_t ts, int localtime);
#if HAVE_STRFTIME
--
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 php.ini-dist php.ini-recommended /ext/mssql php_mssql.c php_mssql.h
fmk Wed Dec 21 22:43:06 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS php.ini-dist php.ini-recommended
/php-src/ext/mssql php_mssql.c php_mssql.h
Log:
Fix #35730 Use correct character encoding with FreeTDS
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.312r2=1.2027.2.313diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.312 php-src/NEWS:1.2027.2.313
--- php-src/NEWS:1.2027.2.312 Wed Dec 21 21:44:13 2005
+++ php-src/NEWSWed Dec 21 22:43:04 2005
@@ -34,6 +34,7 @@
connecting to 5.x server. (Andrey)
- Fixed bug #35760 (sybase_ct doesn't compile on Solaris using old gcc). (Tony)
- Fixed bug #35740 (memory leak when including a directory). (Tony)
+- Fixed bug #35730 (Use correct character encoding, and allow setting it)
(Frank)
- Fixed bug #35723 (xmlrpc_introspection.c fails compile per C99 std). (Jani)
- Fixed bug #35720 (A final constructor can be overwritten). (Marcus)
- Fixed bug #35713 (getopt() returns array with numeric strings when passed
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.231.2.4r2=1.231.2.5diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231.2.4 php-src/php.ini-dist:1.231.2.5
--- php-src/php.ini-dist:1.231.2.4 Mon Nov 14 23:14:23 2005
+++ php-src/php.ini-distWed Dec 21 22:43:04 2005
@@ -1035,6 +1035,11 @@
; FreeTDS defaults to 4096
;mssql.max_procs = -1
+; Specify client character set.
+; If empty or not set the client charset from freetds.comf is used
+; This is only used when compiled with FreeTDS
+;mssql.charset = ISO-8859-1
+
[Assertion]
; Assert(expr); active by default.
;assert.active = On
http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.179.2.5r2=1.179.2.6diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179.2.5
php-src/php.ini-recommended:1.179.2.6
--- php-src/php.ini-recommended:1.179.2.5 Mon Nov 14 23:14:23 2005
+++ php-src/php.ini-recommended Wed Dec 21 22:43:04 2005
@@ -1093,6 +1093,11 @@
; FreeTDS defaults to 4096
;mssql.max_procs = -1
+; Specify client character set.
+; If empty or not set the client charset from freetds.comf is used
+; This is only used when compiled with FreeTDS
+;mssql.charset = ISO-8859-1
+
[Assertion]
; Assert(expr); active by default.
;assert.active = On
http://cvs.php.net/viewcvs.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.10r2=1.152.2.11diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.10
php-src/ext/mssql/php_mssql.c:1.152.2.11
--- php-src/ext/mssql/php_mssql.c:1.152.2.10Tue Dec 6 18:47:14 2005
+++ php-src/ext/mssql/php_mssql.c Wed Dec 21 22:43:06 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.10 2005/12/06 18:47:14 iliaa Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.11 2005/12/21 22:43:06 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -141,6 +141,9 @@
STD_PHP_INI_BOOLEAN(mssql.datetimeconvert,1,
PHP_INI_ALL,OnUpdateBool, datetimeconvert,
zend_mssql_globals, mssql_globals)
STD_PHP_INI_BOOLEAN(mssql.secure_connection, 0,
PHP_INI_SYSTEM, OnUpdateBool, secure_connection,
zend_mssql_globals, mssql_globals)
STD_PHP_INI_ENTRY_EX(mssql.max_procs, -1,
PHP_INI_ALL,OnUpdateLong, max_procs,
zend_mssql_globals, mssql_globals, display_link_numbers)
+#ifdef HAVE_FREETDS
+ STD_PHP_INI_ENTRY(mssql.charset,
, PHP_INI_ALL,OnUpdateString, charset,
zend_mssql_globals, mssql_globals)
+#endif
PHP_INI_END()
/* error handler */
@@ -495,7 +498,9 @@
#endif
#ifdef HAVE_FREETDS
- DBSETLCHARSET(mssql.login, ISO-8859-1);
+ if (MS_SQL_G(charset) strlen(MS_SQL_G(charset))) {
+ DBSETLCHARSET(mssql.login, MS_SQL_G(charset));
+ }
#endif
DBSETLAPP(mssql.login,MS_SQL_G(appname));
@@ -1009,7 +1014,7 @@
/* Now to fetch RETVAL and OUTPUT values*/
num_rets = dbnumrets(mssql_ptr-link);
-
+
if (num_rets!=0) {
for (i = 1; i = num_rets; i++) {
parameter = (char*)dbretname(mssql_ptr-link, i);
http://cvs.php.net/viewcvs.cgi/php-src/ext/mssql/php_mssql.h?r1=1.42.2.1r2=1.42.2.2diff_format=u
Index: php-src/ext/mssql/php_mssql.h
diff -u php-src/ext/mssql/php_mssql.h:1.42.2.1
php-src/ext/mssql/php_mssql.h:1.42.2.2
--- php-src/ext/mssql/php_mssql.h:1.42.2.1 Tue Dec 6 01:25:16 2005
+++ php-src/ext/mssql/php_mssql.h Wed Dec 21 22:43:06 2005
@@ -17,7 +17,7 @@
*/
-/* $Id: php_mssql.h,v 1.42.2.1 2005/12/06 01:25:16 sniper Exp $ */
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/zlib php_zlib.def
fmk Thu Dec 15 02:25:58 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/zlib php_zlib.def Log: Export symbols needed by pecl/http http://cvs.php.net/viewcvs.cgi/php-src/ext/zlib/php_zlib.def?r1=1.5r2=1.5.2.1diff_format=u Index: php-src/ext/zlib/php_zlib.def diff -u php-src/ext/zlib/php_zlib.def:1.5 php-src/ext/zlib/php_zlib.def:1.5.2.1 --- php-src/ext/zlib/php_zlib.def:1.5 Sat Aug 6 22:18:41 2005 +++ php-src/ext/zlib/php_zlib.def Thu Dec 15 02:25:58 2005 @@ -13,3 +13,6 @@ crc32 inflateReset deflateReset + zlibVersion + zError + \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib php_zlib.def
fmk Thu Dec 15 02:26:14 2005 EDT Modified files: /php-src/ext/zlib php_zlib.def Log: Export symbols needed by pecl/http http://cvs.php.net/viewcvs.cgi/php-src/ext/zlib/php_zlib.def?r1=1.5r2=1.6diff_format=u Index: php-src/ext/zlib/php_zlib.def diff -u php-src/ext/zlib/php_zlib.def:1.5 php-src/ext/zlib/php_zlib.def:1.6 --- php-src/ext/zlib/php_zlib.def:1.5 Sat Aug 6 22:18:41 2005 +++ php-src/ext/zlib/php_zlib.def Thu Dec 15 02:26:14 2005 @@ -13,3 +13,5 @@ crc32 inflateReset deflateReset + zlibVersion + zError -- 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) /main SAPI.h
fmk Wed Dec 7 14:43:17 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/main SAPI.h Log: Fix win32 build http://cvs.php.net/diff.php/php-src/main/SAPI.h?r1=1.108r2=1.108.2.1ty=u Index: php-src/main/SAPI.h diff -u php-src/main/SAPI.h:1.108 php-src/main/SAPI.h:1.108.2.1 --- php-src/main/SAPI.h:1.108 Thu Jan 8 12:33:04 2004 +++ php-src/main/SAPI.h Wed Dec 7 14:43:14 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: SAPI.h,v 1.108 2004/01/08 17:33:04 sniper Exp $ */ +/* $Id: SAPI.h,v 1.108.2.1 2005/12/07 19:43:14 fmk Exp $ */ #ifndef SAPI_H #define SAPI_H @@ -24,6 +24,9 @@ #include zend.h #include zend_llist.h #include zend_operators.h +#ifdef PHP_WIN32 +#include win95nt.h +#endif #include sys/stat.h #define SAPI_OPTION_NO_CHDIR 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
fmk Mon Nov 21 19:29:34 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
/Gz and /RTC1 is for debug builds
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.50r2=1.51ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.50 php-src/win32/build/config.w32:1.51
--- php-src/win32/build/config.w32:1.50 Sun Nov 20 12:03:58 2005
+++ php-src/win32/build/config.w32 Mon Nov 21 19:29:30 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.50 2005/11/20 17:03:58 sebastian Exp $
+// $Id: config.w32,v 1.51 2005/11/22 00:29:30 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -88,8 +88,10 @@
// Enable automatic precompiled headers
ADD_FLAG('CFLAGS', ' /YX ');
- // Set some debug/release specific options
- ADD_FLAG('CFLAGS', ' /GZ ');
+ if (PHP_DEBUG == yes) {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /GZ ');
+ }
}
if (VCVERS = 14) {
@@ -97,8 +99,10 @@
// disable annoying warnings
ADD_FLAG('CFLAGS', ' /wd4996 ');
- // Set some debug/release specific options
- ADD_FLAG('CFLAGS', ' /RTC1 ');
+ if (PHP_DEBUG == yes) {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /RTC1 ');
+ }
}
// General link flags
--
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) /win32/build config.w32
fmk Mon Nov 21 19:29:56 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/win32/buildconfig.w32
Log:
/Gz and /RTC1 is for debug builds
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.40.2.3r2=1.40.2.4ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.3
php-src/win32/build/config.w32:1.40.2.4
--- php-src/win32/build/config.w32:1.40.2.3 Sun Nov 20 12:03:14 2005
+++ php-src/win32/build/config.w32 Mon Nov 21 19:29:56 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.3 2005/11/20 17:03:14 sebastian Exp $
+// $Id: config.w32,v 1.40.2.4 2005/11/22 00:29:56 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -89,8 +89,10 @@
// Enable automatic precompiled headers
ADD_FLAG('CFLAGS', ' /YX ');
- // Set some debug/release specific options
- ADD_FLAG('CFLAGS', ' /GZ ');
+ if (PHP_DEBUG == yes) {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /GZ ');
+ }
}
if (VCVERS = 14) {
@@ -98,8 +100,10 @@
// disable annoying warnings
ADD_FLAG('CFLAGS', ' /wd4996 ');
- // Set some debug/release specific options
- ADD_FLAG('CFLAGS', ' /RTC1 ');
+ if (PHP_DEBUG == yes) {
+ // Set some debug/release specific options
+ ADD_FLAG('CFLAGS', ' /RTC1 ');
+ }
}
// General link flags
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 14:13:36 2005 EDT
Modified files:
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
Fix #33153 Crash in mssql_next_result().
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2079r2=1.2080ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2079 php-src/NEWS:1.2080
--- php-src/NEWS:1.2079 Fri Nov 18 11:41:49 2005
+++ php-src/NEWSFri Nov 18 14:13:34 2005
@@ -26,3 +26,4 @@
- Added possibility to check in which extension an internal function was
defined using reflection API. (Johannes)
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.155r2=1.156ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.155 php-src/ext/mssql/php_mssql.c:1.156
--- php-src/ext/mssql/php_mssql.c:1.155 Mon Nov 14 18:14:54 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:13:35 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.155 2005/11/14 23:14:54 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.156 2005/11/18 19:13:35 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1865,6 +1865,11 @@
mssql_ptr = result-mssql_ptr;
retvalue = dbresults(mssql_ptr-link);
+
+ while (dbnumcols(mssql_ptr-link) = 0 retvalue == SUCCEED) {
+ retvalue = dbresults(mssql_ptr-link);
+ }
+
if (retvalue == FAIL) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 14:14:33 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33153 Crash in mssql_next_result().
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.203r2=1.2027.2.204ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.203 php-src/NEWS:1.2027.2.204
--- php-src/NEWS:1.2027.2.203 Fri Nov 18 13:59:46 2005
+++ php-src/NEWSFri Nov 18 14:14:31 2005
@@ -3,6 +3,7 @@
?? Nov 2005, PHP 5.1
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
17 Nov 2005, PHP 5.1 Release Candidate 6
- Changed function parameter parsing to handle integers in a non-strict fashion
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.4r2=1.152.2.5ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.4
php-src/ext/mssql/php_mssql.c:1.152.2.5
--- php-src/ext/mssql/php_mssql.c:1.152.2.4 Mon Nov 14 18:14:25 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:14:32 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.4 2005/11/14 23:14:25 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.5 2005/11/18 19:14:32 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1865,6 +1865,11 @@
mssql_ptr = result-mssql_ptr;
retvalue = dbresults(mssql_ptr-link);
+
+ while (dbnumcols(mssql_ptr-link) = 0 retvalue == SUCCEED) {
+ retvalue = dbresults(mssql_ptr-link);
+ }
+
if (retvalue == FAIL) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 14:15:14 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33153 Crash in mssql_next_result().
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.84r2=1.1247.2.920.2.85ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.84 php-src/NEWS:1.1247.2.920.2.85
--- php-src/NEWS:1.1247.2.920.2.84 Fri Nov 18 14:03:09 2005
+++ php-src/NEWSFri Nov 18 14:15:11 2005
@@ -2,6 +2,7 @@
|||
23 Nov 2005, Version 4.4.2
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.4r2=1.86.2.44.2.5ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.4
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.5
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.4 Tue Nov 15 12:33:07 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:15:12 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.4 2005/11/15 17:33:07 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.5 2005/11/18 19:15:12 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1874,6 +1874,11 @@
mssql_ptr = result-mssql_ptr;
retvalue = dbresults(mssql_ptr-link);
+
+ while (dbnumcols(mssql_ptr-link) = 0 retvalue == SUCCEED) {
+ retvalue = dbresults(mssql_ptr-link);
+ }
+
if (retvalue == FAIL) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 14:43:16 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33153 Crash in mssql_next_result().
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.516r2=1.1760.2.517ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.516 php-src/NEWS:1.1760.2.517
--- php-src/NEWS:1.1760.2.516 Fri Nov 18 06:01:04 2005
+++ php-src/NEWSFri Nov 18 14:43:03 2005
@@ -58,6 +58,7 @@
- Fixed bug #33383 (crash when retrieving empty LOBs). (Tony)
- Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references).
(Tony)
- Fixed bug #29983 (PHP does not explicitly set mime type charset). (Ilia)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.11r2=1.137.2.12ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.11
php-src/ext/mssql/php_mssql.c:1.137.2.12
--- php-src/ext/mssql/php_mssql.c:1.137.2.11Wed Nov 16 13:24:30 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:43:15 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.11 2005/11/16 18:24:30 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.12 2005/11/18 19:43:15 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1835,6 +1835,11 @@
mssql_ptr = result-mssql_ptr;
retvalue = dbresults(mssql_ptr-link);
+
+ while (dbnumcols(mssql_ptr-link) = 0 retvalue == SUCCEED) {
+ retvalue = dbresults(mssql_ptr-link);
+ }
+
if (retvalue == FAIL) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:40:28 2005 EDT
Modified files:
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
Fix #32009 crash when mssql_bind() is called more than once
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2080r2=1.2081ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2080 php-src/NEWS:1.2081
--- php-src/NEWS:1.2080 Fri Nov 18 14:13:34 2005
+++ php-src/NEWSFri Nov 18 15:40:19 2005
@@ -27,3 +27,4 @@
defined using reflection API. (Johannes)
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
+- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.156r2=1.157ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.156 php-src/ext/mssql/php_mssql.c:1.157
--- php-src/ext/mssql/php_mssql.c:1.156 Fri Nov 18 14:13:35 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:40:28 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.156 2005/11/18 19:13:35 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.157 2005/11/18 20:40:28 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2114,17 +2114,22 @@
zend_hash_init(statement-binds, 13, NULL,
_mssql_bind_hash_dtor, 0);
}
- memset((void*)bind,0,sizeof(mssql_bind));
-
zend_hash_add(statement-binds,Z_STRVAL_PP(param_name),Z_STRLEN_PP(param_name),bind,sizeof(mssql_bind),(void
**)bindp);
- if( NULL == bindp ) RETURN_FALSE;
- bindp-zval=*var;
- zval_add_ref(var);
-
- /* no call to dbrpcparam if RETVAL */
- if ( strcmp(RETVAL,Z_STRVAL_PP(param_name))!=0 ) {
- if (dbrpcparam(mssql_ptr-link, Z_STRVAL_PP(param_name),
(BYTE)status, type, maxlen, datalen, (LPBYTE)value)==FAIL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
set parameter);
- RETURN_FALSE;
+ if (zend_hash_exists(statement-binds, Z_STRVAL_PP(param_name),
Z_STRLEN_PP(param_name))) {
+ RETURN_FALSE;
+ }
+ else {
+ memset((void*)bind,0,sizeof(mssql_bind));
+ zend_hash_add(statement-binds, Z_STRVAL_PP(param_name),
Z_STRLEN_PP(param_name), bind, sizeof(mssql_bind), (void **)bindp);
+ if( NULL == bindp ) RETURN_FALSE;
+ bindp-zval=*var;
+ zval_add_ref(var);
+
+ /* no call to dbrpcparam if RETVAL */
+ if ( strcmp(RETVAL,Z_STRVAL_PP(param_name))!=0 ) {
+ if (dbrpcparam(mssql_ptr-link,
Z_STRVAL_PP(param_name), (BYTE)status, type, maxlen, datalen,
(LPBYTE)value)==FAIL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Unable to set parameter);
+ RETURN_FALSE;
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:40:53 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #32009 crash when mssql_bind() is called more than once
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.204r2=1.2027.2.205ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.204 php-src/NEWS:1.2027.2.205
--- php-src/NEWS:1.2027.2.204 Fri Nov 18 14:14:31 2005
+++ php-src/NEWSFri Nov 18 15:40:51 2005
@@ -4,6 +4,7 @@
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
+- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
17 Nov 2005, PHP 5.1 Release Candidate 6
- Changed function parameter parsing to handle integers in a non-strict fashion
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.5r2=1.152.2.6ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.5
php-src/ext/mssql/php_mssql.c:1.152.2.6
--- php-src/ext/mssql/php_mssql.c:1.152.2.5 Fri Nov 18 14:14:32 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:40:52 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.5 2005/11/18 19:14:32 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.6 2005/11/18 20:40:52 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2116,17 +2116,22 @@
zend_hash_init(statement-binds, 13, NULL,
_mssql_bind_hash_dtor, 0);
}
- memset((void*)bind,0,sizeof(mssql_bind));
-
zend_hash_add(statement-binds,Z_STRVAL_PP(param_name),Z_STRLEN_PP(param_name),bind,sizeof(mssql_bind),(void
**)bindp);
- if( NULL == bindp ) RETURN_FALSE;
- bindp-zval=*var;
- zval_add_ref(var);
-
- /* no call to dbrpcparam if RETVAL */
- if ( strcmp(RETVAL,Z_STRVAL_PP(param_name))!=0 ) {
- if (dbrpcparam(mssql_ptr-link, Z_STRVAL_PP(param_name),
(BYTE)status, type, maxlen, datalen, (LPBYTE)value)==FAIL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
set parameter);
- RETURN_FALSE;
+ if (zend_hash_exists(statement-binds, Z_STRVAL_PP(param_name),
Z_STRLEN_PP(param_name))) {
+ RETURN_FALSE;
+ }
+ else {
+ memset((void*)bind,0,sizeof(mssql_bind));
+ zend_hash_add(statement-binds, Z_STRVAL_PP(param_name),
Z_STRLEN_PP(param_name), bind, sizeof(mssql_bind), (void **)bindp);
+ if( NULL == bindp ) RETURN_FALSE;
+ bindp-zval=*var;
+ zval_add_ref(var);
+
+ /* no call to dbrpcparam if RETVAL */
+ if ( strcmp(RETVAL,Z_STRVAL_PP(param_name))!=0 ) {
+ if (dbrpcparam(mssql_ptr-link,
Z_STRVAL_PP(param_name), (BYTE)status, type, maxlen, datalen,
(LPBYTE)value)==FAIL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Unable to set parameter);
+ RETURN_FALSE;
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:41:03 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #32009 crash when mssql_bind() is called more than once
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.517r2=1.1760.2.518ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.517 php-src/NEWS:1.1760.2.518
--- php-src/NEWS:1.1760.2.517 Fri Nov 18 14:43:03 2005
+++ php-src/NEWSFri Nov 18 15:41:02 2005
@@ -59,6 +59,7 @@
- Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references).
(Tony)
- Fixed bug #29983 (PHP does not explicitly set mime type charset). (Ilia)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
+- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.12r2=1.137.2.13ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.12
php-src/ext/mssql/php_mssql.c:1.137.2.13
--- php-src/ext/mssql/php_mssql.c:1.137.2.12Fri Nov 18 14:43:15 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:41:03 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.12 2005/11/18 19:43:15 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.13 2005/11/18 20:41:03 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2083,17 +2083,22 @@
zend_hash_init(statement-binds, 13, NULL,
_mssql_bind_hash_dtor, 0);
}
- memset((void*)bind,0,sizeof(mssql_bind));
-
zend_hash_add(statement-binds,Z_STRVAL_PP(param_name),Z_STRLEN_PP(param_name),bind,sizeof(mssql_bind),(void
**)bindp);
- if( NULL == bindp ) RETURN_FALSE;
- bindp-zval=*var;
- zval_add_ref(var);
-
- /* no call to dbrpcparam if RETVAL */
- if ( strcmp(RETVAL,Z_STRVAL_PP(param_name))!=0 ) {
- if (dbrpcparam(mssql_ptr-link, Z_STRVAL_PP(param_name),
(BYTE)status, type, maxlen, datalen, (LPBYTE)value)==FAIL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
set parameter);
- RETURN_FALSE;
+ if (zend_hash_exists(statement-binds, Z_STRVAL_PP(param_name),
Z_STRLEN_PP(param_name))) {
+ RETURN_FALSE;
+ }
+ else {
+ memset((void*)bind,0,sizeof(mssql_bind));
+ zend_hash_add(statement-binds, Z_STRVAL_PP(param_name),
Z_STRLEN_PP(param_name), bind, sizeof(mssql_bind), (void **)bindp);
+ if( NULL == bindp ) RETURN_FALSE;
+ bindp-zval=*var;
+ zval_add_ref(var);
+
+ /* no call to dbrpcparam if RETVAL */
+ if ( strcmp(RETVAL,Z_STRVAL_PP(param_name))!=0 ) {
+ if (dbrpcparam(mssql_ptr-link,
Z_STRVAL_PP(param_name), (BYTE)status, type, maxlen, datalen,
(LPBYTE)value)==FAIL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Unable to set parameter);
+ RETURN_FALSE;
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:41:52 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #32009 crash when mssql_bind() is called more than once
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.85r2=1.1247.2.920.2.86ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.85 php-src/NEWS:1.1247.2.920.2.86
--- php-src/NEWS:1.1247.2.920.2.85 Fri Nov 18 14:15:11 2005
+++ php-src/NEWSFri Nov 18 15:41:49 2005
@@ -3,6 +3,7 @@
23 Nov 2005, Version 4.4.2
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
+- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.5r2=1.86.2.44.2.6ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.5
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.6
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.5 Fri Nov 18 14:15:12 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:41:51 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.5 2005/11/18 19:15:12 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.6 2005/11/18 20:41:51 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2130,17 +2130,22 @@
zend_hash_init(statement-binds, 13, NULL,
_mssql_bind_hash_dtor, 0);
}
- memset((void*)bind,0,sizeof(mssql_bind));
-
zend_hash_add(statement-binds,Z_STRVAL_PP(param_name),Z_STRLEN_PP(param_name),bind,sizeof(mssql_bind),(void
**)bindp);
- if( NULL == bindp ) RETURN_FALSE;
- bindp-zval=*var;
- zval_add_ref(var);
-
- /* no call to dbrpcparam if RETVAL */
- if ( strcmp(RETVAL,Z_STRVAL_PP(param_name))!=0 ) {
- if (dbrpcparam(mssql_ptr-link, Z_STRVAL_PP(param_name),
(BYTE)status, type, maxlen, datalen, (LPBYTE)value)==FAIL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
set parameter);
- RETURN_FALSE;
+ if (zend_hash_exists(statement-binds, Z_STRVAL_PP(param_name),
Z_STRLEN_PP(param_name))) {
+ RETURN_FALSE;
+ }
+ else {
+ memset((void*)bind,0,sizeof(mssql_bind));
+ zend_hash_add(statement-binds, Z_STRVAL_PP(param_name),
Z_STRLEN_PP(param_name), bind, sizeof(mssql_bind), (void **)bindp);
+ if( NULL == bindp ) RETURN_FALSE;
+ bindp-zval=*var;
+ zval_add_ref(var);
+
+ /* no call to dbrpcparam if RETVAL */
+ if ( strcmp(RETVAL,Z_STRVAL_PP(param_name))!=0 ) {
+ if (dbrpcparam(mssql_ptr-link,
Z_STRVAL_PP(param_name), (BYTE)status, type, maxlen, datalen,
(LPBYTE)value)==FAIL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Unable to set parameter);
+ RETURN_FALSE;
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:48:23 2005 EDT
Modified files:
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
Fix #33963. mssql_bind fails on input parameters
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2081r2=1.2082ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2081 php-src/NEWS:1.2082
--- php-src/NEWS:1.2081 Fri Nov 18 15:40:19 2005
+++ php-src/NEWSFri Nov 18 15:48:19 2005
@@ -28,3 +28,4 @@
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
+- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.157r2=1.158ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.157 php-src/ext/mssql/php_mssql.c:1.158
--- php-src/ext/mssql/php_mssql.c:1.157 Fri Nov 18 15:40:28 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:48:22 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.157 2005/11/18 20:40:28 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.158 2005/11/18 20:48:22 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2041,7 +2041,9 @@
type=Z_LVAL_PP(yytype);
is_output=Z_LVAL_PP(yyis_output);
is_null=Z_LVAL_PP(yyis_null);
- maxlen=Z_LVAL_PP(yymaxlen);
+ if (is_output) {
+ maxlen=Z_LVAL_PP(yymaxlen);
+ }
}
break;
--
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
fmk Fri Nov 18 15:48:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: MFH Fix #33963. mssql_bind fails on input parameters http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.205r2=1.2027.2.206ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.205 php-src/NEWS:1.2027.2.206 --- php-src/NEWS:1.2027.2.205 Fri Nov 18 15:40:51 2005 +++ php-src/NEWSFri Nov 18 15:48:46 2005 @@ -5,6 +5,7 @@ - Fixed bug #35273 (Error in mapping soap - java types). (Dmitry) - Fixed bug #33153 (crash in mssql_next result). (Frank) - Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank) +- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank) 17 Nov 2005, PHP 5.1 Release Candidate 6 - Changed function parameter parsing to handle integers in a non-strict fashion -- 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/mssql php_mssql.c
fmk Fri Nov 18 15:49:02 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH Fix #33963. mssql_bind fails on input parameters
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.518r2=1.1760.2.519ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.518 php-src/NEWS:1.1760.2.519
--- php-src/NEWS:1.1760.2.518 Fri Nov 18 15:41:02 2005
+++ php-src/NEWSFri Nov 18 15:49:00 2005
@@ -60,6 +60,7 @@
- Fixed bug #29983 (PHP does not explicitly set mime type charset). (Ilia)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
+- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.13r2=1.137.2.14ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.13
php-src/ext/mssql/php_mssql.c:1.137.2.14
--- php-src/ext/mssql/php_mssql.c:1.137.2.13Fri Nov 18 15:41:03 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:49:01 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.13 2005/11/18 20:41:03 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.14 2005/11/18 20:49:01 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2010,7 +2010,9 @@
type=Z_LVAL_PP(yytype);
is_output=Z_LVAL_PP(yyis_output);
is_null=Z_LVAL_PP(yyis_null);
- maxlen=Z_LVAL_PP(yymaxlen);
+ if (is_output) {
+ maxlen=Z_LVAL_PP(yymaxlen);
+ }
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:49:18 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH Fix #33963. mssql_bind fails on input parameters
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.86r2=1.1247.2.920.2.87ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.86 php-src/NEWS:1.1247.2.920.2.87
--- php-src/NEWS:1.1247.2.920.2.86 Fri Nov 18 15:41:49 2005
+++ php-src/NEWSFri Nov 18 15:49:15 2005
@@ -4,6 +4,7 @@
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
+- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.6r2=1.86.2.44.2.7ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.6
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.7
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.6 Fri Nov 18 15:41:51 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:49:16 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.6 2005/11/18 20:41:51 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.7 2005/11/18 20:49:16 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2057,7 +2057,9 @@
type=Z_LVAL_PP(yytype);
is_output=Z_LVAL_PP(yyis_output);
is_null=Z_LVAL_PP(yyis_null);
- maxlen=Z_LVAL_PP(yymaxlen);
+ if (is_output) {
+ maxlen=Z_LVAL_PP(yymaxlen);
+ }
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 16:22:51 2005 EDT
Modified files:
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
Fix #33201 Crash when fetching some data types
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2082r2=1.2083ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2082 php-src/NEWS:1.2083
--- php-src/NEWS:1.2082 Fri Nov 18 15:48:19 2005
+++ php-src/NEWSFri Nov 18 16:22:40 2005
@@ -29,3 +29,4 @@
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
+- Fixed bug #33201 (Crash when fetching some data types). (Frank)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.158r2=1.159ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.158 php-src/ext/mssql/php_mssql.c:1.159
--- php-src/ext/mssql/php_mssql.c:1.158 Fri Nov 18 15:48:22 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 16:22:50 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.158 2005/11/18 20:48:22 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.159 2005/11/18 21:22:50 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -891,11 +891,9 @@
if ((column_type != SQLDATETIME column_type
!= SQLDATETIM4) || MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -903,6 +901,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
@@ -961,11 +961,9 @@
if ((column_type != SQLDATETIME column_type != SQLDATETIM4)
|| MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -973,6 +971,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
--
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 /ext/mssql php_mssql.c
fmk Fri Nov 18 16:23:21 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33201 Crash when fetching some data types
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.206r2=1.2027.2.207ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.206 php-src/NEWS:1.2027.2.207
--- php-src/NEWS:1.2027.2.206 Fri Nov 18 15:48:46 2005
+++ php-src/NEWSFri Nov 18 16:23:19 2005
@@ -6,6 +6,7 @@
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
+- Fixed bug #33201 (Crash when fetching some data types). (Frank)
17 Nov 2005, PHP 5.1 Release Candidate 6
- Changed function parameter parsing to handle integers in a non-strict fashion
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.6r2=1.152.2.7ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.6
php-src/ext/mssql/php_mssql.c:1.152.2.7
--- php-src/ext/mssql/php_mssql.c:1.152.2.6 Fri Nov 18 15:40:52 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 16:23:20 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.6 2005/11/18 20:40:52 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.7 2005/11/18 21:23:20 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -891,11 +891,9 @@
if ((column_type != SQLDATETIME column_type
!= SQLDATETIM4) || MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -903,6 +901,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
@@ -961,11 +961,9 @@
if ((column_type != SQLDATETIME column_type != SQLDATETIM4)
|| MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -973,6 +971,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
--
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/mssql php_mssql.c
fmk Fri Nov 18 16:23:46 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33201 Crash when fetching some data types
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.519r2=1.1760.2.520ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.519 php-src/NEWS:1.1760.2.520
--- php-src/NEWS:1.1760.2.519 Fri Nov 18 15:49:00 2005
+++ php-src/NEWSFri Nov 18 16:23:45 2005
@@ -61,6 +61,7 @@
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
+- Fixed bug #33201 (Crash when fetching some data types). (Frank)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.14r2=1.137.2.15ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.14
php-src/ext/mssql/php_mssql.c:1.137.2.15
--- php-src/ext/mssql/php_mssql.c:1.137.2.14Fri Nov 18 15:49:01 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 16:23:45 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.14 2005/11/18 20:49:01 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.15 2005/11/18 21:23:45 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -865,11 +865,9 @@
if ((column_type != SQLDATETIME column_type
!= SQLDATETIM4) || MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -877,6 +875,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
@@ -935,11 +935,9 @@
if ((column_type != SQLDATETIME column_type != SQLDATETIM4)
|| MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -947,6 +945,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 16:24:07 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33201 Crash when fetching some data types
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.87r2=1.1247.2.920.2.88ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.87 php-src/NEWS:1.1247.2.920.2.88
--- php-src/NEWS:1.1247.2.920.2.87 Fri Nov 18 15:49:15 2005
+++ php-src/NEWSFri Nov 18 16:24:05 2005
@@ -5,6 +5,7 @@
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
+- Fixed bug #33201 (Crash when fetching some data types). (Frank)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.7r2=1.86.2.44.2.8ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.7
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.8
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.7 Fri Nov 18 15:49:16 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 16:24:06 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.7 2005/11/18 20:49:16 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.8 2005/11/18 21:24:06 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -891,11 +891,9 @@
if ((column_type != SQLDATETIME column_type
!= SQLDATETIM4) || MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -903,6 +901,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
@@ -965,11 +965,9 @@
if ((column_type != SQLDATETIME column_type != SQLDATETIM4)
|| MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -977,6 +975,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
The fix was already in the code. It was included in my previous commit. - Frank Frank, you committed only NEWS file in 5.1 branch. On 18.11.2005 23:48, Frank M. Kromann wrote: fmk Fri Nov 18 15:48:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: MFH Fix #33963. mssql_bind fails on input parameters http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.205r2=1.2027.2.206ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.205 php-src/NEWS:1.2027.2.206 --- php-src/NEWS:1.2027.2.205 Fri Nov 18 15:40:51 2005 +++ php-src/NEWSFri Nov 18 15:48:46 2005 @@ -5,6 +5,7 @@ - Fixed bug #35273 (Error in mapping soap - java types). (Dmitry) - Fixed bug #33153 (crash in mssql_next result). (Frank) - Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank) +- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank) 17 Nov 2005, PHP 5.1 Release Candidate 6 - Changed function parameter parsing to handle integers in a non-strict fashion -- Wbr, Antony Dovgal -- 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/mssql php_mssql.c
fmk Wed Nov 16 13:24:33 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mssql php_mssql.c
Log:
Remove unused ifdef
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.10r2=1.137.2.11ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.10
php-src/ext/mssql/php_mssql.c:1.137.2.11
--- php-src/ext/mssql/php_mssql.c:1.137.2.10Tue Nov 1 13:17:31 2005
+++ php-src/ext/mssql/php_mssql.c Wed Nov 16 13:24:30 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.10 2005/11/01 18:17:31 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.11 2005/11/16 18:24:30 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -841,7 +841,6 @@
ZVAL_STRINGL(result, data, 16, 1);
}
break;
-#endif
case SQLVARBINARY:
case SQLBINARY:
case SQLIMAGE: {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / php.ini-dist php.ini-recommended /ext/mssql php_mssql.c
Hi Jani,
Sure. What about PHP_5_0?
- Frank
Can you MFH to PHP_4_4 too?
--Jani
On Mon, 14 Nov 2005, Frank M. Kromann wrote:
fmk Mon Nov 14 18:14:27 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src php.ini-dist php.ini-recommended
/php-src/ext/mssql php_mssql.c
Log:
Change max_procs from 25 to library default. This will make FreeTDS
connections work a bit better
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.231.2.3r2=1.231.2.4ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231.2.3 php-src/php.ini-dist:1.231.2.4
--- php-src/php.ini-dist:1.231.2.3 Sun Nov 6 06:09:32 2005
+++ php-src/php.ini-distMon Nov 14 18:14:23 2005
@@ -1030,8 +1030,10 @@
; Use NT authentication when connecting to the server
mssql.secure_connection = Off
-; Specify max number of processes. Default = 25
-;mssql.max_procs = 25
+; Specify max number of processes. -1 = library default
+; msdlib defaults to 25
+; FreeTDS defaults to 4096
+;mssql.max_procs = -1
[Assertion]
; Assert(expr); active by default.
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.179.2.4r2=1.179.2.5ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179.2.4
php-src/php.ini-recommended:1.179.2.5
--- php-src/php.ini-recommended:1.179.2.4 Sun Nov 6 06:09:32 2005
+++ php-src/php.ini-recommended Mon Nov 14 18:14:23 2005
@@ -1088,8 +1088,10 @@
; Use NT authentication when connecting to the server
mssql.secure_connection = Off
-; Specify max number of processes. Default = 25
-;mssql.max_procs = 25
+; Specify max number of processes. -1 = library default
+; msdlib defaults to 25
+; FreeTDS defaults to 4096
+;mssql.max_procs = -1
[Assertion]
; Assert(expr); active by default.
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.3r2=1.152.2.4ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.3
php-src/ext/mssql/php_mssql.c:1.152.2.4
--- php-src/ext/mssql/php_mssql.c:1.152.2.3 Sat Nov 5 21:59:18 2005
+++ php-src/ext/mssql/php_mssql.c Mon Nov 14 18:14:25 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.3 2005/11/06 02:59:18 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.4 2005/11/14 23:14:25 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -140,7 +140,7 @@
STD_PHP_INI_ENTRY_EX(mssql.batchsize,
0,PHP_INI_ALL,OnUpdateLong, batchsize,
zend_mssql_globals, mssql_globals,
display_link_numbers)
STD_PHP_INI_BOOLEAN(mssql.datetimeconvert,
1,PHP_INI_ALL,OnUpdateBool, datetimeconvert,
zend_mssql_globals, mssql_globals)
STD_PHP_INI_BOOLEAN(mssql.secure_connection, 0,
PHP_INI_SYSTEM,
OnUpdateBool, secure_connection, zend_mssql_globals,
mssql_globals)
- STD_PHP_INI_ENTRY_EX(mssql.max_procs, 25,
PHP_INI_ALL,OnUpdateLong, max_procs,
zend_mssql_globals, mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX(mssql.max_procs, -1,
PHP_INI_ALL,OnUpdateLong, max_procs,
zend_mssql_globals, mssql_globals, display_link_numbers)
PHP_INI_END()
/* error handler */
@@ -341,7 +341,9 @@
dbsetlogintime(MS_SQL_G(connect_timeout));
if (MS_SQL_G(timeout) 0) MS_SQL_G(timeout) = 60;
dbsettime(MS_SQL_G(timeout));
- dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs));
+ if (MS_SQL_G(max_procs) != -1) {
+ dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs));
+ }
return SUCCESS;
}
--
Give me your money at @ http://pecl.php.net/wishlist.php/sniper
Donating money may make me happier and friendlier for a limited period!
Death to all 4 letter abbreviations starting with P!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / php.ini-dist php.ini-recommended /ext/mssql php_mssql.c
fmk Tue Nov 15 12:33:07 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcphp.ini-dist php.ini-recommended
/php-src/ext/mssql php_mssql.c
Log:
MFH: Change max_procs to follow library standard.
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.171.2.28r2=1.171.2.28.2.1ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.171.2.28 php-src/php.ini-dist:1.171.2.28.2.1
--- php-src/php.ini-dist:1.171.2.28 Thu Apr 28 09:14:45 2005
+++ php-src/php.ini-distTue Nov 15 12:33:04 2005
@@ -962,8 +962,10 @@
; Use NT authentication when connecting to the server
mssql.secure_connection = Off
-; Specify max number of processes. Default = 25
-;mssql.max_procs = 25
+; Specify max number of processes. -1 = library default
+; msdlib defaults to 25
+; FreeTDS defaults to 4096
+;mssql.max_procs = -1
[Assertion]
; Assert(expr); active by default.
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.119.2.25r2=1.119.2.25.2.1ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.119.2.25
php-src/php.ini-recommended:1.119.2.25.2.1
--- php-src/php.ini-recommended:1.119.2.25 Thu Apr 28 09:14:46 2005
+++ php-src/php.ini-recommended Tue Nov 15 12:33:04 2005
@@ -960,8 +960,10 @@
; Use NT authentication when connecting to the server
mssql.secure_connection = Off
-; Specify max number of processes. Default = 25
-;mssql.max_procs = 25
+; Specify max number of processes. -1 = library default
+; msdlib defaults to 25
+; FreeTDS defaults to 4096
+;mssql.max_procs = -1
[Assertion]
; Assert(expr); active by default.
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.3r2=1.86.2.44.2.4ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.3
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.4
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.3 Sat Nov 5 22:06:14 2005
+++ php-src/ext/mssql/php_mssql.c Tue Nov 15 12:33:07 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.3 2005/11/06 03:06:14 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.4 2005/11/15 17:33:07 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -138,7 +138,7 @@
STD_PHP_INI_ENTRY_EX(mssql.batchsize, 0,
PHP_INI_ALL,OnUpdateInt,batchsize,
zend_mssql_globals, mssql_globals, display_link_numbers)
STD_PHP_INI_BOOLEAN(mssql.datetimeconvert,1,
PHP_INI_ALL,OnUpdateBool, datetimeconvert,
zend_mssql_globals, mssql_globals)
STD_PHP_INI_BOOLEAN(mssql.secure_connection, 0,
PHP_INI_SYSTEM, OnUpdateBool, secure_connection,
zend_mssql_globals, mssql_globals)
- STD_PHP_INI_ENTRY_EX(mssql.max_procs, 25,
PHP_INI_ALL,OnUpdateInt,max_procs,
zend_mssql_globals, mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX(mssql.max_procs, -1,
PHP_INI_ALL,OnUpdateInt,max_procs,
zend_mssql_globals, mssql_globals, display_link_numbers)
PHP_INI_END()
/* error handler */
@@ -337,7 +337,9 @@
dbsetlogintime(MS_SQL_G(connect_timeout));
if (MS_SQL_G(timeout) 0) MS_SQL_G(timeout) = 60;
dbsettime(MS_SQL_G(timeout));
- dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs));
+ if (MS_SQL_G(max_procs) != -1) {
+ dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs));
+ }
return SUCCESS;
}
@@ -862,6 +864,7 @@
ZVAL_STRINGL(result, data, 16, 1);
}
break;
+#endif
case SQLVARBINARY:
case SQLBINARY:
case SQLIMAGE: {
--
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) / php.ini-dist php.ini-recommended /ext/mssql php_mssql.c
fmk Mon Nov 14 18:14:27 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcphp.ini-dist php.ini-recommended
/php-src/ext/mssql php_mssql.c
Log:
Change max_procs from 25 to library default. This will make FreeTDS
connections work a bit better
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.231.2.3r2=1.231.2.4ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231.2.3 php-src/php.ini-dist:1.231.2.4
--- php-src/php.ini-dist:1.231.2.3 Sun Nov 6 06:09:32 2005
+++ php-src/php.ini-distMon Nov 14 18:14:23 2005
@@ -1030,8 +1030,10 @@
; Use NT authentication when connecting to the server
mssql.secure_connection = Off
-; Specify max number of processes. Default = 25
-;mssql.max_procs = 25
+; Specify max number of processes. -1 = library default
+; msdlib defaults to 25
+; FreeTDS defaults to 4096
+;mssql.max_procs = -1
[Assertion]
; Assert(expr); active by default.
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.179.2.4r2=1.179.2.5ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179.2.4
php-src/php.ini-recommended:1.179.2.5
--- php-src/php.ini-recommended:1.179.2.4 Sun Nov 6 06:09:32 2005
+++ php-src/php.ini-recommended Mon Nov 14 18:14:23 2005
@@ -1088,8 +1088,10 @@
; Use NT authentication when connecting to the server
mssql.secure_connection = Off
-; Specify max number of processes. Default = 25
-;mssql.max_procs = 25
+; Specify max number of processes. -1 = library default
+; msdlib defaults to 25
+; FreeTDS defaults to 4096
+;mssql.max_procs = -1
[Assertion]
; Assert(expr); active by default.
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.3r2=1.152.2.4ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.3
php-src/ext/mssql/php_mssql.c:1.152.2.4
--- php-src/ext/mssql/php_mssql.c:1.152.2.3 Sat Nov 5 21:59:18 2005
+++ php-src/ext/mssql/php_mssql.c Mon Nov 14 18:14:25 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.3 2005/11/06 02:59:18 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.4 2005/11/14 23:14:25 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -140,7 +140,7 @@
STD_PHP_INI_ENTRY_EX(mssql.batchsize, 0,
PHP_INI_ALL,OnUpdateLong, batchsize,
zend_mssql_globals, mssql_globals, display_link_numbers)
STD_PHP_INI_BOOLEAN(mssql.datetimeconvert,1,
PHP_INI_ALL,OnUpdateBool, datetimeconvert,
zend_mssql_globals, mssql_globals)
STD_PHP_INI_BOOLEAN(mssql.secure_connection, 0,
PHP_INI_SYSTEM, OnUpdateBool, secure_connection,
zend_mssql_globals, mssql_globals)
- STD_PHP_INI_ENTRY_EX(mssql.max_procs, 25,
PHP_INI_ALL,OnUpdateLong, max_procs,
zend_mssql_globals, mssql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX(mssql.max_procs, -1,
PHP_INI_ALL,OnUpdateLong, max_procs,
zend_mssql_globals, mssql_globals, display_link_numbers)
PHP_INI_END()
/* error handler */
@@ -341,7 +341,9 @@
dbsetlogintime(MS_SQL_G(connect_timeout));
if (MS_SQL_G(timeout) 0) MS_SQL_G(timeout) = 60;
dbsettime(MS_SQL_G(timeout));
- dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs));
+ if (MS_SQL_G(max_procs) != -1) {
+ dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs));
+ }
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c
fmk Tue Nov 1 13:14:56 2005 EDT
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
Fix #35037. Selecting a uniqueidentifier would return unknown data type when
used with freetds.
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.153r2=1.154ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.153 php-src/ext/mssql/php_mssql.c:1.154
--- php-src/ext/mssql/php_mssql.c:1.153 Mon Sep 5 01:05:34 2005
+++ php-src/ext/mssql/php_mssql.c Tue Nov 1 13:14:52 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.153 2005/09/05 05:05:34 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.154 2005/11/01 18:14:52 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -856,13 +856,15 @@
break;
#ifdef SQLUNIQUE
case SQLUNIQUE: {
+#else
+ case 36: { /* FreeTDS hack */
+#endif
char *data = charcol(offset);
/* uniqueidentifier is a 16-byte binary number */
ZVAL_STRINGL(result, data, 16, 1);
}
break;
-#endif
case SQLVARBINARY:
case SQLBINARY:
case SQLIMAGE: {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mssql php_mssql.c
fmk Tue Nov 1 13:15:45 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #35037. Selecting a uniqueidentifier would return unknown data type
when used with freetds.
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.1r2=1.152.2.2ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.1
php-src/ext/mssql/php_mssql.c:1.152.2.2
--- php-src/ext/mssql/php_mssql.c:1.152.2.1 Mon Sep 5 01:04:31 2005
+++ php-src/ext/mssql/php_mssql.c Tue Nov 1 13:15:44 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.1 2005/09/05 05:04:31 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.2 2005/11/01 18:15:44 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -856,6 +856,9 @@
break;
#ifdef SQLUNIQUE
case SQLUNIQUE: {
+#else
+ case 36: { /* FreeTDS hack */
+#endif
char *data = charcol(offset);
/* uniqueidentifier is a 16-byte binary number */
--
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/mssql php_mssql.c
fmk Tue Nov 1 13:17:32 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #35037. Selecting a uniqueidentifier would return unknown data type
when used with freetds.
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.9r2=1.137.2.10ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.9
php-src/ext/mssql/php_mssql.c:1.137.2.10
--- php-src/ext/mssql/php_mssql.c:1.137.2.9 Tue Apr 12 13:46:06 2005
+++ php-src/ext/mssql/php_mssql.c Tue Nov 1 13:17:31 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.9 2005/04/12 17:46:06 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.10 2005/11/01 18:17:31 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -832,6 +832,9 @@
break;
#ifdef SQLUNIQUE
case SQLUNIQUE: {
+#else
+ case 36: { /* FreeTDS hack */
+#endif
char *data = charcol(offset);
/* uniqueidentifier is a 16-byte binary number */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mssql php_mssql.c
fmk Tue Nov 1 13:20:01 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #35037. Selecting a uniqueidentifier would return unknown data type
when used with freetds.
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.1r2=1.86.2.44.2.2ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.1
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.2
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.1 Mon Sep 5 01:03:21 2005
+++ php-src/ext/mssql/php_mssql.c Tue Nov 1 13:20:00 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.1 2005/09/05 05:03:21 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.2 2005/11/01 18:20:00 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -853,6 +853,9 @@
break;
#ifdef SQLUNIQUE
case SQLUNIQUE: {
+#else
+ case 36: { /* FreeTDS hack */
+#endif
char *data = charcol(offset);
/* uniqueidentifier is a 16-byte binary number */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard php_string.h
fmk Fri Oct 28 15:21:49 2005 EDT Modified files: /php-src/ext/standard php_string.h Log: Adding missing function declarations to fix win32 build http://cvs.php.net/diff.php/php-src/ext/standard/php_string.h?r1=1.92r2=1.93ty=u Index: php-src/ext/standard/php_string.h diff -u php-src/ext/standard/php_string.h:1.92 php-src/ext/standard/php_string.h:1.93 --- php-src/ext/standard/php_string.h:1.92 Thu Oct 20 15:25:54 2005 +++ php-src/ext/standard/php_string.h Fri Oct 28 15:21:46 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_string.h,v 1.92 2005/10/20 19:25:54 rolland Exp $ */ +/* $Id: php_string.h,v 1.93 2005/10/28 19:21:46 fmk Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -132,6 +132,9 @@ PHPAPI size_t php_dirname(char *str, size_t len); PHPAPI UChar *php_u_stristr(UChar *s, UChar *t, int32_t s_len, int32_t t_len); PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_t t_len); +PHPAPI int32_t php_u_strspn(UChar *s1, UChar *s2, UChar *s1_end, UChar *s2_end); +PHPAPI size_t php_strspn(char *s1, char *s2, char *s1_end, char *s2_end); +PHPAPI int32_t php_u_strcspn(UChar *s1, UChar *s2, UChar *s1_end, UChar *s2_end); PHPAPI char *php_str_to_str_ex(char *haystack, int length, char *needle, int needle_len, char *str, int str_len, int *_new_length, int case_sensitivity, int *replace_count); PHPAPI char *php_str_to_str(char *haystack, int length, char *needle, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
fmk Fri Oct 28 15:29:36 2005 EDT
Modified files:
/php-src/ext/standard string.c
Log:
Make sure haystack_len is initialized before it's used
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.504r2=1.505ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.504 php-src/ext/standard/string.c:1.505
--- php-src/ext/standard/string.c:1.504 Mon Oct 24 10:35:02 2005
+++ php-src/ext/standard/string.c Fri Oct 28 15:29:29 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.504 2005/10/24 14:35:02 rolland Exp $ */
+/* $Id: string.c,v 1.505 2005/10/28 19:29:29 fmk Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2404,6 +2404,7 @@
RETURN_FALSE;
}
+ haystack_len = Z_UNILEN_P(haystack);
if (Z_TYPE_P(needle) == IS_UNICODE || Z_TYPE_P(needle) == IS_BINARY ||
Z_TYPE_P(needle) == IS_STRING) {
if (!Z_UNILEN_P(needle)) {
RETURN_FALSE;
@@ -2418,7 +2419,6 @@
convert_to_explicit_type(needle, str_type);
}
}
- haystack_len = Z_UNILEN_P(haystack);
needle_len = Z_UNILEN_P(needle);
if (Z_TYPE_P(haystack) == IS_UNICODE) {
haystack_dup = eustrndup(Z_USTRVAL_P(haystack),
haystack_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard php_string.h
fmk Thu Oct 6 17:40:30 2005 EDT Modified files: /php-src/ext/standard php_string.h Log: Fix Win32 build by adding missing function declaration. http://cvs.php.net/diff.php/php-src/ext/standard/php_string.h?r1=1.90r2=1.91ty=u Index: php-src/ext/standard/php_string.h diff -u php-src/ext/standard/php_string.h:1.90 php-src/ext/standard/php_string.h:1.91 --- php-src/ext/standard/php_string.h:1.90 Wed Sep 28 05:22:08 2005 +++ php-src/ext/standard/php_string.h Thu Oct 6 17:40:30 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_string.h,v 1.90 2005/09/28 09:22:08 rolland Exp $ */ +/* $Id: php_string.h,v 1.91 2005/10/06 21:40:30 fmk Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -136,6 +136,7 @@ PHPAPI char *php_str_to_str(char *haystack, int length, char *needle, int needle_len, char *str, int str_len, int *_new_length); PHPAPI char *php_trim(char *c, int len, char *what, int what_len, zend_uchar str_type, zval *return_value, int mode TSRMLS_DC); +PHPAPI int32_t php_u_strip_tags(UChar *rbuf, int32_t len, int *stateptr, UChar *allow, int32_t allow_len TSRMLS_DC); PHPAPI size_t php_strip_tags(char *rbuf, int len, int *state, char *allow, int allow_len); PHPAPI int php_char_to_str_ex(char *str, uint len, char from, char *to, int to_len, pval *result, int case_sensitivity, int *replace_count); PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int to_len, pval *result); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mssql php_mssql.c
fmk Mon Sep 5 01:03:23 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/mssql php_mssql.c
Log:
Fix for #34369
Add extra parameter to mssql_connect to force a new connection
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44r2=1.86.2.44.2.1ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.1
--- php-src/ext/mssql/php_mssql.c:1.86.2.44 Tue Apr 12 13:46:45 2005
+++ php-src/ext/mssql/php_mssql.c Mon Sep 5 01:03:21 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44 2005/04/12 17:46:45 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.1 2005/09/05 05:03:21 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -376,7 +376,7 @@
{
char *user, *passwd, *host;
char *hashed_details;
- int hashed_details_length;
+ int hashed_details_length, new_link = 0;
mssql_link mssql, *mssql_ptr;
char buffer[32];
@@ -434,6 +434,25 @@
sprintf(hashed_details,mssql_%s_%s_%s,Z_STRVAL_PP(yyhost),Z_STRVAL_PP(yyuser),Z_STRVAL_PP(yypasswd));
/* SAFE */
}
break;
+ case 4: {
+ zval **yyhost,**yyuser,**yypasswd, **yynew_link;
+
+ if (zend_get_parameters_ex(4, yyhost, yyuser,
yypasswd, yynew_link) == FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+ convert_to_string_ex(yyhost);
+ convert_to_string_ex(yyuser);
+ convert_to_string_ex(yypasswd);
+ convert_to_long_ex(yynew_link);
+ host = Z_STRVAL_PP(yyhost);
+ user = Z_STRVAL_PP(yyuser);
+ passwd = Z_STRVAL_PP(yypasswd);
+ new_link = Z_LVAL_PP(yynew_link);
+ hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+5+3;
+ hashed_details = (char *)
emalloc(hashed_details_length+1);
+
sprintf(hashed_details,mssql_%s_%s_%s,Z_STRVAL_PP(yyhost),Z_STRVAL_PP(yyuser),Z_STRVAL_PP(yypasswd));
/* SAFE */
+ }
+ break;
default:
WRONG_PARAM_COUNT;
break;
@@ -483,7 +502,7 @@
list_entry *le;
/* try to find if we already have this link in our persistent
list */
- if (zend_hash_find(EG(persistent_list), hashed_details,
hashed_details_length + 1, (void **) le)==FAILURE) { /* we don't */
+ if (new_link || zend_hash_find(EG(persistent_list),
hashed_details, hashed_details_length + 1, (void **) le)==FAILURE) { /* we
don't */
list_entry new_le;
if (MS_SQL_G(max_links) != -1 MS_SQL_G(num_links) =
MS_SQL_G(max_links)) {
@@ -596,7 +615,7 @@
* if it doesn't, open a new mssql link, add it to the resource
list,
* and add a pointer to it with hashed_details as the key.
*/
- if (zend_hash_find(EG(regular_list), hashed_details,
hashed_details_length + 1,(void **) index_ptr)==SUCCESS) {
+ if (!new_link zend_hash_find(EG(regular_list),
hashed_details, hashed_details_length + 1,(void **) index_ptr)==SUCCESS) {
int type,link;
void *ptr;
@@ -686,7 +705,7 @@
return MS_SQL_G(default_link);
}
-/* {{{ proto int mssql_connect([string servername [, string username [, string
password]]])
+/* {{{ proto int mssql_connect([string servername [, string username [, string
password [, bool new_link)
Establishes a connection to a MS-SQL server */
PHP_FUNCTION(mssql_connect)
{
@@ -695,7 +714,7 @@
/* }}} */
-/* {{{ proto int mssql_pconnect([string servername [, string username [,
string password]]])
+/* {{{ proto int mssql_pconnect([string servername [, string username [,
string password [, bool new_link)
Establishes a persistent connection to a MS-SQL server */
PHP_FUNCTION(mssql_pconnect)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mssql php_mssql.c
fmk Mon Sep 5 01:04:32 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mssql php_mssql.c
Log:
MFB: Fix for #34369
Add extra parameter to mssql_connect to force a new connection
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152r2=1.152.2.1ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152
php-src/ext/mssql/php_mssql.c:1.152.2.1
--- php-src/ext/mssql/php_mssql.c:1.152 Mon Aug 8 19:09:06 2005
+++ php-src/ext/mssql/php_mssql.c Mon Sep 5 01:04:31 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152 2005/08/08 23:09:06 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.1 2005/09/05 05:04:31 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -380,7 +380,7 @@
{
char *user, *passwd, *host;
char *hashed_details;
- int hashed_details_length;
+ int hashed_details_length, new_link = 0;
mssql_link mssql, *mssql_ptr;
char buffer[32];
@@ -438,6 +438,25 @@
sprintf(hashed_details,mssql_%s_%s_%s,Z_STRVAL_PP(yyhost),Z_STRVAL_PP(yyuser),Z_STRVAL_PP(yypasswd));
/* SAFE */
}
break;
+ case 4: {
+ zval **yyhost,**yyuser,**yypasswd, **yynew_link;
+
+ if (zend_get_parameters_ex(4, yyhost, yyuser,
yypasswd, yynew_link) == FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+ convert_to_string_ex(yyhost);
+ convert_to_string_ex(yyuser);
+ convert_to_string_ex(yypasswd);
+ convert_to_long_ex(yynew_link);
+ host = Z_STRVAL_PP(yyhost);
+ user = Z_STRVAL_PP(yyuser);
+ passwd = Z_STRVAL_PP(yypasswd);
+ new_link = Z_LVAL_PP(yynew_link);
+ hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+5+3;
+ hashed_details = (char *)
emalloc(hashed_details_length+1);
+
sprintf(hashed_details,mssql_%s_%s_%s,Z_STRVAL_PP(yyhost),Z_STRVAL_PP(yyuser),Z_STRVAL_PP(yypasswd));
/* SAFE */
+ }
+ break;
default:
WRONG_PARAM_COUNT;
break;
@@ -492,7 +511,7 @@
list_entry *le;
/* try to find if we already have this link in our persistent
list */
- if (zend_hash_find(EG(persistent_list), hashed_details,
hashed_details_length + 1, (void **) le)==FAILURE) { /* we don't */
+ if (new_link || zend_hash_find(EG(persistent_list),
hashed_details, hashed_details_length + 1, (void **) le)==FAILURE) { /* we
don't */
list_entry new_le;
if (MS_SQL_G(max_links) != -1 MS_SQL_G(num_links) =
MS_SQL_G(max_links)) {
@@ -605,7 +624,7 @@
* if it doesn't, open a new mssql link, add it to the resource
list,
* and add a pointer to it with hashed_details as the key.
*/
- if (zend_hash_find(EG(regular_list), hashed_details,
hashed_details_length + 1,(void **) index_ptr)==SUCCESS) {
+ if (!new_link zend_hash_find(EG(regular_list),
hashed_details, hashed_details_length + 1,(void **) index_ptr)==SUCCESS) {
int type,link;
void *ptr;
@@ -695,7 +714,7 @@
return MS_SQL_G(default_link);
}
-/* {{{ proto int mssql_connect([string servername [, string username [, string
password]]])
+/* {{{ proto int mssql_connect([string servername [, string username [, string
password [, bool new_link]]])
Establishes a connection to a MS-SQL server */
PHP_FUNCTION(mssql_connect)
{
@@ -704,7 +723,7 @@
/* }}} */
-/* {{{ proto int mssql_pconnect([string servername [, string username [,
string password]]])
+/* {{{ proto int mssql_pconnect([string servername [, string username [,
string password [, bool new_link)
Establishes a persistent connection to a MS-SQL server */
PHP_FUNCTION(mssql_pconnect)
{
@@ -2013,7 +2032,9 @@
type=Z_LVAL_PP(yytype);
is_output=Z_LVAL_PP(yyis_output);
is_null=Z_LVAL_PP(yyis_null);
- maxlen=Z_LVAL_PP(yymaxlen);
+ if (is_output) {
+ maxlen=Z_LVAL_PP(yymaxlen);
+ }
}
[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c
fmk Mon Sep 5 01:05:35 2005 EDT
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
MFB: Fix for #34369
Add extra parameter to mssql_connect to force a new connection
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152r2=1.153ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152 php-src/ext/mssql/php_mssql.c:1.153
--- php-src/ext/mssql/php_mssql.c:1.152 Mon Aug 8 19:09:06 2005
+++ php-src/ext/mssql/php_mssql.c Mon Sep 5 01:05:34 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152 2005/08/08 23:09:06 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.153 2005/09/05 05:05:34 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -380,7 +380,7 @@
{
char *user, *passwd, *host;
char *hashed_details;
- int hashed_details_length;
+ int hashed_details_length, new_link = 0;
mssql_link mssql, *mssql_ptr;
char buffer[32];
@@ -438,6 +438,25 @@
sprintf(hashed_details,mssql_%s_%s_%s,Z_STRVAL_PP(yyhost),Z_STRVAL_PP(yyuser),Z_STRVAL_PP(yypasswd));
/* SAFE */
}
break;
+ case 4: {
+ zval **yyhost,**yyuser,**yypasswd, **yynew_link;
+
+ if (zend_get_parameters_ex(4, yyhost, yyuser,
yypasswd, yynew_link) == FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+ convert_to_string_ex(yyhost);
+ convert_to_string_ex(yyuser);
+ convert_to_string_ex(yypasswd);
+ convert_to_long_ex(yynew_link);
+ host = Z_STRVAL_PP(yyhost);
+ user = Z_STRVAL_PP(yyuser);
+ passwd = Z_STRVAL_PP(yypasswd);
+ new_link = Z_LVAL_PP(yynew_link);
+ hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+5+3;
+ hashed_details = (char *)
emalloc(hashed_details_length+1);
+
sprintf(hashed_details,mssql_%s_%s_%s,Z_STRVAL_PP(yyhost),Z_STRVAL_PP(yyuser),Z_STRVAL_PP(yypasswd));
/* SAFE */
+ }
+ break;
default:
WRONG_PARAM_COUNT;
break;
@@ -492,7 +511,7 @@
list_entry *le;
/* try to find if we already have this link in our persistent
list */
- if (zend_hash_find(EG(persistent_list), hashed_details,
hashed_details_length + 1, (void **) le)==FAILURE) { /* we don't */
+ if (new_link || zend_hash_find(EG(persistent_list),
hashed_details, hashed_details_length + 1, (void **) le)==FAILURE) { /* we
don't */
list_entry new_le;
if (MS_SQL_G(max_links) != -1 MS_SQL_G(num_links) =
MS_SQL_G(max_links)) {
@@ -605,7 +624,7 @@
* if it doesn't, open a new mssql link, add it to the resource
list,
* and add a pointer to it with hashed_details as the key.
*/
- if (zend_hash_find(EG(regular_list), hashed_details,
hashed_details_length + 1,(void **) index_ptr)==SUCCESS) {
+ if (!new_link zend_hash_find(EG(regular_list),
hashed_details, hashed_details_length + 1,(void **) index_ptr)==SUCCESS) {
int type,link;
void *ptr;
@@ -695,7 +714,7 @@
return MS_SQL_G(default_link);
}
-/* {{{ proto int mssql_connect([string servername [, string username [, string
password]]])
+/* {{{ proto int mssql_connect([string servername [, string username [, string
password [, bool new_link)
Establishes a connection to a MS-SQL server */
PHP_FUNCTION(mssql_connect)
{
@@ -704,7 +723,7 @@
/* }}} */
-/* {{{ proto int mssql_pconnect([string servername [, string username [,
string password]]])
+/* {{{ proto int mssql_pconnect([string servername [, string username [,
string password [, bool new_link)
Establishes a persistent connection to a MS-SQL server */
PHP_FUNCTION(mssql_pconnect)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
fmk Wed Aug 10 23:16:09 2005 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
rename dll's to php6
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.40r2=1.41ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40 php-src/win32/build/config.w32:1.41
--- php-src/win32/build/config.w32:1.40 Thu Jun 9 09:09:04 2005
+++ php-src/win32/build/config.w32 Wed Aug 10 23:16:08 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40 2005/06/09 13:09:04 wez Exp $
+// $Id: config.w32,v 1.41 2005/08/11 03:16:08 fmk Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -108,20 +108,20 @@
// set up the build dir and DLL name
if (PHP_DEBUG == yes PHP_ZTS == yes) {
DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Debug_TS);
- DEFINE(PHPDLL, php5ts_debug.dll);
- DEFINE(PHPLIB, php5ts_debug.lib);
+ DEFINE(PHPDLL, php6ts_debug.dll);
+ DEFINE(PHPLIB, php6ts_debug.lib);
} else if (PHP_DEBUG == yes PHP_ZTS == no) {
DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Debug);
- DEFINE(PHPDLL, php5_debug.dll);
- DEFINE(PHPLIB, php5_debug.lib);
+ DEFINE(PHPDLL, php6_debug.dll);
+ DEFINE(PHPLIB, php6_debug.lib);
} else if (PHP_DEBUG == no PHP_ZTS == yes) {
DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Release_TS);
- DEFINE(PHPDLL, php5ts.dll);
- DEFINE(PHPLIB, php5ts.lib);
+ DEFINE(PHPDLL, php6ts.dll);
+ DEFINE(PHPLIB, php6ts.lib);
} else if (PHP_DEBUG == no PHP_ZTS == no) {
DEFINE(BUILD_DIR, PHP_OBJECT_OUT_DIR + Release);
- DEFINE(PHPDLL, php5.dll);
- DEFINE(PHPLIB, php5.lib);
+ DEFINE(PHPDLL, php6.dll);
+ DEFINE(PHPLIB, php6.lib);
}
// Find the php_build dir - it contains headers and libraries
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/ming ming.c
fmk Wed Aug 10 23:54:07 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/ming ming.c
Log:
Revert the last patch so we can release PHP 5.1
http://cvs.php.net/diff.php/php-src/ext/ming/ming.c?r1=1.79r2=1.79.2.1ty=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.79 php-src/ext/ming/ming.c:1.79.2.1
--- php-src/ext/ming/ming.c:1.79Sat Aug 6 01:30:17 2005
+++ php-src/ext/ming/ming.c Wed Aug 10 23:54:04 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ming.c,v 1.79 2005/08/06 05:30:17 fmk Exp $ */
+/* $Id: ming.c,v 1.79.2.1 2005/08/11 03:54:04 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2218,7 +2218,7 @@
PHP_METHOD(swfmovie, output)
{
SWFMovie movie = getMovie(getThis() TSRMLS_CC);
-#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
zval **zlimit = NULL;
int limit = -1;
int argc = ZEND_NUM_ARGS();
@@ -2244,6 +2244,25 @@
Ming_setSWFCompression(oldval);
}
RETURN_LONG(out);
+#elif defined(HAVE_NEW_MING)
+ zval **zlimit = NULL;
+ int limit = -1;
+ int argc = ZEND_NUM_ARGS();
+
+ if(argc) {
+ if (zend_get_parameters_ex(1, zlimit) == FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+
+ convert_to_long_ex(zlimit);
+ limit = Z_LVAL_PP(zlimit);
+
+ if ((limit 0) || (limit 9)) {
+ php_error(E_WARNING,compression level must be within
0..9);
+ RETURN_FALSE;
+ }
+ }
+ RETURN_LONG(SWFMovie_output(movie, phpByteOutputMethod, NULL, limit));
#else
RETURN_LONG(SWFMovie_output(movie, phpByteOutputMethod, NULL));
#endif
@@ -2263,9 +2282,11 @@
PHP_METHOD(swfmovie, saveToFile)
{
zval **x;
-#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING)
zval **zlimit = NULL;
int limit = -1;
+#endif
+#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
int oldval = INT_MIN;
long out;
#endif
@@ -2278,7 +2299,7 @@
WRONG_PARAM_COUNT;
break;
case 2:
-#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING)
if (zend_get_parameters_ex(2, x, zlimit) == FAILURE)
WRONG_PARAM_COUNT;
convert_to_long_ex(zlimit);
@@ -2287,6 +2308,8 @@
php_error(E_WARNING,compression level must be within
0..9);
RETURN_FALSE;
}
+#endif
+#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
oldval = Ming_setSWFCompression(limit);
#endif
break;
@@ -2295,11 +2318,13 @@
}
ZEND_FETCH_RESOURCE(what, php_stream *, x,
-1,File-Handle,php_file_le_stream());
-#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
out = SWFMovie_output(getMovie(getThis() TSRMLS_CC),
phpStreamOutputMethod, what);
if (oldval = -1 oldval =9)
Ming_setSWFCompression(oldval);
RETURN_LONG(out);
+#elif defined(HAVE_NEW_MING)
+ RETURN_LONG(SWFMovie_output(movie, phpStreamOutputMethod, what,
limit));
#else
RETURN_LONG(SWFMovie_output(movie, phpStreamOutputMethod, what));
#endif
@@ -2311,9 +2336,11 @@
PHP_METHOD(swfmovie, save)
{
zval **x;
-#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING)
zval **zlimit = NULL;
int limit = -1;
+#endif
+#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
int oldval = INT_MIN;
#endif
long retval;
@@ -2326,7 +2353,7 @@
}
break;
case 2:
-#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING)
if (zend_get_parameters_ex(2, x, zlimit) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -2336,6 +2363,8 @@
php_error(E_WARNING,compression level must be within
0..9);
RETURN_FALSE;
}
+#endif
+#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
oldval = Ming_setSWFCompression(limit);
#endif
break;
@@ -2345,12 +2374,16 @@
if (Z_TYPE_PP(x) == IS_RESOURCE) {
ZEND_FETCH_RESOURCE(stream, php_stream *, x,
-1,File-Handle,php_file_le_stream());
+#if defined(HAVE_NEW_MING)
+ RETURN_LONG(SWFMovie_output(getMovie(getThis() TSRMLS_CC),
phpStreamOutputMethod, stream, limit));
+#else
RETVAL_LONG(SWFMovie_output(getMovie(getThis() TSRMLS_CC),
phpStreamOutputMethod, stream));
[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c php_mssql.h
fmk Mon Aug 8 17:32:21 2005 EDT
Modified files:
/php-src/ext/mssql php_mssql.c php_mssql.h
Log:
Fix #32010. Leak in mssql_fetch_batch().
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.149r2=1.150ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.149 php-src/ext/mssql/php_mssql.c:1.150
--- php-src/ext/mssql/php_mssql.c:1.149 Wed Aug 3 10:07:28 2005
+++ php-src/ext/mssql/php_mssql.c Mon Aug 8 17:32:18 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.149 2005/08/03 14:07:28 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.150 2005/08/08 21:32:18 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -994,34 +994,39 @@
if (statement-binds != NULL) { /* Maybe a
non-parameter sp*/
if (zend_hash_find(statement-binds, parameter,
strlen(parameter), (void**)bind)==SUCCESS) {
- switch (type) {
- case SQLBIT:
- case SQLINT1:
- case SQLINT2:
- case SQLINT4:
-
convert_to_long_ex(bind-zval);
- /* FIXME this works
only on little endian machine !!! */
- Z_LVAL_P(bind-zval) =
*((int *)(dbretdata(mssql_ptr-link,i)));
- break;
-
- case SQLFLT4:
- case SQLFLT8:
- case SQLFLTN:
- case SQLMONEY4:
- case SQLMONEY:
- case SQLMONEYN:
-
convert_to_double_ex(bind-zval);
- Z_DVAL_P(bind-zval) =
*((double *)(dbretdata(mssql_ptr-link,i)));
- break;
-
- case SQLCHAR:
- case SQLVARCHAR:
- case SQLTEXT:
-
convert_to_string_ex(bind-zval);
- Z_STRLEN_P(bind-zval)
= dbretlen(mssql_ptr-link,i);
- Z_STRVAL_P(bind-zval)
= estrndup(dbretdata(mssql_ptr-link,i),Z_STRLEN_P(bind-zval));
- break;
- /* TODO binary */
+ if (!dbretlen(mssql_ptr-link,i)) {
+ ZVAL_NULL(bind-zval);
+ }
+ else {
+ switch (type) {
+ case SQLBIT:
+ case SQLINT1:
+ case SQLINT2:
+ case SQLINT4:
+
convert_to_long_ex(bind-zval);
+ /* FIXME this
works only on little endian machine !!! */
+
Z_LVAL_P(bind-zval) = *((int *)(dbretdata(mssql_ptr-link,i)));
+ break;
+
+ case SQLFLT4:
+ case SQLFLT8:
+ case SQLFLTN:
+ case SQLMONEY4:
+ case SQLMONEY:
+ case SQLMONEYN:
+
convert_to_double_ex(bind-zval);
+
Z_DVAL_P(bind-zval) = *((double *)(dbretdata(mssql_ptr-link,i)));
+ break;
+
+ case SQLCHAR:
+ case
[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c
fmk Mon Aug 8 18:56:00 2005 EDT
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
Remove debug code and optimize a bit
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.150r2=1.151ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.150 php-src/ext/mssql/php_mssql.c:1.151
--- php-src/ext/mssql/php_mssql.c:1.150 Mon Aug 8 17:32:18 2005
+++ php-src/ext/mssql/php_mssql.c Mon Aug 8 18:55:56 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.150 2005/08/08 21:32:18 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.151 2005/08/08 22:55:56 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1051,11 +1051,9 @@
static int _mssql_fetch_batch(mssql_link *mssql_ptr, mssql_result *result, int
retvalue TSRMLS_DC)
{
int i, j = 0;
- int *column_types;
char computed_buf[16];
- if (0==0 || !result-have_fields) {
- column_types = (int *) safe_emalloc(sizeof(int),
result-num_fields, 0);
+ if (!result-have_fields) {
for (i=0; iresult-num_fields; i++) {
char *source = NULL;
char *fname = (char *)dbcolname(mssql_ptr-link,i+1);
@@ -1080,11 +1078,9 @@
result-fields[i].column_source =
STR_EMPTY_ALLOC();
}
- column_types[i] = coltype(i+1);
-
- Z_TYPE(result-fields[i]) = column_types[i];
+ result-fields[i].type = coltype(i+1);
/* set numeric flag */
- switch (column_types[i]) {
+ switch (result-fields[i].type) {
case SQLINT1:
case SQLINT2:
case SQLINT4:
@@ -1118,7 +1114,7 @@
result-data[i] = (zval *) safe_emalloc(sizeof(zval),
result-num_fields, 0);
for (j=0; jresult-num_fields; j++) {
INIT_ZVAL(result-data[i][j]);
- MS_SQL_G(get_column_content(mssql_ptr, j+1,
result-data[i][j], Z_TYPE(result-fields[j]) TSRMLS_CC));
+ MS_SQL_G(get_column_content(mssql_ptr, j+1,
result-data[i][j], result-fields[j].type TSRMLS_CC));
}
if (iresult-batchsize || result-batchsize==0) {
i++;
@@ -1129,7 +1125,6 @@
break;
result-lastresult = retvalue;
}
- efree(column_types);
if (result-statement (retvalue == NO_MORE_RESULTS || retvalue ==
NO_MORE_RPC_RESULTS)) {
_mssql_get_sp_result(mssql_ptr, result-statement TSRMLS_CC);
}
@@ -2171,6 +2166,7 @@
result-mssql_ptr = mssql_ptr;
result-cur_field=result-cur_row=result-num_rows=0;
result-num_fields = num_fields;
+ result-have_fields = 0;
result-fields = (mssql_field *)
safe_emalloc(sizeof(mssql_field), num_fields, 0);
result-statement = statement;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c
fmk Mon Aug 8 19:09:08 2005 EDT Modified files: /php-src/ext/mssql php_mssql.c Log: Make sure this works for multiple results as well http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.151r2=1.152ty=u Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.151 php-src/ext/mssql/php_mssql.c:1.152 --- php-src/ext/mssql/php_mssql.c:1.151 Mon Aug 8 18:55:56 2005 +++ php-src/ext/mssql/php_mssql.c Mon Aug 8 19:09:06 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_mssql.c,v 1.151 2005/08/08 22:55:56 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.152 2005/08/08 23:09:06 fmk Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -1859,6 +1859,7 @@ result-num_fields = dbnumcols(mssql_ptr-link); result-fields = (mssql_field *) safe_emalloc(sizeof(mssql_field), result-num_fields, 0); + result-have_fields = 0; result-num_rows = _mssql_fetch_batch(mssql_ptr, result, retvalue TSRMLS_CC); RETURN_TRUE; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ming ming.c
fmk Sat Aug 6 01:30:19 2005 EDT
Modified files:
/php-src/ext/ming ming.c
Log:
Cleanup to match the current cvs version of ming0.3beta
http://cvs.php.net/diff.php/php-src/ext/ming/ming.c?r1=1.78r2=1.79ty=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.78 php-src/ext/ming/ming.c:1.79
--- php-src/ext/ming/ming.c:1.78Wed Aug 3 10:07:26 2005
+++ php-src/ext/ming/ming.c Sat Aug 6 01:30:17 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ming.c,v 1.78 2005/08/03 14:07:26 sniper Exp $ */
+/* $Id: ming.c,v 1.79 2005/08/06 05:30:17 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2218,7 +2218,7 @@
PHP_METHOD(swfmovie, output)
{
SWFMovie movie = getMovie(getThis() TSRMLS_CC);
-#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
zval **zlimit = NULL;
int limit = -1;
int argc = ZEND_NUM_ARGS();
@@ -2244,25 +2244,6 @@
Ming_setSWFCompression(oldval);
}
RETURN_LONG(out);
-#elif defined(HAVE_NEW_MING)
- zval **zlimit = NULL;
- int limit = -1;
- int argc = ZEND_NUM_ARGS();
-
- if(argc) {
- if (zend_get_parameters_ex(1, zlimit) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- convert_to_long_ex(zlimit);
- limit = Z_LVAL_PP(zlimit);
-
- if ((limit 0) || (limit 9)) {
- php_error(E_WARNING,compression level must be within
0..9);
- RETURN_FALSE;
- }
- }
- RETURN_LONG(SWFMovie_output(movie, phpByteOutputMethod, NULL, limit));
#else
RETURN_LONG(SWFMovie_output(movie, phpByteOutputMethod, NULL));
#endif
@@ -2282,11 +2263,9 @@
PHP_METHOD(swfmovie, saveToFile)
{
zval **x;
-#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
zval **zlimit = NULL;
int limit = -1;
-#endif
-#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
int oldval = INT_MIN;
long out;
#endif
@@ -2299,7 +2278,7 @@
WRONG_PARAM_COUNT;
break;
case 2:
-#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
if (zend_get_parameters_ex(2, x, zlimit) == FAILURE)
WRONG_PARAM_COUNT;
convert_to_long_ex(zlimit);
@@ -2308,8 +2287,6 @@
php_error(E_WARNING,compression level must be within
0..9);
RETURN_FALSE;
}
-#endif
-#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
oldval = Ming_setSWFCompression(limit);
#endif
break;
@@ -2318,13 +2295,11 @@
}
ZEND_FETCH_RESOURCE(what, php_stream *, x,
-1,File-Handle,php_file_le_stream());
-#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
out = SWFMovie_output(getMovie(getThis() TSRMLS_CC),
phpStreamOutputMethod, what);
if (oldval = -1 oldval =9)
Ming_setSWFCompression(oldval);
RETURN_LONG(out);
-#elif defined(HAVE_NEW_MING)
- RETURN_LONG(SWFMovie_output(movie, phpStreamOutputMethod, what,
limit));
#else
RETURN_LONG(SWFMovie_output(movie, phpStreamOutputMethod, what));
#endif
@@ -2336,11 +2311,9 @@
PHP_METHOD(swfmovie, save)
{
zval **x;
-#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
zval **zlimit = NULL;
int limit = -1;
-#endif
-#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
int oldval = INT_MIN;
#endif
long retval;
@@ -2353,7 +2326,7 @@
}
break;
case 2:
-#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING)
+#if defined(HAVE_MING_ZLIB) defined(HAVE_NEW_MING)
if (zend_get_parameters_ex(2, x, zlimit) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -2363,8 +2336,6 @@
php_error(E_WARNING,compression level must be within
0..9);
RETURN_FALSE;
}
-#endif
-#if defined(HAVE_MING_ZLIB) !defined(HAVE_NEW_MING)
oldval = Ming_setSWFCompression(limit);
#endif
break;
@@ -2374,16 +2345,12 @@
if (Z_TYPE_PP(x) == IS_RESOURCE) {
ZEND_FETCH_RESOURCE(stream, php_stream *, x,
-1,File-Handle,php_file_le_stream());
-#if defined(HAVE_NEW_MING)
- RETURN_LONG(SWFMovie_output(getMovie(getThis() TSRMLS_CC),
phpStreamOutputMethod, stream, limit));
-#else
RETVAL_LONG(SWFMovie_output(getMovie(getThis() TSRMLS_CC),
phpStreamOutputMethod, stream));
-#if
[PHP-CVS] cvs: php-src /ext/sybase php_sybase_db.c
fmk Sat Aug 6 01:42:43 2005 EDT
Modified files:
/php-src/ext/sybase php_sybase_db.c
Log:
Fix for #32531
No need to alias these functions on windows or if the mssql extension is
compiled. This change will allow the use of both extensions at the same time.
http://cvs.php.net/diff.php/php-src/ext/sybase/php_sybase_db.c?r1=1.65r2=1.66ty=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.65
php-src/ext/sybase/php_sybase_db.c:1.66
--- php-src/ext/sybase/php_sybase_db.c:1.65 Wed Aug 3 10:08:17 2005
+++ php-src/ext/sybase/php_sybase_db.c Sat Aug 6 01:42:42 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_sybase_db.c,v 1.65 2005/08/03 14:08:17 sniper Exp $ */
+/* $Id: php_sybase_db.c,v 1.66 2005/08/06 05:42:42 fmk Exp $ */
#ifdef HAVE_CONFIG_H
@@ -100,6 +100,8 @@
PHP_FE(sybase_affected_rows,NULL)
PHP_FE(sybase_min_error_severity, NULL)
PHP_FE(sybase_min_message_severity, NULL)
+
+#if !defined(PHP_WIN32) !defined(HAVE_MSSQL)
PHP_FALIAS(mssql_connect, sybase_connect,
NULL)
PHP_FALIAS(mssql_pconnect, sybase_pconnect,
NULL)
PHP_FALIAS(mssql_close, sybase_close,
NULL)
@@ -119,6 +121,7 @@
PHP_FALIAS(mssql_affected_rows, sybase_affected_rows,
NULL)
PHP_FALIAS(mssql_min_error_severity,sybase_min_error_severity,
NULL)
PHP_FALIAS(mssql_min_message_severity, sybase_min_message_severity,
NULL)
+#endif
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
