date:20030725

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/snmp snmp.c

2003-07-25 Thread Harrie Hazewinkel

harrie  Fri Jul 25 03:32:40 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/snmp   snmp.c 
  Log:
  Bug 24760 fix, in which the port number when non-default is not handled
  correctly and ends up as the default port. This seems to be caused by
  some buffer overflow where the port number is assign zero, even though
  it it is not assigned to the port variable.
  Fix was reported and a fix proposed by chuck+php at 2003 dot snew dot com
  
  (Bugfixing branch)
  
  
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.70.2.9 php-src/ext/snmp/snmp.c:1.70.2.10
--- php-src/ext/snmp/snmp.c:1.70.2.9Wed Jul 16 02:04:01 2003
+++ php-src/ext/snmp/snmp.c Fri Jul 25 03:32:39 2003
@@ -20,7 +20,7 @@
   +--+
 */
 
-/* $Id: snmp.c,v 1.70.2.9 2003/07/16 06:04:01 sniper Exp $ */
+/* $Id: snmp.c,v 1.70.2.10 2003/07/25 07:32:39 harrie Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -575,7 +575,6 @@
strcpy (hostname, Z_STRVAL_PP(a1));
if ((pptr = strchr (hostname, ':'))) {
remote_port = strtol (pptr + 1, NULL, 0);
-   *pptr = 0;
}
 
session.peername = hostname;
@@ -892,7 +891,6 @@
strcpy(hostname, Z_STRVAL_PP(a1));
if ((pptr = strchr (hostname, ':'))) {
remote_port = strtol (pptr + 1, NULL, 0);
-   *pptr = 0;
}
session.peername = hostname;
session.remote_port = remote_port;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

2003-07-25 Thread Harrie Hazewinkel

harrie  Fri Jul 25 03:36:42 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  Adding bugfix.
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.303 php-src/NEWS:1.1247.2.304
--- php-src/NEWS:1.1247.2.303   Thu Jul 24 15:58:30 2003
+++ php-src/NEWSFri Jul 25 03:36:42 2003
@@ -1,6 +1,7 @@
 PHP 4  NEWS
 |||
 30 Jul 2003, Version 4.3.3RC2
+- Fixed bug #24760 (non-default SNMP port number) (Harrie)
 - Improved the NSAPI SAPI module (Uwe Schindler)
   . Added possibility to use PHP to generate HTTP error pages (404 Not Found..)
   . Added possibility to use PHP to generate directory listings for directories



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

2003-07-25 Thread Jani Taskinen

sniper  Fri Jul 25 05:47:06 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  Fix BFN, this was really MY patch that fixed it. :-p
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.304 php-src/NEWS:1.1247.2.305
--- php-src/NEWS:1.1247.2.304   Fri Jul 25 03:36:42 2003
+++ php-src/NEWSFri Jul 25 05:47:06 2003
@@ -1,7 +1,6 @@
 PHP 4  NEWS
 |||
 30 Jul 2003, Version 4.3.3RC2
-- Fixed bug #24760 (non-default SNMP port number) (Harrie)
 - Improved the NSAPI SAPI module (Uwe Schindler)
   . Added possibility to use PHP to generate HTTP error pages (404 Not Found..)
   . Added possibility to use PHP to generate directory listings for directories
@@ -18,6 +17,7 @@
 - Fixed a bug that under certain circumstances could invalidate safe_mode.
   (Ilia)
 - Fixed bug #24783 (foreach($ar as $key = $val), $key not binary safe). (Zeev)
+- Fixed bug #24760 (non-default SNMP port number not working). (Jani)
 - Fixed bug #24752 (Unhandled uniqueidentifier field type). 
   (Ilia, s.sonnenberg[at]coolspot.de)
 - Fixed bug #24710 (Crash when $obj-{0} is used). (Zeev)



-- 
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/xml/expat xmlparse.c /main php_compat.h

2003-07-25 Thread Edin Kadribasic

edink   Fri Jul 25 07:27:39 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/xml/expat  xmlparse.c 
/php-src/main   php_compat.h 
  Log:
  Export symbols needed for shared extensions.
  
  
Index: php-src/ext/xml/expat/xmlparse.c
diff -u php-src/ext/xml/expat/xmlparse.c:1.4.10.1 
php-src/ext/xml/expat/xmlparse.c:1.4.10.2
--- php-src/ext/xml/expat/xmlparse.c:1.4.10.1   Mon Jul 21 04:42:48 2003
+++ php-src/ext/xml/expat/xmlparse.cFri Jul 25 07:27:39 2003
@@ -9,7 +9,7 @@
 #ifdef COMPILED_FROM_DSP
 
 #include winconfig.h
-#define XMLPARSEAPI(type) type __cdecl
+#define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl
 #include expat.h
 #undef XMLPARSEAPI
 
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.11.4.3 php-src/main/php_compat.h:1.11.4.4
--- php-src/main/php_compat.h:1.11.4.3  Mon Jul 21 04:42:48 2003
+++ php-src/main/php_compat.h   Fri Jul 25 07:27:39 2003
@@ -97,4 +97,9 @@
 #define XmlUtf8Encode php_XmlUtf8Encode
 #endif
 
+#ifdef PHP_EXPORTS
+#define PCRE_STATIC
+#define XML_STATIC
+#endif
+
 #endif



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php_compat.h

2003-07-25 Thread Edin Kadribasic

edink   Fri Jul 25 07:41:33 2003 EDT

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  Partial MDB
  
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.16 php-src/main/php_compat.h:1.17
--- php-src/main/php_compat.h:1.16  Thu Jul 10 12:08:56 2003
+++ php-src/main/php_compat.h   Fri Jul 25 07:41:33 2003
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.16 2003/07/10 16:08:56 sniper Exp $ */
+/* $Id: php_compat.h,v 1.17 2003/07/25 11:41:33 edink Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -125,6 +125,10 @@
 
 /* Define to make XML Namespaces functionality available. */
 #define XML_NS 1
