diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-29 21:08:12 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-29 21:08:12 -0700 |
| commit | 928fa44154e2d4ecbb2f08d30f428682b8d55e34 (patch) | |
| tree | efe73e15605a698779bbe6d31cce6a18688adeae | |
| parent | a795f03c486c0d6c32badc9850870f95d8d09059 (diff) | |
| download | volse-hubzilla-928fa44154e2d4ecbb2f08d30f428682b8d55e34.tar.gz volse-hubzilla-928fa44154e2d4ecbb2f08d30f428682b8d55e34.tar.bz2 volse-hubzilla-928fa44154e2d4ecbb2f08d30f428682b8d55e34.zip | |
more work on the notifier
| -rw-r--r-- | include/notifier.php | 7 | ||||
| -rw-r--r-- | library/certs/README.md | 13 |
2 files changed, 18 insertions, 2 deletions
diff --git a/include/notifier.php b/include/notifier.php index 3b29229cf..db1aa9690 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -605,11 +605,16 @@ function notifier_run($argv, $argc){ 'request' => $request, 'normal_mode' => $normal_mode, 'packet_type' => $packet_type, - 'walltowall' => $walltowall + 'walltowall' => $walltowall, + 'queued' => array() ); call_hooks('notifier_hub',$narr); + if($narr['queued']) { + foreach($narr['queued'] as $pq) + $deliveries[] = $pq; + } continue; } diff --git a/library/certs/README.md b/library/certs/README.md index 36a0cf30c..ee68fc06e 100644 --- a/library/certs/README.md +++ b/library/certs/README.md @@ -1 +1,12 @@ -This directory contains *browser valid* certs for use with hubzilla when using curl (server to server communication). The cacert.pem file in this directory is downloaded (when necessary) from the curl repository and tracks the Mozilla built-in certs. Additionally we've discovered we occasionally require intermediate certs from some cert providers which Mozilla and other browsers obtain automatically but curl does not. You may add these here if required. All these files are concatenated to create the library/cacert.pem file which we will use.
\ No newline at end of file +This directory contains *browser valid* certs for use with hubzilla when using curl (server to server communication). The cacert.pem file in this directory is downloaded (when necessary) from the curl repository and tracks the Mozilla built-in certs. Additionally we've discovered we occasionally require intermediate certs from some cert providers which Mozilla and other browsers obtain automatically but curl does not. You may add these here if required. All these files are concatenated to create the library/cacert.pem file which we will use. + +Obtain the converted mozilla certs here: +http://curl.haxx.se/docs/caextract.html + +Store as cacert.pem in this directory and then + +cat *.pem > ../cacert.pem + +to generate the master file in /library/cacert.pem + + |