[PHP-CVS] cvs: php-src /ext/com_dotnet com_variant.c
iliaa Mon Dec 8 20:54:57 2003 EDT
Modified files:
/php-src/ext/com_dotnet com_variant.c
Log:
Kill unused variables.
Index: php-src/ext/com_dotnet/com_variant.c
diff -u php-src/ext/com_dotnet/com_variant.c:1.1
php-src/ext/com_dotnet/com_variant.c:1.2
--- php-src/ext/com_dotnet/com_variant.c:1.1Thu Aug 14 12:49:55 2003
+++ php-src/ext/com_dotnet/com_variant.cMon Dec 8 20:54:56 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_variant.c,v 1.1 2003/08/14 16:49:55 wez Exp $ */
+/* $Id: com_variant.c,v 1.2 2003/12/09 01:54:56 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -99,9 +99,6 @@
{
OLECHAR *olestring = NULL;
int ret = SUCCESS;
- SYSTEMTIME systime;
- struct tm tmv;
- php_com_dotnet_object *obj;
switch (V_VT(v)) {
case VT_EMPTY:
@@ -578,7 +575,6 @@
VARIANT *vleft = NULL;
zval *zleft = NULL;
php_com_dotnet_object *obj;
- HRESULT result;
int codepage = CP_ACP;
long decimals = 0;
@@ -614,7 +610,6 @@
VARIANT *vleft = NULL, *vright = NULL;
zval *zleft = NULL, *zright = NULL;
php_com_dotnet_object *obj;
- HRESULT result;
int codepage = CP_ACP;
long lcid = LOCALE_SYSTEM_DEFAULT;
long flags = 0;
@@ -832,8 +827,6 @@
{
zval *zobj;
php_com_dotnet_object *obj;
- VARIANT vres;
- HRESULT res;
if (FAILURE == zend_parse_parameters(1 TSRMLS_CC,
"O", &zobj, php_com_variant_class_entry)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard parsedate.y
hholzgraMon Dec 8 17:22:58 2003 EDT
Modified files:
/php-src/ext/standard parsedate.y
Log:
reduce/reduce conflicts resolved
Index: php-src/ext/standard/parsedate.y
diff -u php-src/ext/standard/parsedate.y:1.48 php-src/ext/standard/parsedate.y:1.49
--- php-src/ext/standard/parsedate.y:1.48 Tue Nov 25 10:36:38 2003
+++ php-src/ext/standard/parsedate.yMon Dec 8 17:22:57 2003
@@ -8,7 +8,7 @@
** This code is in the public domain and has no copyright.
*/
-/* $Id: parsedate.y,v 1.48 2003/11/25 15:36:38 sebastian Exp $ */
+/* $Id: parsedate.y,v 1.49 2003/12/08 22:22:57 hholzgra Exp $ */
#include "php.h"
@@ -150,8 +150,8 @@
%}
-/* This grammar has 21 shift/reduce conflicts. */
-/* %expect 21 */
+/* This grammar has 22 shift/reduce conflicts. */
+%expect 22
%pure_parser
%token tAGO tDAY tDAY_UNIT tDAYZONE tDST tHOUR_UNIT tID tTZONE tZZONE
@@ -161,7 +161,7 @@
%type tDAY tDAY_UNIT tDAYZONE tHOUR_UNIT tMINUTE_UNIT
%type tMONTH tMONTH_UNIT
%type tSEC_UNIT tSNUMBER tUNUMBER tYEAR_UNIT tZONE tTZONE tZZONE
-%typetMERIDIAN o_merid
+%typetMERIDIAN
%%
@@ -185,6 +185,7 @@
((struct date_yy *)parm)->yyHaveRel++;
}
| number
+| o_merid
;
time : tUNUMBER tMERIDIAN {
@@ -193,11 +194,10 @@
((struct date_yy *)parm)->yySeconds = 0;
((struct date_yy *)parm)->yyMeridian = $2;
}
- | tUNUMBER ':' tUNUMBER o_merid {
+ | tUNUMBER ':' tUNUMBER {
((struct date_yy *)parm)->yyHour = $1;
((struct date_yy *)parm)->yyMinutes = $3;
((struct date_yy *)parm)->yySeconds = 0;
- ((struct date_yy *)parm)->yyMeridian = $4;
}
| tUNUMBER ':' tUNUMBER tSNUMBER {
((struct date_yy *)parm)->yyHour = $1;
@@ -208,11 +208,10 @@
? -$4 % 100 + (-$4 / 100) * 60
: - ($4 % 100 + ($4 / 100) * 60));
}
- | tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid {
+ | tUNUMBER ':' tUNUMBER ':' tUNUMBER {
((struct date_yy *)parm)->yyHour = $1;
((struct date_yy *)parm)->yyMinutes = $3;
((struct date_yy *)parm)->yySeconds = $5;
- ((struct date_yy *)parm)->yyMeridian = $6;
}
| tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER {
/* ISO 8601 format. hh:mm:ss[+-][0-9]{2}([0-9]{2})?. */
@@ -234,7 +233,6 @@
((struct date_yy *)parm)->yySeconds = $5;
((struct date_yy *)parm)->yyMeridian = MER24;
}
- | iso8601time
;
iso8601time: tUNUMBER ':' tUNUMBER ':' tUNUMBER {
@@ -335,12 +333,12 @@
}
}
| iso8601date
-| iso8601date tTZONE iso8601time {
+ | iso8601datetime {
((struct date_yy *)parm)->yyTimezone = 0;
((struct date_yy *)parm)->yyHaveZone++;
((struct date_yy *)parm)->yyHaveTime++;
}
-| iso8601date tTZONE iso8601time tZZONE {
+ | iso8601datetime tZZONE {
((struct date_yy *)parm)->yyTimezone = 0;
((struct date_yy *)parm)->yyHaveZone++;
((struct date_yy *)parm)->yyHaveTime++;
@@ -384,6 +382,9 @@
}
;
+iso8601datetime: iso8601date tTZONE iso8601time
+ ;
+
iso8601date: tUNUMBER tSNUMBER tSNUMBER {
/* ISO 8601 format. -mm-dd. */
((struct date_yy *)parm)->yyYear = $1;
@@ -500,14 +501,10 @@
}
;
-o_merid: /* NULL */
- {
- $$ = MER24;
- }
- | tMERIDIAN
- {
- $$ = $1;
- }
+o_merid : tMERIDIAN
+ {
+((struct date_yy *)parm)->yyMeridian = $1;
+ }
;
%%
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap config.w32 php_imap.def
fmk Mon Dec 8 17:15:22 2003 EDT
Added files:
/php-src/ext/imap config.w32 php_imap.def
Log:
Adding config file for win32. This allows to build with c-client 2002e
Index: php-src/ext/imap/config.w32
+++ php-src/ext/imap/config.w32
// $Id: config.w32,v 1.1 2003/12/08 22:15:20 fmk Exp $
// vim:ft=javascript
ARG_WITH("imap", "IMAP Support", "no");
if (PHP_IMAP == "yes") {
if (CHECK_LIB("cclient.lib", "imap") &&
CHECK_HEADER_ADD_INCLUDE("rfc822.h", "CFLAGS_IMAP")) {
CHECK_LIB("winmm.lib", "imap");
CHECK_LIB("ws2_32.lib", "imap");
CHECK_LIB("Secur32.lib", "imap");
CHECK_LIB("crypt32.lib", "imap");
EXTENSION("imap", "php_imap.c");
ADD_FLAG("CFLAGS_IMAP", "/D HAVE_IMAP2000=1");
ADD_FLAG("LDFLAGS_IMAP", "/nodefaultlib:LIBCMT");
AC_DEFINE('HAVE_IMAP', 1, 'Have IMAP support', true);
if (!PHP_IMAP_SHARED) {
ADD_DEF_FILE("ext\\imap\\php_imap.def");
}
} else {
WARNING("imap not enabled; libraries and headers not found");
}
}
Index: php-src/ext/imap/php_imap.def
+++ php-src/ext/imap/php_imap.def
EXPORTS
_pctype
__mb_cur_max
_daylight
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 sendmail.c sendmail.h
fmk Mon Dec 8 17:10:45 2003 EDT
Modified files:
/php-src/win32 sendmail.c sendmail.h
Log:
Exporting symbols used in the imap extension
Index: php-src/win32/sendmail.c
diff -u php-src/win32/sendmail.c:1.58 php-src/win32/sendmail.c:1.59
--- php-src/win32/sendmail.c:1.58 Mon Sep 8 18:36:59 2003
+++ php-src/win32/sendmail.cMon Dec 8 17:10:42 2003
@@ -17,7 +17,7 @@
*
*/
-/* $Id: sendmail.c,v 1.58 2003/09/08 22:36:59 iliaa Exp $ */
+/* $Id: sendmail.c,v 1.59 2003/12/08 22:10:42 fmk Exp $ */
#include "php.h" /*php specific */
#include
@@ -218,7 +218,7 @@
//
// See SendText() for additional args!
///
-int TSendMail(char *host, int *error, char **error_message,
+PHPAPI int TSendMail(char *host, int *error, char **error_message,
char *headers, char *Subject, char *mailTo, char *data,
char *mailCc, char *mailBcc, char *mailRPath)
{
@@ -323,7 +323,7 @@
// Author/Date: jcar 20/9/96
// History:
///
-void TSMClose()
+PHPAPI void TSMClose()
{
Post("QUIT\r\n");
Ack(NULL);
@@ -352,7 +352,7 @@
// Author/Date: jcar 20/9/96
// History:
//***/
-char *GetSMErrorText(int index)
+PHPAPI char *GetSMErrorText(int index)
{
if (MIN_ERROR_INDEX <= index && index < MAX_ERROR_INDEX) {
return (ErrorMessages[index]);
Index: php-src/win32/sendmail.h
diff -u php-src/win32/sendmail.h:1.12 php-src/win32/sendmail.h:1.13
--- php-src/win32/sendmail.h:1.12 Fri Jan 3 10:17:43 2003
+++ php-src/win32/sendmail.hMon Dec 8 17:10:42 2003
@@ -34,13 +34,13 @@
#define MAX_ERROR_INDEX22 /* Always last
error message + 1 */
-int TSendMail(char *smtpaddr, int *returnerror, char **error_message,
+PHPAPI int TSendMail(char *smtpaddr, int *returnerror, char **error_message,
char *RPath, char *Subject, char *mailTo, char *data,
char *mailCc, char *mailBcc, char *mailRPath);
-void TSMClose(void);
+PHPAPI void TSMClose(void);
int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char *mailBcc,
char *data,
char *headers, char *headers_lc, char **error_message);
-char *GetSMErrorText(int index);
+PHPAPI char *GetSMErrorText(int index);
int MailConnect();
int PostHeader(char *, char *, char *, char *);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli config.m4
sniper Mon Dec 8 13:57:10 2003 EDT Modified files: /php-src/ext/mysqli config.m4 Log: ws Index: php-src/ext/mysqli/config.m4 diff -u php-src/ext/mysqli/config.m4:1.11 php-src/ext/mysqli/config.m4:1.12 --- php-src/ext/mysqli/config.m4:1.11 Sun Dec 7 10:33:19 2003 +++ php-src/ext/mysqli/config.m4Mon Dec 8 13:57:09 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2003/12/07 15:33:19 sniper Exp $ +dnl $Id: config.m4,v 1.12 2003/12/08 18:57:09 sniper Exp $ dnl config.m4 for extension mysqli PHP_ARG_WITH(mysqli, for MySQLi support, @@ -22,7 +22,7 @@ fi if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then - AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled]) +AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled]) MYSQL_LIB_CFG='--libmysqld-libs' else MYSQL_LIB_CFG='--libs' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
zeevMon Dec 8 13:37:11 2003 EDT Modified files: /CVSROOTavail Log: Add karma Index: CVSROOT/avail diff -u CVSROOT/avail:1.792 CVSROOT/avail:1.793 --- CVSROOT/avail:1.792 Sun Dec 7 16:40:15 2003 +++ CVSROOT/avail Mon Dec 8 13:37:10 2003 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el,phpdoc-pt +avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el,phpdoc-pt # People who work on the Engine -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/continuity capi.c
aleigh Mon Dec 8 13:18:04 2003 EDT
Modified files:
/php-src/sapi/continuitycapi.c
Log:
Removed extraneous php4_close() function and Windows compile checks.
Index: php-src/sapi/continuity/capi.c
diff -u php-src/sapi/continuity/capi.c:1.2 php-src/sapi/continuity/capi.c:1.3
--- php-src/sapi/continuity/capi.c:1.2 Mon Dec 8 11:54:18 2003
+++ php-src/sapi/continuity/capi.c Mon Dec 8 13:18:03 2003
@@ -42,18 +42,6 @@
#include "ext/standard/php_standard.h"
/*
- * If neither XP_UNIX not XP_WIN32 is defined, try to guess which one.
- * Ideally, this should be done by the configure script.
- */
-#if !defined(XP_UNIX) && !defined(XP_WIN32)
-#if defined(WIN32)
-#define XP_WIN32
-#else
-#define XP_UNIX
-#endif
-#endif
-
-/*
* CAPI includes
*/
#include
@@ -105,7 +93,7 @@
NULL,
NULL,
PHP_MINFO(continuity),
-"$Revision: 1.2 $",
+"$Revision: 1.3 $",
STANDARD_MODULE_PROPERTIES
};
@@ -465,14 +453,6 @@
return SUCCESS;
}
-void php4_close(void *vparam)
-{
- if (capi_sapi_module.shutdown) {
- capi_sapi_module.shutdown(&capi_sapi_module);
- }
- tsrm_shutdown();
-}
-
int phpFinit(lstTset * opt)
{
php_core_globals *core_globals;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom dom_iterators.c php_dom.c
rrichards Mon Dec 8 12:08:19 2003 EDT
Modified files:
/php-src/ext/domphp_dom.c dom_iterators.c
Log:
fix getElementsByTagname iteration
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.43 php-src/ext/dom/php_dom.c:1.44
--- php-src/ext/dom/php_dom.c:1.43 Tue Dec 2 10:17:02 2003
+++ php-src/ext/dom/php_dom.c Mon Dec 8 12:08:10 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.43 2003/12/02 15:17:02 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.44 2003/12/08 17:08:10 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1092,18 +1092,20 @@
xmlNodePtr ret = NULL;
while (nodep != NULL && (*cur <= index || index == -1)) {
- if (nodep->type == XML_ELEMENT_NODE && xmlStrEqual(nodep->name,
local)) {
- if (ns == NULL || (nodep->ns != NULL &&
xmlStrEqual(nodep->ns->href, ns))) {
- if (*cur == index) {
- ret = nodep;
- break;
+ if (nodep->type == XML_ELEMENT_NODE) {
+ if (xmlStrEqual(nodep->name, local)) {
+ if (ns == NULL || (nodep->ns != NULL &&
xmlStrEqual(nodep->ns->href, ns))) {
+ if (*cur == index) {
+ ret = nodep;
+ break;
+ }
+ (*cur)++;
}
- (*cur)++;
}
- }
- ret = dom_get_elements_by_tag_name_ns_raw(nodep->children, ns, local,
cur, index);
- if (ret != NULL) {
- break;
+ ret = dom_get_elements_by_tag_name_ns_raw(nodep->children, ns,
local, cur, index);
+ if (ret != NULL) {
+ break;
+ }
}
nodep = nodep->next;
}
Index: php-src/ext/dom/dom_iterators.c
diff -u php-src/ext/dom/dom_iterators.c:1.1 php-src/ext/dom/dom_iterators.c:1.2
--- php-src/ext/dom/dom_iterators.c:1.1 Sat Nov 29 15:41:41 2003
+++ php-src/ext/dom/dom_iterators.c Mon Dec 8 12:08:10 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dom_iterators.c,v 1.1 2003/11/29 20:41:41 rrichards Exp $ */
+/* $Id: dom_iterators.c,v 1.2 2003/12/08 17:08:10 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -183,11 +183,11 @@
{
zval *curobj, *curattr = NULL;
zval *object;
- xmlNodePtr curnode = NULL;
+ xmlNodePtr curnode = NULL, basenode;
dom_object *intern;
dom_object *nnmap;
dom_nnodemap_object *objmap;
- int ret, previndex=0;
+ int ret, previndex=1;
php_dom_iterator *iterator = (php_dom_iterator *)iter;
@@ -203,8 +203,12 @@
if (objmap->nodetype == XML_ATTRIBUTE_NODE || objmap->nodetype
== XML_ELEMENT_NODE) {
curnode = curnode->next;
} else {
- previndex = iter->index - 1;
- curnode = dom_get_elements_by_tag_name_ns_raw(curnode,
objmap->ns, objmap->local, &previndex, iter->index);
+ /* Nav the tree evey time as this is LIVE */
+ basenode = dom_object_get_node(objmap->baseobj);
+ if (basenode && (basenode->type == XML_DOCUMENT_NODE
|| basenode->type == XML_HTML_DOCUMENT_NODE)) {
+ basenode = xmlDocGetRootElement((xmlDoc *)
basenode);
+ }
+ curnode =
dom_get_elements_by_tag_name_ns_raw(basenode, objmap->ns, objmap->local, &previndex,
iter->index);
}
} else {
if (objmap->nodetype == XML_ENTITY_NODE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/continuity CREDITS capi.c config.m4
aleigh Mon Dec 8 11:54:20 2003 EDT
Modified files:
/php-src/sapi/continuityCREDITS capi.c config.m4
Log:
New SAPI module for Continuity HTTP server (ashpool.com)
Index: php-src/sapi/continuity/CREDITS
diff -u /dev/null php-src/sapi/continuity/CREDITS:1.2
--- /dev/null Mon Dec 8 11:54:20 2003
+++ php-src/sapi/continuity/CREDITS Mon Dec 8 11:54:18 2003
@@ -0,0 +1,2 @@
+CAPI
+Alex Leigh
Index: php-src/sapi/continuity/capi.c
diff -u /dev/null php-src/sapi/continuity/capi.c:1.2
--- /dev/null Mon Dec 8 11:54:20 2003
+++ php-src/sapi/continuity/capi.c Mon Dec 8 11:54:18 2003
@@ -0,0 +1,527 @@
+/*
+ +--+
+ | PHP Version 4|
+ +--+
+ | Copyright (c) 1997-2003 The PHP Group|
+ +--+
+ | This source file is subject to version 2.02 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is|
+ | available at through the world-wide-web at |
+ | http://www.php.net/license/2_02.txt. |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+ +--+
+ | Author: Alex Leigh|
+ +--+
+*/
+
+/* For more information on Continuity: http://www.ashpool.com/ */
+
+/*
+ * This code is based on the PHP4 SAPI module for NSAPI by Jayakumar
+ * Muthukumarasamy
+ */
+
+/* PHP includes */
+#define CONTINUITY 1
+#define CAPI_DEBUG
+
+/* Define for CDP specific extensions */
+#undef CONTINUITY_CDPEXT
+
+#include "php.h"
+#include "php_variables.h"
+#include "ext/standard/info.h"
+#include "php_ini.h"
+#include "php_globals.h"
+#include "SAPI.h"
+#include "php_main.h"
+#include "php_version.h"
+#include "TSRM.h"
+#include "ext/standard/php_standard.h"
+
+/*
+ * If neither XP_UNIX not XP_WIN32 is defined, try to guess which one.
+ * Ideally, this should be done by the configure script.
+ */
+#if !defined(XP_UNIX) && !defined(XP_WIN32)
+#if defined(WIN32)
+#define XP_WIN32
+#else
+#define XP_UNIX
+#endif
+#endif
+
+/*
+ * CAPI includes
+ */
+#include
+#include
+
+#define NSLS_D struct capi_request_context *request_context
+#define NSLS_DC, NSLS_D
+#define NSLS_C request_context
+#define NSLS_CC, NSLS_C
+#define NSG(v) (request_context->v)
+
+/*
+ * ZTS needs to be defined for CAPI to work
+ */
+#if !defined(ZTS)
+#error "CAPI module needs ZTS to be defined"
+#endif
+
+/*
+ * Structure to encapsulate the CAPI request in SAPI
+ */
+typedef struct capi_request_context {
+ httpTtrans *t;
+ int read_post_bytes;
+} capi_request_context;
+
+/**/
+
+PHP_MINIT_FUNCTION(continuity);
+PHP_MSHUTDOWN_FUNCTION(continuity);
+PHP_RINIT_FUNCTION(continuity);
+PHP_RSHUTDOWN_FUNCTION(continuity);
+PHP_MINFO_FUNCTION(continuity);
+
+PHP_FUNCTION(continuity_virtual);
+PHP_FUNCTION(continuity_request_headers);
+PHP_FUNCTION(continuity_response_headers);
+
+function_entry continuity_functions[] = {
+{NULL, NULL, NULL}
+};
+
+zend_module_entry continuity_module_entry = {
+STANDARD_MODULE_HEADER,
+"continuity",
+continuity_functions,
+PHP_MINIT(continuity),
+PHP_MSHUTDOWN(continuity),
+NULL,
+NULL,
+PHP_MINFO(continuity),
+"$Revision: 1.2 $",
+STANDARD_MODULE_PROPERTIES
+};
+
+PHP_MINIT_FUNCTION(continuity)
+{
+return SUCCESS;
+}
+
+PHP_MSHUTDOWN_FUNCTION(continuity)
+{
+return SUCCESS;
+}
+
+PHP_MINFO_FUNCTION(continuity)
+{
+php_info_print_table_start();
+php_info_print_table_row(2, "Continuity Module Version",
continuity_module_entry.version);
+php_info_print_table_row(2, "Server Version", conFget_build());
+#ifdef CONTINUITY_CDPEXT
+ php_info_print_table_row(2,"CDP Extensions", "enabled");
+#else
+ php_info_print_table_row(2,"CDP Extensions", "disabled");
+#endif
+php_info_print_table_end();
+
+/*DISPLAY_INI_ENTRIES(); */
+}
+
+/**/
+
+/*
+ * sapi_capi_ub_write: Write len bytes to the connection output.
+ */
+static int sapi_capi_ub_write(const char *str, unsigned int str_length TSRMLS_DC)
+{
+ int retval;
+ capi_request_context *rc;
+
+ rc = (capi_request_context *) SG(server_context);
+ retval = httpFwrite(rc->t, (char *) str, str_length);
+ if (retval == -1 || retval == 0)
+ php_handle_aborted_c
[PHP-CVS] cvs: php-src /ext/dom dom.dsp /ext/iconv iconv.dsp /ext/simplexml simplexml.dsp /ext/xmlrpc xmlrpc.dsp /ext/xsl xsl.dsp /win32 builddef.bat php4dllts.dsp
rrichards Mon Dec 8 07:56:47 2003 EDT Modified files: /php-src/ext/domdom.dsp /php-src/ext/iconv iconv.dsp /php-src/ext/simplexml simplexml.dsp /php-src/ext/xmlrpc xmlrpc.dsp /php-src/ext/xslxsl.dsp /php-src/win32 builddef.bat php4dllts.dsp Log: export libxml2 and iconv symbols extensions no longer link against either of those Index: php-src/ext/dom/dom.dsp diff -u php-src/ext/dom/dom.dsp:1.3 php-src/ext/dom/dom.dsp:1.4 --- php-src/ext/dom/dom.dsp:1.3 Thu Jul 24 09:18:40 2003 +++ php-src/ext/dom/dom.dsp Mon Dec 8 07:56:43 2003 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_DOM" /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DOM_EXPORTS" /D "COMPILE_DL_DOM" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DOM=1 /D LIBXML_THREAD_ENABLED=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DOM_EXPORTS" /D "COMPILE_DL_DOM" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DOM=1 /D "LIBXML_THREAD_ENABLED" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib php4ts.lib libxml2.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /machine:I386 /out:"..\..\Release_TS/php_dom.dll" /implib:"..\..\Release_TS/php_dom.lib" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\bindlib_w32\Release" +# ADD LINK32 wsock32.lib php4ts.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /machine:I386 /out:"..\..\Release_TS/php_dom.dll" /implib:"..\..\Release_TS/php_dom.lib" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\bindlib_w32\Release" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "dom - Win32 Debug_TS" @@ -82,7 +82,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts_debug.lib ws2_32.lib libxml2.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS\php_dom.dll" /implib:"..\..\Debug_TS/php_dom.lib" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release" +# ADD LINK32 php4ts_debug.lib ws2_32.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS\php_dom.dll" /implib:"..\..\Debug_TS/php_dom.lib" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release" !ENDIF Index: php-src/ext/iconv/iconv.dsp diff -u php-src/ext/iconv/iconv.dsp:1.4 php-src/ext/iconv/iconv.dsp:1.5 --- php-src/ext/iconv/iconv.dsp:1.4 Wed Sep 4 01:17:16 2002 +++ php-src/ext/iconv/iconv.dsp Mon Dec 8 07:56:44 2003 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts.lib iconv-1.3.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_iconv.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\iconv\lib" +# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_iconv.dll" /libp
[PHP-CVS] cvs: CVSROOT / modules
sas Mon Dec 8 06:54:48 2003 EDT Modified files: /CVSROOTmodules Log: add stuff for pt translation Index: CVSROOT/modules diff -u CVSROOT/modules:1.65 CVSROOT/modules:1.66 --- CVSROOT/modules:1.65Tue Jul 1 08:11:12 2003 +++ CVSROOT/modules Mon Dec 8 06:54:47 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.65 2003/07/01 12:11:12 zeev Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.66 2003/12/08 11:54:47 sas Exp $" # # Three different line formats are valid: # key -aaliases... @@ -62,7 +62,7 @@ phpdoc phpdoc # this checks out all of the translations -phpdoc-all phpdoc &phpdoc-ar-dir &phpdoc-cs-dir &phpdoc-de-dir &phpdoc-es-dir &phpdoc-fi-dir &phpdoc-fr-dir &phpdoc-he-dir &phpdoc-hk-dir &phpdoc-hu-dir &phpdoc-it-dir &phpdoc-ja-dir &phpdoc-kr-dir &phpdoc-lt-dir &phpdoc-nl-dir &phpdoc-pl-dir &phpdoc-pt_BR-dir &phpdoc-ro-dir &phpdoc-ru-dir &phpdoc-sk-dir &phpdoc-sl-dir &phpdoc-sv-dir &phpdoc-tr-dir &phpdoc-tw-dir &phpdoc-zh-dir &phpdoc-el-dir +phpdoc-all phpdoc &phpdoc-ar-dir &phpdoc-cs-dir &phpdoc-de-dir &phpdoc-es-dir &phpdoc-fi-dir &phpdoc-fr-dir &phpdoc-he-dir &phpdoc-hk-dir &phpdoc-hu-dir &phpdoc-it-dir &phpdoc-ja-dir &phpdoc-kr-dir &phpdoc-lt-dir &phpdoc-nl-dir &phpdoc-pl-dir &phpdoc-pt_BR-dir &phpdoc-ro-dir &phpdoc-ru-dir &phpdoc-sk-dir &phpdoc-sl-dir &phpdoc-sv-dir &phpdoc-tr-dir &phpdoc-tw-dir &phpdoc-zh-dir &phpdoc-el-dir &phpdoc-pt-dir # these allow checking out each translation on its own, or with the english # version and build structure @@ -114,6 +114,9 @@ phpdoc-pl-dir -d pl phpdoc-pl phpdoc-pl-only phpdoc-pl phpdoc-pl phpdoc &phpdoc-pl-dir +phpdoc-pt-dir -d pt phpdoc-pt +phpdoc-pt-only phpdoc-pt +phpdoc-pt phpdoc &phpdoc-pt-dir phpdoc-pt_BR-dir -d pt_BR phpdoc-pt_BR phpdoc-pt_BR-only phpdoc-pt_BR phpdoc-pt_BR phpdoc &phpdoc-pt_BR-dir -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/session session.c
Oops? :) (thanks for fixing it) --Jani On Mon, 8 Dec 2003, Ard Biesheuvel wrote: >abies Mon Dec 8 05:01:12 2003 EDT > > Modified files: (Branch: PHP_4_3) >/php-src/ext/session session.c > Log: > Fix build > > >Index: php-src/ext/session/session.c >diff -u php-src/ext/session/session.c:1.336.2.30 >php-src/ext/session/session.c:1.336.2.31 >--- php-src/ext/session/session.c:1.336.2.30 Sun Dec 7 11:53:30 2003 >+++ php-src/ext/session/session.c Mon Dec 8 05:01:11 2003 >@@ -17,7 +17,7 @@ >+--+ > */ > >-/* $Id: session.c,v 1.336.2.30 2003/12/07 16:53:30 sniper Exp $ */ >+/* $Id: session.c,v 1.336.2.31 2003/12/08 10:01:11 abies Exp $ */ > > #ifdef HAVE_CONFIG_H > #include "config.h" >@@ -717,7 +717,6 @@ > > php_gmtime_r(when, &tm); > >- n = sprintf(buf, "%s, %d %s %d %02d:%02d:%02d GMT", /* SAFE */ > n = sprintf(buf, "%s, %02d %s %d %02d:%02d:%02d GMT", /* SAFE */ > week_days[tm.tm_wday], tm.tm_mday, > month_names[tm.tm_mon], tm.tm_year + 1900, > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Mon Dec 8 05:12:42 2003 EDT Modified files: /php-srcNEWS Log: typofix Index: php-src/NEWS diff -u php-src/NEWS:1.1526 php-src/NEWS:1.1527 --- php-src/NEWS:1.1526 Sun Dec 7 17:24:22 2003 +++ php-src/NEWSMon Dec 8 05:12:42 2003 @@ -26,8 +26,7 @@ - Changed stat() and family to be routed via streams API. (Sara) - Fixed include_once() / require_once() on Windows to honor case-insensitivity of files. (Andi) -- Fixex get_declared_classes() to return only classes and not - interfaces. (Andrey, Marcus) +- Fixed get_declared_classes() to return only classes. (Andrey, Marcus) - Fixed __autoload() to preserve case of the passed class name. (Andi) - Fixed bug #26534 (stream_get_meta_data() -> Access Violation). (Wez) - Fixed bug #26528 (HTML entities are not being decoded by -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/session session.c
abies Mon Dec 8 05:01:12 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/sessionsession.c Log: Fix build Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.336.2.30 php-src/ext/session/session.c:1.336.2.31 --- php-src/ext/session/session.c:1.336.2.30Sun Dec 7 11:53:30 2003 +++ php-src/ext/session/session.c Mon Dec 8 05:01:11 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: session.c,v 1.336.2.30 2003/12/07 16:53:30 sniper Exp $ */ +/* $Id: session.c,v 1.336.2.31 2003/12/08 10:01:11 abies Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -717,7 +717,6 @@ php_gmtime_r(when, &tm); - n = sprintf(buf, "%s, %d %s %d %02d:%02d:%02d GMT", /* SAFE */ n = sprintf(buf, "%s, %02d %s %d %02d:%02d:%02d GMT", /* SAFE */ week_days[tm.tm_wday], tm.tm_mday, month_names[tm.tm_mon], tm.tm_year + 1900, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/interbase interbase.c
abies Mon Dec 8 04:46:08 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/interbase interbase.c
Log:
Corrected ibase_close() fix
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.91.2.25
php-src/ext/interbase/interbase.c:1.91.2.26
--- php-src/ext/interbase/interbase.c:1.91.2.25 Wed Nov 26 09:04:56 2003
+++ php-src/ext/interbase/interbase.c Mon Dec 8 04:46:07 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.91.2.25 2003/11/26 14:04:56 abies Exp $ */
+/* $Id: interbase.c,v 1.91.2.26 2003/12/08 09:46:07 abies Exp $ */
/* TODO: Arrays, roles?
@@ -624,7 +624,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.91.2.25 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.91.2.26 $");
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, "Dynamic Module", "yes");
#endif
@@ -934,13 +934,14 @@
Close an InterBase connection */
PHP_FUNCTION(ibase_close)
{
- zval **link_arg = NULL;
ibase_db_link *ib_link;
- int link_id = -1;
+ int link_id;
RESET_ERRMSG;
switch (ZEND_NUM_ARGS()) {
+ zval **link_arg;
+
case 0:
link_id = IBG(default_link);
break;
@@ -949,13 +950,14 @@
RETURN_FALSE;
}
convert_to_long_ex(link_arg);
+ link_id = Z_LVAL_PP(link_arg);
break;
default:
WRONG_PARAM_COUNT;
break;
}
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, link_arg, link_id, "InterBase
link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL, link_id, "InterBase
link", le_link, le_plink);
zend_list_delete(link_id);
RETURN_TRUE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4) /sapi/continuity CREDITS capi.c config.m4
On Sun, 7 Dec 2003, Alex Leigh wrote: > It was implied on http://www.php.net/anoncvs.php that PHP_4 was the > branch for the PHP 4 releases, and I wanted to include it in case there > is another 4, partly so it was available and partly to get the code in > this state into CVS before I went through and qualified it (and made > any changes) to support 5. I didn't want to have to maintain separate > version state for the 4 version, which my users use, in another place; > otherwise I have to explain to 4 users that they have to download some > tar from me whereas 5 users already have support. > > I wasn't aware PHP 4 was feature-frozen, since releases seem to still > come out for it. > > Where did I go wrong? PHP 4 is in feature-freeze, we're only releasing bug-fix (mini versions) releases. The anoncvs.php page should probably be updated. In any case, your code is now only in the obsolete PHP_4 branch, which it should just have been in HEAD, the development branch. Tags with uppercase like "PHP_4" or "PHP_4_3" are branch tags to which you can commit (but should not in this case), tags in lower case (like php_4_3_2) are release tags to which you can not commit. Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mnogosearch php_mnogo.c
gluke Mon Dec 8 03:24:56 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mnogosearchphp_mnogo.c Log: - A bug in Udm_Hash32 function was fixed. Index: php-src/ext/mnogosearch/php_mnogo.c diff -u php-src/ext/mnogosearch/php_mnogo.c:1.66.2.10 php-src/ext/mnogosearch/php_mnogo.c:1.66.2.11 --- php-src/ext/mnogosearch/php_mnogo.c:1.66.2.10 Wed Nov 12 02:52:56 2003 +++ php-src/ext/mnogosearch/php_mnogo.c Mon Dec 8 03:24:55 2003 @@ -1,5 +1,5 @@ /* $Source: /repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */ -/* $Id: php_mnogo.c,v 1.66.2.10 2003/11/12 07:52:56 gluke Exp $ */ +/* $Id: php_mnogo.c,v 1.66.2.11 2003/12/08 08:24:55 gluke Exp $ */ /* +--+ @@ -1922,7 +1922,11 @@ str = Z_STRVAL_PP(yystr); hash32=UdmHash32((str),strlen(str)); +#if UDM_VERSION_ID >= 30215 + snprintf(buf,sizeof(buf)-1,"%i",hash32); +#else snprintf(buf,sizeof(buf)-1,"%u",hash32); +#endif RETURN_STRING(buf,1); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mnogosearch php_mnogo.c
gluke Mon Dec 8 03:12:31 2003 EDT Modified files: /php-src/ext/mnogosearchphp_mnogo.c Log: - A bug in Udm_Hash32 function was fixed. Index: php-src/ext/mnogosearch/php_mnogo.c diff -u php-src/ext/mnogosearch/php_mnogo.c:1.84 php-src/ext/mnogosearch/php_mnogo.c:1.85 --- php-src/ext/mnogosearch/php_mnogo.c:1.84Wed Nov 12 02:40:16 2003 +++ php-src/ext/mnogosearch/php_mnogo.c Mon Dec 8 03:12:30 2003 @@ -1,5 +1,5 @@ /* $Source: /repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */ -/* $Id: php_mnogo.c,v 1.84 2003/11/12 07:40:16 gluke Exp $ */ +/* $Id: php_mnogo.c,v 1.85 2003/12/08 08:12:30 gluke Exp $ */ /* +--+ @@ -1922,7 +1922,11 @@ str = Z_STRVAL_PP(yystr); hash32=UdmHash32((str),strlen(str)); +#if UDM_VERSION_ID >= 30215 + snprintf(buf,sizeof(buf)-1,"%i",hash32); +#else snprintf(buf,sizeof(buf)-1,"%u",hash32); +#endif RETURN_STRING(buf,1); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring config.m4
moriyoshi Mon Dec 8 02:18:46 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mbstring config.m4 Log: MFH(r-1.45): Avoid using non-portable test syntax. Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.28.2.7 php-src/ext/mbstring/config.m4:1.28.2.8 --- php-src/ext/mbstring/config.m4:1.28.2.7 Thu Dec 4 17:53:38 2003 +++ php-src/ext/mbstring/config.m4 Mon Dec 8 02:18:46 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.28.2.7 2003/12/04 22:53:38 moriyoshi Exp $ +dnl $Id: config.m4,v 1.28.2.8 2003/12/08 07:18:46 moriyoshi Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -34,7 +34,7 @@ PHP_ADD_BUILD_DIR([$ext_builddir/$dir]) done - if test "$ext_shared" = "no" -o ! -e "$ext_builddir/config.h.in"; then + if test "$ext_shared" = "no" || ! test -e "$ext_builddir/config.h.in"; then out="php_config.h" else out="$abs_builddir/config.h" -- 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.m4
moriyoshi Mon Dec 8 02:18:20 2003 EDT Modified files: /php-src/ext/mbstring config.m4 Log: Avoid using non-portable test syntax. This was causing problems on Solaris. (Reported by Uwe Schindler. Thanks!) Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.44 php-src/ext/mbstring/config.m4:1.45 --- php-src/ext/mbstring/config.m4:1.44 Sun Dec 7 10:41:50 2003 +++ php-src/ext/mbstring/config.m4 Mon Dec 8 02:18:20 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.44 2003/12/07 15:41:50 sniper Exp $ +dnl $Id: config.m4,v 1.45 2003/12/08 07:18:20 moriyoshi Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -34,7 +34,7 @@ PHP_ADD_BUILD_DIR([$ext_builddir/$dir]) done - if test "$ext_shared" = "no" -o ! -e "$ext_builddir/config.h.in"; then + if test "$ext_shared" = "no" || ! test -e "$ext_builddir/config.h.in"; then out="php_config.h" else out="$abs_builddir/config.h" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml xml.c
moriyoshi Mon Dec 8 02:15:33 2003 EDT
Modified files:
/php-src/ext/xmlxml.c
Log:
NULL pointers can be passed to free_fcn. This is the correct behaviour.
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.142 php-src/ext/xml/xml.c:1.143
--- php-src/ext/xml/xml.c:1.142 Tue Nov 4 11:15:52 2003
+++ php-src/ext/xml/xml.c Mon Dec 8 02:15:32 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.142 2003/11/04 16:15:52 moriyoshi Exp $ */
+/* $Id: xml.c,v 1.143 2003/12/08 07:15:32 moriyoshi Exp $ */
#define IS_EXT_MODULE
@@ -192,7 +192,9 @@
static void php_xml_free_wrapper(void *ptr)
{
- efree(ptr);
+ if (ptr != NULL) {
+ efree(ptr);
+ }
}
PHP_MINIT_FUNCTION(xml)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
