mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 04:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Old PostgreSQL fix I forgot to commit, and NEWS consistency update

Browse Source
This commit is contained in:
Zeev Suraski 2000-10-11 13:27:21 +00:00
parent 332b7125de
commit 8fc4200414
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
NEWS
View File

@ -2,14 +2,15 @@ PHP 4.0 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
05 Oct 2000, Version 4.0.3
- Fixed PostgreSQL module to work when the link handle is omitted (Zeev)
- Fixed returning of empty LOB fields in OCI8. (Thies)
- Add Calendar module to default Win32 build (Andi)
- Add FTP module to default Win32 build (Andi)
- Added Calendar module to default Win32 build (Andi)
- Added FTP module to default Win32 build (Andi)
- Fixed crash in the POSIX getrlimit() function (alex@zend.com)
- Fixed dirname() under certain conditions (Andi)
- Add --with-imap-ssl to support SSL'ized imap library in RH7 and others
- Added --with-imap-ssl to support SSL'ized imap library in RH7 and others
(Rasmus)
- Fix possible crash bug in parse_url() (Andi)
- Fixed possible crash bug in parse_url() (Andi)
- Added support for trans sid under Win32 (Daniel)
- IPv6 support in fopen (Stig Venaas)
- Added the shmop extension. It allows more general ways of shared memory
@ -18,7 +19,7 @@ PHP 4.0 NEWS
- Added the ability for CURLOPT_POSTFIELDS to accept an associative array of
HTTP POST variables and values. (Sterling)
- Added the CURLOPT_HTTPHEADER option to curl_setopt(). (Sterling)
- Add the curl_error() and curl_errno() functions. (Sterling)
- Added the curl_error() and curl_errno() functions. (Sterling)
- Changed ext/db not to be enabled by default (Jani)
- Fixed building Apache SAPI module on SCO UnixWare (Sascha)
- Fixed writing empty session sets to shared memory (tcarroll@chc-chimes.com)
@ -43,7 +44,7 @@ PHP 4.0 NEWS
word is longer than the maximum allowed. (Derick)
- Added functions pg_put_line and pg_end_copy (Dirk Elmendorf)
- Added second parameter for parse_str to save result (John Bafford)
- Fix bug with curl places extra data in the output. (medvitz@medvitz.net)
- Fixed bug with curl places extra data in the output. (medvitz@medvitz.net)
- Added the pathinfo() function. (Sterling)
- Updated sybase_ct module and its sybase_query to use high performance API.
(Joey)
@ -53,11 +54,11 @@ PHP 4.0 NEWS
display_startup_errors - see php.ini-dist for further information (Zeev)
- Worked around a bug in the libc5 implementation of readdir() (Stas)
- Fixed some potential OpenBSD and NetBSD crash bugs when opening files. (Andi)
- Add EscapeShellArg() function (Rasmus)
- Add a php.ini option session.use_trans_sid to enable/disable trans-sid.
- Added EscapeShellArg() function (Rasmus)
- Added a php.ini option session.use_trans_sid to enable/disable trans-sid.
(Sterling)
- Quick-fix for the file upload security alert (Rasmus)
- Add the Sablotron extension for XSL parsing. (Sterling)
- Added the Sablotron extension for XSL parsing. (Sterling)
- Fixed a bug in checkdate() which caused < 1 years to be valid (Jani)
- Added support for an optional output handler function for output
buffering. This enables transparent rendering of XML through XSL,
@ -88,7 +89,7 @@ PHP 4.0 NEWS
syntax for the walk function. (Andrei)
- Fixed segfault with fgets(), fgetcsv(), fgetss(), and fread() when
called with negative length argument. (Torben)
- Fix by-reference parameters passing for xml_ functions and for scanf
- Fixed by-reference parameters passing for xml_ functions and for scanf
functions (Stas)
- Added experimental Oracle LDAP SDK support. 8.1.6 or later needed. Configure
with something like --with-ldap=/usr/local/oracle/product/8.1.6 (Stig Venaas)

19
ext/pgsql/pgsql.c
View File

@ -110,6 +110,18 @@ int pgsql_globals_id;
PHP_PGSQL_API php_pgsql_globals pgsql_globals;
#endif
static void php_pgsql_set_default_link(int id)
{
PGLS_FETCH();
if (PGG(default_link)!=-1) {
zend_list_delete(PGG(default_link));
}
PGG(default_link) = id;
zend_list_addref(id);
}
static void _close_pgsql_link(PGconn *link)
{
PGLS_FETCH();
@ -374,7 +386,8 @@ void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
link = (int) (long) index_ptr->ptr;
ptr = zend_list_find(link,&type); /* check if the link is still there */
if (ptr && (type==le_link || type==le_plink)) {
return_value->value.lval = PGG(default_link) = link;
return_value->value.lval = link;
php_pgsql_set_default_link(link);
return_value->type = IS_RESOURCE;
zend_list_addref(link);
efree(hashed_details);
@ -412,8 +425,12 @@ void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
PGG(num_links)++;
}
efree(hashed_details);
<<<<<<< pgsql.c
php_pgsql_set_default_link(return_value->value.lval);
=======
PGG(default_link)=return_value->value.lval;
zend_list_addref(return_value->value.lval);
>>>>>>> 1.63
}