+#endif
+
+#ifdef PHP_EXPORTS
+#define PCRE_STATIC
 #endif
 
 #endif



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/yaz yaz.dsp

2003-07-25 Thread Jani Taskinen

sniper  Fri Jul 25 08:15:32 2003 EDT

  Modified files:  
/php-src/ext/yazyaz.dsp 
  Log:
  Fix typo (and debug build)
  
Index: php-src/ext/yaz/yaz.dsp
diff -u php-src/ext/yaz/yaz.dsp:1.1 php-src/ext/yaz/yaz.dsp:1.2
--- php-src/ext/yaz/yaz.dsp:1.1 Sat Oct 21 10:18:27 2000
+++ php-src/ext/yaz/yaz.dsp Fri Jul 25 08:15:32 2003
@@ -79,7 +79,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 /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts-debug.lib yaz.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 wsock32.lib /nologo /dll /debug /machine:I386 
/out:..\..\Debug_TS/php_yaz.dll /pdbtype:sept /libpath:..\..\Debug_TS
+# ADD LINK32 php4ts_debug.lib yaz.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 wsock32.lib /nologo /dll /debug /machine:I386 
/out:..\..\Debug_TS/php_yaz.dll /pdbtype:sept /libpath:..\..\Debug_TS
 
 !ENDIF 
 



-- 
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/yaz yaz.dsp

2003-07-25 Thread Jani Taskinen

sniper  Fri Jul 25 08:15:49 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/yazyaz.dsp 
  Log:
  MFH
  
