Merge pull request #6 from php/master

merge

Author: Громов Андрей Олегович

.gitignore

@@ -87,7 +87,7 @@ missing
 mkinstalldirs
 
 # RPM specification file generated by `./configure`
-/php7.spec
+/php.spec
 
 # Directories for shared object files and headers generated by `./configure`
 include/

Makefile.global

@@ -119,7 +119,7 @@ clean:
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
-	rm -f php7.spec main/build-defs.h scripts/phpize
+	rm -f php.spec main/build-defs.h scripts/phpize
 	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
 	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
 	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html

NEWS

@@ -12,6 +12,9 @@ PHP                                                                        NEWS
 - Intl:
   . Removed deprecated INTL_IDNA_VARIANT_2003. (cmb)
 
+- LDAP:
+  . Removed deprecated ldap_sort. (mcmic)
+
 - phpdbg:
   . Fixed bug #76596 (phpdbg support for display_errors=stderr). (kabel)
 

README.RELEASE_PROCESS

@@ -118,11 +118,11 @@ Getting the non stable release (alpha/beta/RC) announced
 
    Note: Remember to update the sha256 checksum information.
 
-2. Update ``web/php.git/include/version.inc`` (x=major version number)
+2. Update ``web/php.git/include/version.inc`` (X_Y=major_minor version number)
 
- a. ``$PHP_x_RC`` = "5.4.0RC1"  (should be set to "false" before)
+ a. ``$PHP_X_Y_RC`` = "5.4.0RC1"  (should be set to "false" before)
 
- b. ``$PHP_x_RC_DATE`` = "06 September 2007"
+ b. ``$PHP_X_Y_RC_DATE`` = "06 September 2007"
 
 3. Skip this step for non stable releases after GA of minor or major versions
    (e.g. announce 7.3.0RC1, but not 7.3.1RC1):
@@ -184,7 +184,7 @@ credits files in ext/standard.
 
 8. Push the tag f.e. "``git push origin php-5.4.1``"
 
-9. run: ``PHPROOT=. ./makedist php 5.4.1``, this will export the tag, create configure
+9. run: ``PHPROOT=. ./makedist 5.4.1``, this will export the tag, create configure
 and build three tarballs (gz, bz2 and xz).
    Check if the pear files are updated (phar).
    On some systems the behavior of GNU tar can default to produce POSIX compliant archives
@@ -224,19 +224,22 @@ Getting the stable release announced
  b. If that fails for any non-trivially fixable reason, you can
     manually copy the old information to include/releases.inc
 
-2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
+2. Update ``phpweb/include/version.inc`` (X_Y=major_minor release number):
 
- a. ``$PHP_X_VERSION`` to the correct version
+ a. ``$PHP_X_Y_VERSION`` to the correct version
 
- b. ``$PHP_X_DATE`` to the release date
+ b. ``$PHP_X_Y_DATE`` to the release date
 
- c. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+ c. ``$PHP_X_Y_SHA256`` array and update all the SHA256 sums
 
- d. set ``$PHP_X_RC`` to false!
+ d. set ``$PHP_X_Y_RC`` to false!
 
  e. Make sure there are no outdated "notes" or edited "date" keys in the
  ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array
 
+ f. Only for the first revision of a major or minor release bump
+    ``$PHP_X_VERSION``, ``$PHP_X_DATE`` and ``$PHP_X_RC_DATE``.
+
 3. Create the release file (releases/x_y_z.php)
    Usually we use the same content as for point 6, but included in php template
    instead of the release xml.
@@ -295,15 +298,15 @@ Re-releasing the same version (or -pl)
 
 1. Commit the new binaries to ``phpweb/distributions/``
 
-2. Edit ``phpweb/include/version.inc`` and change (X=major release number):
+2. Update ``phpweb/include/version.inc`` (X_Y=major_minor release number):
 
  a. If only releasing for one OS, make sure you edit only those variables
 
- b. ``$PHP_X_VERSION`` to the correct version
+ b. ``$PHP_X_Y_VERSION`` to the correct version
 
- c. ``$PHP_X_DATE`` to the release date
+ c. ``$PHP_X_Y_DATE`` to the release date
 
- d. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+ d. ``$PHP_X_Y_SHA256`` array and update all the SHA256 sums
 
  e. Make sure there are no outdated "notes" or edited "date" keys in the
  ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array

README.STREAMS

@@ -374,5 +374,3 @@ the example above, you need to use mysql_free_result on the rowset, close the
 connection and then use pefree to dispose of the struct you allocated.
 You may read the stream->persistent field to determine if your struct was
 allocated in persistent mode or not.
-
-vim:tw=78:et

README.UNIX-BUILD-SYSTEM

@@ -108,7 +108,7 @@ module, program, etc).
 
 For example for APXS:
 
-PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php7.c php_apache.c)
+PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php.c php_apache.c)
 
 
 

README.WIN32-BUILD-SYSTEM

@@ -1,5 +1,3 @@
 The Win32 Build System.
 
 See https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2
-
-vim:tw=78:sw=1:ts=1:et

TSRM/TSRM.c

@@ -794,12 +794,3 @@ TSRM_API const char *tsrm_api_name(void)
 }/*}}}*/
 
 #endif /* ZTS */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/TSRM.h

@@ -210,12 +210,3 @@ TSRM_API const char *tsrm_api_name(void);
 #endif /* ZTS */
 
 #endif /* TSRM_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */

TSRM/tsrm_config.w32.h

@@ -12,12 +12,3 @@
 #include <crtdbg.h>
 
 #endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */