4e49939421 
 
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-06-13 23:26:06 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	2281989866  
						 
						
							
							
								
								
								Replace && by AND in SQL queries  
							
							 
							
							
							
						 
						
							2017-06-07 22:01:14 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9c0d2c31e8  
						 
						
							
							
								
								
								Replace AND and OR in PHP conditions by && and ||  
							
							 
							
							
							
						 
						
							2017-06-07 22:00:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	f4652d6e50  
						 
						
							
							
								
								
								Merge branch 'develop' into 1706-lock  
							
							 
							
							
							
						 
						
							2017-06-06 14:16:00 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e00105d649  
						 
						
							
							
								
								
								Don't fork a new worker  
							
							 
							
							
							
						 
						
							2017-06-06 11:59:38 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	249065b421 
 
						 
						
							
							
								
								
								opps, went in again? :-/  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-05-17 15:31:46 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	347803fd5c 
 
						 
						
							
							
								
								
								added spaces + some curly braces + some usage of dbm::is_result()  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-05-17 15:08:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	d7b420a44e 
 
						 
						
							
							
								
								
								opps, re-introduced this out-dated code by mistake  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-05-16 20:13:08 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	f4a33ed3f0 
 
						 
						
							
							
								
								
								added spaces + some curly braces + some usage of dbm::is_result()  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-05-16 14:40:07 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	ce866ad39b  
						 
						
							
							
								
								
								Remove unrecommended leading backslash for fully qualified namespaces  
							
							 
							
							
							
						 
						
							2017-05-02 23:37:06 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4812f4c0f9  
						 
						
							
							
								
								
								Without only the worker queue we don't need the deliverq anymore.  
							
							 
							
							
							
						 
						
							2017-03-16 07:30:59 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	49b22de705  
						 
						
							
							
								
								
								Changes from previous pull request applied again  
							
							 
							
							
							
						 
						
							2017-03-12 21:57:09 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3c220dd40c  
						 
						
							
							
								
								
								Queue.php is now reworked  
							
							 
							
							
							
						 
						
							2017-02-27 21:07:32 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	48209f0ecd  
						 
						
							
							
								
								
								Now there is only the worker.  
							
							 
							
							
							
						 
						
							2017-02-26 23:16:49 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0548099f6c  
						 
						
							
							
								
								
								The config class now makes less database reads.  
							
							 
							
							
							
						 
						
							2017-01-18 21:45:32 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c0df692f5f  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/diaspora.php
	object/Item.php 
							
						 
						
							2016-12-22 11:29:56 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	af2909bf8f 
 
						 
						
							
							
								
								
								Continued with coding convention:  
							
							 
							
							... 
							
							
							
							- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-12-20 21:13:50 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	4a7c3b9eef  
						 
						
							
							
								
								
								Diaspora: Fix class name case + add self  
							
							 
							
							
							
						 
						
							2016-12-20 12:44:15 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	51716957b2  
						 
						
							
							
								
								
								converted more to dbm::is_result() + added braces/space  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 15:37:27 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	1caa87dce6  
						 
						
							
							
								
								
								Restructured the way, processes are inserted and removed  
							
							 
							
							
							
						 
						
							2016-09-09 20:55:49 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	22f32d9721  
						 
						
							
							
								
								
								New process table for a better detection of running workers  
							
							 
							
							
							
						 
						
							2016-09-09 20:33:54 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	67b16507f1  
						 
						
							
							
								
								
								Performance improvements for the poller  
							
							 
							
							
							
						 
						
							2016-08-14 21:02:29 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	668da905e2  
						 
						
							
							
								
								
								"proc_run" is now called with priority.  
							
							 
							
							
							
						 
						
							2016-08-01 07:48:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	9ae2b2292f  
						 
						
							
							
								
								
								Some more function calls changed to the new class  
							
							 
							
							
							
						 
						
							2016-03-14 08:11:14 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	65d6d45f8c  
						 
						
							
							
								
								
								Changed parameter order  
							
							 
							
							
							
						 
						
							2016-03-08 22:28:49 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	beb2346cfc  
						 
						
							
							
								
								
								The function to check for maxload and the lockfile is centralized  
							
							 
							
							
							
						 
						
							2016-03-08 20:28:09 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ec9c9f0be7  
						 
						
							
							
								
								
								Don't create lock files if the process is called from the poller via the worker  
							
							 
							
							
							
						 
						
							2016-03-08 00:20:06 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	62de6be495  
						 
						
							
							
								
								
								Switched to static methods for DFRN  
							
							 
							
							
							
						 
						
							2016-01-25 15:20:58 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	1c84054322  
						 
						
							
							
								
								
								Queue delivery should be now more reliable  
							
							 
							
							
							
						 
						
							2016-01-21 03:21:33 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7edce8e266  
						 
						
							
							
								
								
								Don't use a delivery interval when using the worker  
							
							 
							
							
							
						 
						
							2015-09-12 18:08:03 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	32e8f3468d  
						 
						
							
							
								
								
								Moved some functionality back to the cron. Speed up things  
							
							 
							
							
							
						 
						
							2015-09-11 21:35:58 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e66489d67f  
						 
						
							
							
								
								
								PuSH: Publishing moved to a new process. OStatus comments are now published to all subscribers.  
							
							 
							
							
							
						 
						
							2015-05-30 20:47:53 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	cce561708a  
						 
						
							
							
								
								
								Replaced $argv and $argc with the $_SERVER array  
							
							 
							
							
							
						 
						
							2015-01-04 13:24:16 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	5ed5773f57  
						 
						
							
							
								
								
								The temporary paths (temp, lock, itemcache) are now detected automatically when used.  
							
							 
							
							
							
						 
						
							2014-06-23 01:24:39 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e32f9c4fff  
						 
						
							
							
								
								
								Dead processes will be deleted when they are running for more than 9 minutes.  
							
							 
							
							
							
						 
						
							2014-05-22 00:16:36 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	58cea13707  
						 
						
							
							
								
								
								Cron/Queue: Setting a limit to avoid endless PHP jobs.  
							
							 
							
							
							
						 
						
							2014-05-21 07:28:33 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	32065dfad6  
						 
						
							
							
								
								
								Queue: using lockpath, so that the queue only can run once a time.  
							
							 
							
							
							
						 
						
							2014-03-16 17:37:20 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6b8585d48d  
						 
						
							
							
								
								
								Database stuff. New table "thread". Changing "left join" to "inner join", removing "limit 1" at update and delete.  
							
							 
							
							
							
						 
						
							2014-03-09 09:19:14 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mats Sjöberg 
								
							 
						 
						
							
							
								
							
							
	1234282b8b  
						 
						
							
							
								
								
								Use the push value in the push_subscribers table as a push tries counter as well.  
							
							 
							
							
							
						 
						
							2013-11-21 21:44:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mats Sjöberg 
								
							 
						 
						
							
							
								
							
							
	2859ce1483  
						 
						
							
							
								
								
								Initial implementation of internal PuSH server in Friendica. It has been tested with GNU Social/StatusNet, and subscribe, unsubscribe and pushing new items seem to work.  
							
							 
							
							
							
						 
						
							2013-11-21 21:44:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	b3b0a9de24  
						 
						
							
							
								
								
								die forcefully but gracefully on missing api templates  
							
							 
							
							
							
						 
						
							2013-01-23 17:07:55 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	e684324032  
						 
						
							
							
								
								
								use explicit include paths  
							
							 
							
							
							
						 
						
							2012-12-28 14:51:50 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	385ee5a862  
						 
						
							
							
								
								
								pass $argv & $argc as reference to *_run() functions.  
							
							 
							
							
							
						 
						
							2012-11-05 09:28:54 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	00eb000e36  
						 
						
							
							
								
								
								don't check for was_recently_delayed in diaspora_transmit during a queue run  
							
							 
							
							
							
						 
						
							2012-07-09 09:39:09 -06:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Kampmann 
								
							 
						 
						
							
							
								
							
							
	355c42cb30  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/friendica/friendica  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 
						
							2012-04-05 13:39:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	94fac6d767  
						 
						
							
							
								
								
								queue optimisation - back off delivery attempts to once per hour after the first 12 hours.  
							
							 
							
							
							
						 
						
							2012-03-17 03:43:02 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	8aa2552372  
						 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)  
							
							 
							
							
							
						 
						
							2012-01-18 16:21:30 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	d6b446d63f  
						 
						
							
							
								
								
								starting the big delivery shakeup  
							
							 
							
							
							
						 
						
							2011-09-22 04:11:39 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	177e0e15d7  
						 
						
							
							
								
								
								allow zero delivery interval on dedicated servers  
							
							 
							
							
							
						 
						
							2011-08-29 00:59:44 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	b61d535f81  
						 
						
							
							
								
								
								remove item from queue  
							
							 
							
							
							
						 
						
							2011-08-28 22:59:49 -07:00