Index: php-src/ext/yaz/yaz.dsp
diff -u php-src/ext/yaz/yaz.dsp:1.1 php-src/ext/yaz/yaz.dsp:1.1.16.1
--- php-src/ext/yaz/yaz.dsp:1.1 Sat Oct 21 10:18:27 2000
+++ php-src/ext/yaz/yaz.dsp Fri Jul 25 08:15:48 2003
@@ -79,7 +79,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 /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts-debug.lib yaz.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 wsock32.lib /nologo /dll /debug /machine:I386 
/out:..\..\Debug_TS/php_yaz.dll /pdbtype:sept /libpath:..\..\Debug_TS
+# ADD LINK32 php4ts_debug.lib yaz.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 wsock32.lib /nologo /dll /debug /machine:I386 
/out:..\..\Debug_TS/php_yaz.dll /pdbtype:sept /libpath:..\..\Debug_TS
 
 !ENDIF 
 



-- 
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/domxml php_domxml.c

2003-07-25 Thread Jani Taskinen

sniper  Fri Jul 25 08:45:05 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/domxml php_domxml.c 
  Log:
  some missing static with internal funcs.
  
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.26 
php-src/ext/domxml/php_domxml.c:1.218.2.27
--- php-src/ext/domxml/php_domxml.c:1.218.2.26  Wed Jul 23 12:44:27 2003
+++ php-src/ext/domxml/php_domxml.c Fri Jul 25 08:45:05 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_domxml.c,v 1.218.2.26 2003/07/23 16:44:27 iliaa Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.27 2003/07/25 12:45:05 sniper Exp $ */
 
 /* TODO
  * - Support Notation Nodes
@@ -818,7 +818,7 @@
}
 }
 
-void *php_xsltstylesheet_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 
TSRMLS_DC)
+static void *php_xsltstylesheet_get_object(zval *wrapper, int rsrc_type1, int 
rsrc_type2 TSRMLS_DC)
 {
void *obj;
zval **handle;
@@ -867,8 +867,9 @@
 }
 #endif  /* HAVE_DOMXSLT */
 
-
-void *php_xpath_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 TSRMLS_DC)
+/* Not used? */
+/*
+static void *php_xpath_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 
TSRMLS_DC)
 {
void *obj;
zval **handle;
@@ -897,6 +898,7 @@
 
return obj;
 }
+*/
 
 static zval *php_xpathobject_new(xmlXPathObjectPtr obj, int *found TSRMLS_DC)
 {
@@ -907,7 +909,7 @@
return (wrapper);
 }
 
-void *php_xpath_get_context(zval *wrapper, int rsrc_type1, int rsrc_type2 TSRMLS_DC)
+static void *php_xpath_get_context(zval *wrapper, int rsrc_type1, int rsrc_type2 
TSRMLS_DC)
 {
void *obj;
zval **handle;
@@ -1101,7 +1103,7 @@
 /* }}} */
 /* end parser stuff */
 
-void *php_dom_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 TSRMLS_DC)
+static void *php_dom_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 
TSRMLS_DC)
 {
void *obj;
zval **handle;
@@ -1475,8 +1477,8 @@

 }
 
