php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
108,013 Commits 549 Branches 1,485 Tags
81eb8e7507bdec00a6dde4ac759d668d048b6f13
Commit Graph

565 Commits

Author SHA1 Message Date
Stanislav Malyshev 3fd8a76f26 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Set an LDAP error code when failing ldap_bind due to null bytes

Conflicts:
	ext/ldap/ldap.c
 2014-09-28 12:28:30 -07:00
Stanislav Malyshev a8e84b1b21 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Set an LDAP error code when failing ldap_bind due to null bytes
 2014-09-28 12:25:49 -07:00
Stanislav Malyshev ef39f40445 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Set an LDAP error code when failing ldap_bind due to null bytes
 2014-09-28 12:25:24 -07:00
Matthew Daley fcbe20d357 Set an LDAP error code when failing ldap_bind due to null bytes 
Some applications check a LDAP link's error code after seeing ldap_bind
fail due to a null byte bind attempt and hence incorrectly receive the
last set error code.

Fix by setting an LDAP error code before returning in this case.
 2014-09-28 12:23:52 -07:00
Anatol Belski 4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
krakjoe 4eed761d0e remove fetch from ldap 2014-09-26 11:23:18 +01:00
Florian MARGAINE 8eb7e7bf7f Merge branch 'master' into issue-67910 
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
 2014-09-20 10:09:21 +02:00
Florian MARGAINE cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Johannes Schlüter d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Xinchen Hui bc3d9b3ba2 Fixed segfaults after change size_t of "s" 2014-08-28 15:43:14 +08:00
Anatol Belski 3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski 4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski 70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Anatol Belski 7c7767853b ported ext/ldap 2014-08-19 20:09:16 +02:00
Anatol Belski 63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Dmitry Stogov 2af311bea3 Use new zend_hash API 2014-05-28 17:49:31 +04:00
Dmitry Stogov b5af9e8599 More accurate mysql_close() 2014-05-20 13:19:21 +04:00
Xinchen Hui e1317ed517 Refactored ext/ldap 2014-05-20 11:26:26 +08:00
Dmitry Stogov 17d027ed47 Split IS_BOOL into IS_FALSE and IS_TRUE 2014-04-30 18:32:42 +04:00
Dmitry Stogov f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Dmitry Stogov 050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Stanislav Malyshev 9af0756dd5 Fix null byte in LDAP bindings 2014-04-14 10:53:08 -07:00
Stanislav Malyshev 59900dd37f Fix null byte in LDAP bindings 2014-04-14 10:51:32 -07:00
Stanislav Malyshev ed4de188dd Fix null byte in LDAP bindings 2014-04-14 10:46:46 -07:00
Stanislav Malyshev ad1b9eef98 Fix null byte in LDAP bindings 2014-04-14 10:44:53 -07:00
Stanislav Malyshev ea0769f00e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Implement ldap_modify_batch.
 2014-01-25 22:04:39 -08:00
Stanislav Malyshev 6fca805b3b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Implement ldap_modify_batch.

Conflicts:
	ext/ldap/ldap.c
 2014-01-25 22:04:28 -08:00
Ondřej Hošek c0e3429904 Implement ldap_modify_batch. 2014-01-22 18:54:11 +01:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui 47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Michael Wallner a03b1328b8 fix compiler warnings and type usage 2013-10-18 11:34:24 +02:00
Michael Wallner f711c1219d Merge branch 'ldap_escape-dev' of https://github.com/DaveRandom/php-src 
* 'ldap_escape-dev' of https://github.com/DaveRandom/php-src:
  Add ldap_escape()
 2013-10-18 11:17:41 +02:00
Christopher Jones 5bc377457e Allow the ldap extension to be compiled with Oracle's LDAP 
implementation, if desired.  Note the implementations differ so you
will see different ldap behavior.

The patch allows configuration similar to:
--with-ldap=$HOME/instantclient --with-oci8=instantclient,$HOME/instantclient

The patch doesn't support configuration similar to:
--with-ldap --with-oci8=instantclient,$HOME/instantclient
since this would try and mix the default LDAP and Oracle LDAP
implementations.

This patch closes out bug #61450 and the associated github PR.

Regardless of this patch, my recommended way to install both OCI8 and
ldap extensions is to statically configure PHP with ldap, and then add
OCI8 as a shared extension from PECL.
 2013-10-04 15:50:16 -07:00
Michael Wallner d4d6a95105 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test
  fix memleak on resetting rebind_proc
 2013-09-30 14:04:48 +02:00
Michael Wallner 2b78edfba2 fix test 2013-09-30 11:41:35 +02:00
Michael Wallner e9e63f9223 fix memleak on resetting rebind_proc 2013-09-30 11:23:33 +02:00
Chris Wright 0d534d7c5e Add ldap_escape() 2013-09-18 12:18:05 +01:00
Christopher Jones c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Veres Lajos e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos 72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Anatoliy Belsky 5d1565088f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
 2012-04-16 15:26:50 +02:00
Anatoliy Belsky 1c435ae498 Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails 2012-04-16 15:25:20 +02:00
Anatoliy Belsky 1a44faf264 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
 2012-04-16 15:21:04 +02:00
Anatoliy Belsky 47e7755785 Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails 2012-04-16 15:20:03 +02:00