Anatol Belski
43b92ed5a8
move various places to the centralized OpenSSL setup routine
2017-01-08 00:25:47 +01:00
Joe Watkins
201e56cd04
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Adapts the readme to the new test-possibility
2017-01-07 16:46:01 +00:00
Andreas Heigl
fc777296bf
Adapts the readme to the new test-possibility
...
This commit introduces a way to use a vagrant setup to test against a
known LDAP without the need to setup an LDAP on your own machine
2017-01-07 16:45:10 +00:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Anatol Belski
78c15e2744
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix leak
2016-08-29 18:08:17 +02:00
Anatol Belski
ca4eeedd36
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix leak
2016-08-29 18:05:47 +02:00
Anatol Belski
e2609a38d9
fix leak
2016-08-29 18:01:21 +02:00
Côme Bernigaud
c53aadbba3
Merge branch 'pull-request/1955'
...
* pull-request/1955:
Add parenthesis to if statements
Correctly add to the length of the final string
Correctly add to the length of the final string
Fix minor spacing issue
Make LDAP_ESCAPE_DN compliant with RFC 4514
2016-07-07 05:11:56 +02:00
Aaron Piotrowski
24237027bc
Merge branch 'throw-error-in-extensions'
2016-07-05 02:08:39 -05:00
Chad Sikorra
b1d82607e6
Add parenthesis to if statements
2016-06-29 07:37:48 -05:00
Chad Sikorra
f910ca259f
Correctly add to the length of the final string
2016-06-26 17:29:07 -05:00
Chad Sikorra
e85a2e360c
Correctly add to the length of the final string
2016-06-26 17:10:51 -05:00
Chad Sikorra
737ee1f2c9
Fix minor spacing issue
2016-06-26 09:31:07 -05:00
Chad Sikorra
63427c1768
Make LDAP_ESCAPE_DN compliant with RFC 4514
2016-06-25 21:16:45 -05:00
Côme Bernigaud
355c5954da
Merge branch 'pull-request/1946' into PHP-7.1.0
...
* pull-request/1946:
Add additional LDAP SASL constants
Add tests for LDAP_OPT_* constants
Add LDAP TLS Protocol Min constants
Add tests for the LDAP CRL check option
Add missing LDAP constants
2016-06-23 07:22:40 +02:00
Dmitry Stogov
323b2733f6
Fixed compilation warnings
2016-06-22 00:40:50 +03:00
Dmitry Stogov
1616038698
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
...
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
2016-06-21 16:00:37 +03:00
Chad Sikorra
4718eb05b4
Add additional LDAP SASL constants
2016-06-16 21:00:32 -05:00
Chad Sikorra
a1f2649048
Add tests for LDAP_OPT_* constants
2016-06-15 23:01:26 -05:00
Chad Sikorra
6415a86c9d
Add LDAP TLS Protocol Min constants
2016-06-15 22:45:38 -05:00
Chad Sikorra
8880367773
Add tests for the LDAP CRL check option
2016-06-15 20:29:39 -05:00
Chad Sikorra
8e9e89610e
Add missing LDAP constants
2016-06-14 23:32:59 -05:00
Aaron Piotrowski
771e5cc247
Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error
2016-06-13 09:02:17 -05:00
Aaron Piotrowski
e3c681aa5c
Merge branch 'master' into throw-error-in-extensions
2016-06-10 22:02:23 -05:00
Anatol Belski
86229f9943
fix SKIPIF sections
2016-03-09 14:28:38 +01:00
Edwin Hoksberg
ba96506676
LDAP - Added support to change the certificates verification
2016-03-01 04:59:30 +01:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
87958927b0
Fixed bug #71249 (ldap_mod_replace/ldap_mod_add store value as string "Array")
2016-01-01 07:06:58 -08:00
Côme Bernigaud
e6759644ec
Revert "Added back support for undocummented host:port syntax"
...
This reverts commit 15876e85e5
2015-11-24 03:45:21 +01:00
Côme Bernigaud
5a8bcf73ba
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
...
This reverts commit 391087ed28
2015-11-24 03:45:17 +01:00
Xinchen Hui
9134f9e98f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/mysql/php_mysql.c
2015-11-16 17:59:46 +08:00
Côme Bernigaud
15876e85e5
Added back support for undocummented host:port syntax
2015-11-16 04:50:12 +01:00
Xinchen Hui
fc611a134b
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-12 14:20:03 +08:00
Côme Bernigaud
391087ed28
Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
...
Note that passing 0 will also result in default port.
2015-11-12 07:06:05 +01:00
Dmitry Stogov
560e4fa393
Removed or simplified incorrect SEPARATE_*() macros usage.
2015-09-29 11:17:43 +03:00
Dmitry Stogov
719664dec2
fixed compilation error
2015-09-10 20:24:11 +03:00
Xinchen Hui
bb4c0c0703
Merge branch 'PHP-5.6'
2015-09-10 19:56:18 +08:00
Côme Bernigaud
059dd18c37
Added support of LDAP_OPT_TIMEOUT, fixes #69574
2015-09-09 18:02:10 +02:00
Côme Bernigaud
fb9d934d51
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 11:05:29 +02:00
Côme Bernigaud
a483a79c85
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 10:34:46 +02:00
Tyson Andre
c3fc65eb7c
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
...
LDAP_OPT_TIMELIMIT and LDAP_OPT_DEREF's original values weren't
saved properly because of a bug introduced when copy and pasting.
This lead to the original timeout being changed
when specifying a temporary override (e.g. for ldap_search(..., $timeout))
2015-09-08 18:42:02 -07:00
Côme Bernigaud
8acda9cad5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Patch from Rainer Jung to provide Solaris LDAP support
Conflicts:
ext/ldap/ldap.c
2015-08-18 17:26:46 +02:00
Côme Bernigaud
40befb943c
Patch from Rainer Jung to provide Solaris LDAP support
2015-08-18 16:52:44 +02:00
Anatol Belski
91f985b2f9
fix config.w32
2015-07-23 07:39:25 +02:00
Anatol Belski
3d38db3576
fix C99 compat
2015-07-23 07:39:16 +02:00
Anatol Belski
73c0fc0df4
move the define to the right place
...
thanks Kalle )
2015-07-06 19:43:35 +02:00
Aaron Piotrowski
fb4e3085cb
Add missing include
2015-07-06 10:06:47 -05:00
Côme Bernigaud
da6e286dbb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Attempt at falling back on ldap_find_control for Mac OS
2015-07-06 14:56:20 +02:00