-xmlDocPtr php_dom_xmlSAXParse(xmlSAXHandlerPtr sax, const char *buffer, int size, int 
recovery, void *data) {
-
+static xmlDocPtr php_dom_xmlSAXParse(xmlSAXHandlerPtr sax, const char *buffer, int 
size, int recovery, void *data)
+{
 xmlDocPtr ret;
 xmlParserCtxtPtr ctxt;
 domxml_ErrorCtxt errorCtxt;
@@ -3118,7 +3120,8 @@
xmlNode *element;
 };
 
-static void idsHashScanner(void *payload, void *data, xmlChar *name) {
+static void idsHashScanner(void *payload, void *data, xmlChar *name)
+{
idsIterator *priv = (idsIterator *)data;
 
if (priv-element == NULL  xmlStrEqual (name, priv-elementId))



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/dom domimplementation.c

2003-07-25 Thread Rob Richards

rrichards   Fri Jul 25 13:25:50 2003 EDT

  Modified files:  
/php-src/ext/domdomimplementation.c 
  Log:
  doctype and namespace fix
  memory leak fix
  
Index: php-src/ext/dom/domimplementation.c
diff -u php-src/ext/dom/domimplementation.c:1.4 php-src/ext/dom/domimplementation.c:1.5
--- php-src/ext/dom/domimplementation.c:1.4 Thu Jun 12 16:02:05 2003
+++ php-src/ext/dom/domimplementation.c Fri Jul 25 13:25:50 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: domimplementation.c,v 1.4 2003/06/12 20:02:05 rrichards Exp $ */
+/* $Id: domimplementation.c,v 1.5 2003/07/25 17:25:50 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -130,7 +130,7 @@
zval *node = NULL, *rv = NULL;
xmlDoc *docp;
xmlNode *nodep;
-   xmlDtdPtr doctype = NULL, dtd = NULL;
+   xmlDtdPtr doctype = NULL;
xmlNsPtr nsptr = NULL;
int ret, uri_len = 0, name_len = 0;
char *uri, *name;
@@ -142,7 +142,7 @@
return;
}
 
-   if (doctype != NULL) {
+   if (node != NULL) {
DOM_GET_OBJ(doctype, node, xmlDtdPtr, doctobj);
if (doctype-type == XML_DOCUMENT_TYPE_NODE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
DocumentType object);
@@ -192,20 +192,16 @@
xmlFreeURI(uristruct);
 
if (uri_len  0) {
-   if (prefix == NULL) {
+   if ((nsptr = xmlNewNs(NULL, uri, prefix)) == NULL) {
php_dom_throw_error(NAMESPACE_ERR, 
return_value TSRMLS_CC);
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Invalid Namespace);
-   xmlFree(localname);
-   RETURN_FALSE;
-   } else {
-   if ((nsptr = xmlNewNs(NULL, uri, prefix)) == 
NULL) {
-   php_dom_throw_error(NAMESPACE_ERR, 
return_value TSRMLS_CC);
+   if (prefix != NULL) {
xmlFree(prefix);
-   xmlFree(localname);
-   php_error_docref(NULL TSRMLS_CC, 
E_WARNING, Invalid Namespace);
-   RETURN_FALSE;   
}
+   xmlFree(localname);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Invalid Namespace);
+   RETURN_FALSE;   
}
+
}
if (prefix != NULL) {
xmlFree(prefix);
@@ -223,24 +219,42 @@
}
 
if (doctype != NULL) {
-   dtd = xmlCreateIntSubset (docp, doctype-name, 
-   doctype-ExternalID, doctype-SystemID);
+   docp-intSubset = doctype;
+   doctype-parent = docp;
+   doctype-doc = docp;
+   docp-children = (xmlNodePtr) doctype;
+   docp-last = (xmlNodePtr) doctype;
}
 
if (localname != NULL) {
nodep = xmlNewDocNode (docp, nsptr, localname, NULL);
if (!nodep) {
+   if (doctype != NULL) {
+   docp-intSubset = NULL;
+   doctype-parent = NULL;
+   doctype-doc = NULL;
+   docp-children = NULL;
+   docp-last = NULL;
+   }
xmlFreeDoc(docp);
xmlFree(localname);
/* Need some type of error here */
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unexpected 
Error);
RETURN_FALSE;
}
+
+   nodep-nsDef = nsptr;
+
xmlDocSetRootElement(docp, nodep);
xmlFree(localname);
}
 
DOM_RET_OBJ(rv, (xmlNodePtr) docp, ret, NULL);
+
+   if (doctype != NULL) {
+   doctobj-document = ((dom_object *)((node_ptr 
*)docp-_private)-_private)-document;
+   increment_document_reference(doctobj, docp TSRMLS_CC);
+   }
 }
 /* }}} end dom_domimplementation_create_document */
 



-- 
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/snmp snmp.c

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/xml/expat xmlparse.c /main php_compat.h

[PHP-CVS] cvs: php-src /main php_compat.h

[PHP-CVS] cvs: php-src /ext/yaz yaz.dsp

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/yaz yaz.dsp

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/domxml php_domxml.c

[PHP-CVS] cvs: php-src /ext/dom domimplementation.c

9 matches

Site Navigation

Mail list logo

Footer information