cvs: php4 /ext/satellite README multiple_components.patch

eriksson Thu Aug 9 17:42:53 2001 EDT Added files: /php4/ext/satellite multiple_components.patch Modified files: /php4/ext/satellite README Log: Added patch for ORBit that handles "Multiple Components Profile" in an IOR. Index: php4/ext/satellite/README diff -u php4/ext/satellite/README:1.4 php4/ext/satellite/README:1.5 --- php4/ext/satellite/README:1.4 Thu Nov 30 17:03:17 2000 +++ php4/ext/satellite/README Thu Aug 9 17:42:53 2001 @@ -1,4 +1,4 @@ -$Id: README,v 1.4 2000/11/30 22:03:17 eriksson Exp $ +$Id: README,v 1.5 2001/08/09 21:42:53 eriksson Exp $ About Satellite --------------- @@ -20,6 +20,15 @@ Note: If you compile Satellite as a dynamic PHP extension you must have the above line located before the extension=satellite.so line in php.ini! + +Known issues +------------ + +The ORBit version required by Satellite does not properly handle an IOR that contains +a "Multiple Components Profile". If you run into these problems, please apply the patch +named 'multiple_components.patch' to your ORBit directory before building. + + PHP as an Apache static module ------------------------------ Before linking Apache you must do either of these things: Index: php4/ext/satellite/multiple_components.patch +++ php4/ext/satellite/multiple_components.patch diff -ur ../src/ORBit-20000902/src/orb/orbit_object.c ORBit-20000902/src/orb/orbit_object.c --- ../src/ORBit-20000902/src/orb/orbit_object.c Thu Aug 3 01:30:45 2000 +++ ORBit-20000902/src/orb/orbit_object.c Thu Aug 9 20:13:55 2001 @@ -166,7 +166,7 @@ } else if(info->profile_type == IOP_TAG_ORBIT_SPECIFIC) { g_free(info->tag.orbitinfo.unix_sock_path); } else { - g_warning("ORBit_free_profile asked to free type %d", info->profile_type); +/* g_warning("ORBit_free_profile asked to free type %d", info->profile_type);*/ } g_free(info); /* Check its safe to free the item within a foreach func */ @@ -304,10 +304,10 @@ case IOP_TAG_MULTIPLE_COMPONENTS: default: GET_ATOM(subpart_len); - g_warning("IOP_TAG_MULTIPLE_COMPONENTS decoding needs finishing"); +/* g_warning("IOP_TAG_MULTIPLE_COMPONENTS decoding needs finishing");*/ object_info->profile_type = IOP_TAG_MULTIPLE_COMPONENTS; recv_buffer->cur = ((guchar *)recv_buffer->cur) + subpart_len; - return(object_info); + return NULL; /*(object_info);*/ break; case IOP_TAG_ORBIT_SPECIFIC: @@ -381,7 +381,7 @@ GET_ATOM(profile_id); object_info=ORBit_demarshal_profile(recv_buffer, profile_id); if(object_info==NULL) { - goto error_exit; + /*goto error_exit;*/ } else { profiles=g_slist_append(profiles, object_info); }