Fixes not propagated from HEAD to 4.7

I have spent several hours trying to figure out why publish
and subscribe wasn't working for me on two 4.7 sites

I think it's because several fixes are missing from the 4.7 version of
the subscribe module (1.21.2.5 2006/11/01 15:45:56 jvandyk) that are
in HEAD (1.26)

Specifically:

1. function subscribe_xmls_receive($message) {
$subscription = db_fetch_object(db_query("SELECT * FROM
{subscribe_subscriptions} WHERE token = '%s' AND method = 'push' AND
rsid = %d", $message['token'], $message['rsid']));
if (!$subscription) {
the 4.7version stores 'method' as integers 0 and 1 rather than as
strings 'push' and 'pull' like the HEAD version seems to

2. to fix #1, I believe the following line of code from HEAD:
$edit['method'] = $edit['method'] ? 'pull' : 'push';
needs to be added to the 4.7 version in the function
subscribe_subscription_save()

3, Finally, I don't know if this is a HEAD or 4.7 problem or a
documentation problem or a "Roland not understanding problem" but the 4.7 version seems to be storing the the
entire base URL including subdomain in the domain column of table
subscribe_subscriptions i.e. x.cooldomain.com is incorrectly stored
instead of cooldomain.com

This is my first attempt at debugging Drupal modules so if I have done
some sort of rookie error and downloaded the wrong version for 4.7,
chock it down to too much Holiday turkey!

I have done a kludgey patch to fix things which I have attached to this issue. It's not a real patch; it's a modified file that a real Drupal dev can turn into a real patch hopefully. All it does is patch the subscribe side so that it looks for integers for push/pull instead of the real fix which is to look for the strings 'push' and 'pull'. Also it has calls to watchbug() for debugging which should be removed