Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add basics of TLS support #6

Merged
merged 15 commits into from
Dec 5, 2013
Merged

Add basics of TLS support #6

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
eb1bec6
First attempt at setTlsCertificates
mgdm Nov 1, 2013
8d982a7
Merge branch 'master' into tls
mgdm Nov 3, 2013
d1a4dbd
Initial commit of TLS functions
mgdm Nov 4, 2013
8446d51
Start adding documentation to README
mgdm Nov 4, 2013
64cac73
Merge branch 'master' into tls
mgdm Nov 23, 2013
bb311bd
Merge branch 'master' of github.com:mgdm/Mosquitto-PHP into tls
mgdm Dec 3, 2013
fbabab8
Actually assign the parameter to the array
mgdm Dec 4, 2013
9a9bdb5
Handle open_basedir checks
mgdm Dec 4, 2013
0f337ee
Merge branch 'master' of github.com:mgdm/Mosquitto-PHP into tls
mgdm Dec 4, 2013
35d477f
Add callback to handle encrypted client keys
mgdm Dec 4, 2013
fddbc19
Fix argument types for setTlsPSK
mgdm Dec 4, 2013
f448675
Describe how to handle encrypted certificates
mgdm Dec 4, 2013
db18dba
Merge branch 'master' into tls
mgdm Dec 5, 2013
d3f7a17
Add SSL-related constants
mgdm Dec 5, 2013
74647c8
Document SSL options
mgdm Dec 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into tls 
Conflicts:
	mosquitto.c
  • Loading branch information
@mgdm
mgdm committed Nov 23, 2013
commit 64cac7309cf04a8f41dabf639255c77e8a4b73a6
11 changes: 5 additions & 6 deletions mosquitto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,12 +1089,11 @@ const zend_function_entry mosquitto_client_methods[] = {
PHP_ME(Mosquitto_Client, setTlsInsecure, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setTlsOptions, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setTlsPSK, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setCredentials, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setWill, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, clearWill, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setReconnectDelay, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setMessageRetry, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, connect, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setCredentials, Mosquitto_Client_setCredentials_args, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setWill, Mosquitto_Client_setWill_args, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setReconnectDelay, Mosquitto_Client_setReconnectDelay_args, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setMessageRetry, Mosquitto_Client_setMessageRetry_args, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, connect, Mosquitto_Client_connect_args, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, disconnect, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, setMaxInFlightMessages, Mosquitto_Client_setMaxInFlightMessages_args, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, publish, Mosquitto_Client_publish_args, ZEND_ACC_PUBLIC)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.